From: Michal Voců <michal@ruk.cuni.cz>
Date: Fri, 16 Mar 2007 12:57:56 +0000 (+0000)
Subject: * modified to use Singleton interface
X-Git-Tag: glite-lb-server-bones_R_2_2_4_1~6
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=0b80142f4c27c9cb15f4aa7b5758b92faa863a36;p=jra1mw.git

* modified to use Singleton interface
---

diff --git a/org.glite.lb.logger/src-nt/test/PluginManagerTest.cpp b/org.glite.lb.logger/src-nt/test/PluginManagerTest.cpp
index e8a7b81..629bbcb 100644
--- a/org.glite.lb.logger/src-nt/test/PluginManagerTest.cpp
+++ b/org.glite.lb.logger/src-nt/test/PluginManagerTest.cpp
@@ -42,12 +42,12 @@ public:
 	}
 
 	void testInit() {
-		PluginManager::thePluginManager.initialize();
+		PluginManager::instance()->initialize();
 		CPPUNIT_ASSERT(TestPlugin::theTestPlugin.inited);
 	}
 	
 	void testClean() {
-		PluginManager::thePluginManager.cleanup();
+		PluginManager::instance()->cleanup();
 		CPPUNIT_ASSERT(TestPlugin::theTestPlugin.cleaned);
 	}
 };
diff --git a/org.glite.lb.logger/src-nt/test/ThreadPoolTest.cpp b/org.glite.lb.logger/src-nt/test/ThreadPoolTest.cpp
index d61168d..a4be75e 100644
--- a/org.glite.lb.logger/src-nt/test/ThreadPoolTest.cpp
+++ b/org.glite.lb.logger/src-nt/test/ThreadPoolTest.cpp
@@ -32,7 +32,7 @@ public:
 		
 		r = read(fd, buf, 1);
 		buf[1] = 0;
-		ThreadPool::getThreadPool()->exit();
+		ThreadPool::instance()->exit();
 	}
 
 	virtual void onTimeout() {
@@ -65,7 +65,7 @@ public:
 	virtual void onReady() {
 		
 		int len = recv(fd, buffer, sizeof(buffer), MSG_NOSIGNAL);
-		ThreadPool::getThreadPool()->exit();
+		ThreadPool::instance()->exit();
 	}
 
 	virtual void onError() {
@@ -122,7 +122,7 @@ public:
 		nfd = accept(fd, NULL, NULL);
 		if(nfd < 0) { 
 		} else {
-			ThreadPool *pool = ThreadPool::getThreadPool();
+			ThreadPool *pool = ThreadPool::instance();
 
 			reader  = new TestSocketRead(nfd);
 			pool->queueWorkRead(reader);
@@ -141,7 +141,7 @@ class ThreadPoolTest: public CppUnit::TestFixture
 
 public:
 	void setUp() {
-		pool = ThreadPool::getThreadPool();
+		pool = ThreadPool::instance();
 		unlink("/tmp/smazat.sock");
 		pool->startWorkers(2);
 	}
@@ -176,7 +176,7 @@ public:
 
 		pool->queueWorkAccept(consumer);
 		producer = new TestSocketWrite("/tmp/smazat.sock");
-		ThreadPool::getThreadPool()->queueWorkWrite(producer);
+		ThreadPool::instance()->queueWorkWrite(producer);
 		pool->run();
 		CPPUNIT_ASSERT(consumer->reader != NULL);
 		CPPUNIT_ASSERT(strcmp(consumer->reader->buffer, TestSocketWrite::buffer) == 0);