Made IOCoordinator a singleton vs a global.

src/AppendTask.cpp

@@ -6,8 +6,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/IOCoordinator.cpp

@@ -10,6 +10,12 @@
 
 using namespace std;
 
+namespace
+{
+    storagemanager::IOCoordinator *ioc = NULL;
+    boost::mutex m;
+}
+
 namespace storagemanager
 {
 
@@ -21,6 +27,17 @@ IOCoordinator::~IOCoordinator()
 {
 }
 
+IOCoordinator * IOCoordinator::get()
+{
+    if (ioc)
+        return ioc;
+    boost::mutex::scoped_lock s(m);
+    if (ioc)
+        return ioc;
+    ioc = new IOCoordinator();
+    return ioc;
+}
+
 void IOCoordinator::willRead(const char *, off_t, size_t)
 {
     // no cache yet

src/IOCoordinator.h

@@ -8,6 +8,7 @@
 #include <vector>
 #include <string>
 #include <boost/utility.hpp>
+#include <boost/thread/mutex.hpp>
 
 namespace storagemanager
 {
@@ -15,7 +16,7 @@ namespace storagemanager
 class IOCoordinator : public boost::noncopyable
 {
     public:
-        IOCoordinator();
+        static IOCoordinator *get();
         virtual ~IOCoordinator();
 
         void willRead(const char *filename, off_t offset, size_t length);
@@ -27,6 +28,9 @@ class IOCoordinator : public boost::noncopyable
         int stat(const char *path, struct stat *out);
         int truncate(const char *path, size_t newsize);
         int unlink(const char *path);
+        
+    private:
+        IOCoordinator();
 };
 
 }

src/ListDirectoryTask.cpp

@@ -8,8 +8,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/OpenTask.cpp

@@ -9,8 +9,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/PosixTask.cpp

@@ -22,6 +22,7 @@ PosixTask::PosixTask(int _sock, uint _length) :
     bufferLen(0),
     socketReturned(false)
 {
+    ioc = IOCoordinator::get();
 }
 
 PosixTask::~PosixTask()

src/PosixTask.h

@@ -6,6 +6,7 @@
 #include <vector>
 #include <sys/types.h>
 #include <stdint.h>
+#include "IOCoordinator.h"
 
 namespace storagemanager
 {
@@ -30,6 +31,8 @@ class PosixTask
         void returnSocket();
         void socketError();
         
+        IOCoordinator *ioc;
+        
     private:
         PosixTask();
         

src/ReadTask.cpp

@@ -6,8 +6,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/StatTask.cpp

@@ -10,8 +10,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/TruncateTask.cpp

@@ -6,8 +6,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/UnlinkTask.cpp

@@ -6,8 +6,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/WriteTask.cpp

@@ -6,8 +6,6 @@
 
 using namespace std;
 
-extern storagemanager::IOCoordinator *ioc;
-
 namespace storagemanager
 {
 

src/main.cpp

@@ -10,17 +10,13 @@
 using namespace std;
 
 #include "SessionManager.h"
-#include "IOCoordinator.h"
 
 using namespace storagemanager;
 
-IOCoordinator *ioc;
-
 int main(int argc, char** argv)
 {
     int ret = 0;
     SessionManager sessionManager = SessionManager();
-    ioc = new IOCoordinator();
 
     ret = sessionManager.start();
 

src/unit_tests.cpp

@@ -6,7 +6,6 @@
 #include "TruncateTask.h"
 #include "ListDirectoryTask.h"
 #include "PingTask.h"
-#include "IOCoordinator.h"
 #include "messageFormat.h"
 #include <iostream>
 #include <stdlib.h>
@@ -26,8 +25,6 @@
 using namespace storagemanager;
 using namespace std;
 
-IOCoordinator *ioc;
-
 struct scoped_closer {
     scoped_closer(int f) : fd(f) { }
     ~scoped_closer() { 
@@ -403,7 +400,6 @@ bool pingtask()
 
 int main()
 {
-    ioc = new IOCoordinator();
     cout << "connecting" << endl;
     makeConnection();
     cout << "connected" << endl;