All tools will now work when SM is on- and offline.

storage-manager/src/smrm.cpp

@@ -17,6 +17,13 @@
 
 #include <iostream>
 #include "IOCoordinator.h"
+#include "messageFormat.h"
+#include "SMFileSystem.h"
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
 
 using namespace std;
 using namespace storagemanager;
@@ -27,7 +34,38 @@ void usage(const char *progname)
     cerr << "Usage: " << progname << " file-or-dir1 file-or-dir2 .. file-or-dirN" << endl;
 }
 
-int main(int argc, char **argv)
+bool SMOnline()
+{
+    struct sockaddr_un addr;
+    memset(&addr, 0, sizeof(addr));
+    addr.sun_family = AF_UNIX;
+    strcpy(&addr.sun_path[1], &socket_name[1]);   // first char is null...
+    int clientSocket = ::socket(AF_UNIX, SOCK_STREAM, 0);
+    int err = ::connect(clientSocket, (const struct sockaddr *) &addr, sizeof(addr));
+    if (err >= 0)
+    {
+        ::close(clientSocket);
+        return true;
+    }
+    return false;
+}
+
+void rmOffline(int argCount, const char **args)
+{
+    boost::scoped_ptr<IOCoordinator> ioc(IOCoordinator::get());
+    for (int i = 1; i < argCount; i++)
+        ioc->unlink(args[i]);
+}
+
+void rmOnline(int argCount, const char **args)
+{
+    idbdatafile::SMFileSystem fs;
+    
+    for (int i = 1; i < argCount; i++)
+        fs.remove(args[i]);
+}
+
+int main(int argc, const char **argv)
 {
     if (argc < 2)
     {
@@ -35,9 +73,9 @@ int main(int argc, char **argv)
         return 1;
     }
     
-    IOCoordinator *ioc = IOCoordinator::get();
-    for (int i = 1; i < argc; i++)
-        ioc->unlink(argv[i]);
-        
+    if (SMOnline())
+        rmOnline(argc, argv);
+    else
+        rmOffline(argc, argv);
     return 0;
 }