diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2012-05-04 08:50:20 +0200 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2012-05-04 08:50:20 +0200 |
commit | 7be1c348e6323889479639df6b7d5b4d6a972b65 (patch) | |
tree | d38d1f5191d9b5d40d0f21849549afeffda4743b /src/connectionhandler.cc | |
parent | eda2fb1e00b925730e9b999ad593c80d2f724689 (diff) |
Make TaskManager and ConnectionHandler objects global.
Diffstat (limited to 'src/connectionhandler.cc')
-rw-r--r-- | src/connectionhandler.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc index 56c465f..b2b6973 100644 --- a/src/connectionhandler.cc +++ b/src/connectionhandler.cc @@ -29,6 +29,9 @@ #include <stdio.h> +// Defines global task_manager object +#include "taskmanager.h" + // Global ConnectionHandler. ConnectionHandler connection_handler; @@ -65,16 +68,13 @@ void ConnectionHandler::unobserve(clientid_t clientid, taskid_t taskid) connlist[clientid].erase(taskid); } -std::list<std::pair<clientid_t, taskid_t> > -ConnectionHandler::observerlist(TaskIdList tasks) +ObserverList ConnectionHandler::observerlist(TaskIdList tasks) { printf("Observerlist request\n"); - std::list<std::pair<clientid_t, taskid_t> > clients; + ObserverList clients; for(TaskIdList::iterator i = tasks.begin(); i != tasks.end(); i++) { taskid_t tid = *i; - // std::set<clientid_t> clientList; - // std::map<clientid_t, taskid_t> printf("Locating observers of node %d\n", tid); for(ConnectionList::iterator ci = connlist.begin(); @@ -118,7 +118,7 @@ h.observe((clientid_t)3, (taskid_t)3); { TaskIdList tasks; tasks.push_back((taskid_t)1); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -128,7 +128,7 @@ h.observe((clientid_t)3, (taskid_t)3); { TaskIdList tasks; tasks.push_back((taskid_t)3); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -138,7 +138,7 @@ h.observe((clientid_t)3, (taskid_t)3); { TaskIdList tasks; tasks.push_back((taskid_t)4); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -150,7 +150,7 @@ h.observe((clientid_t)3, (taskid_t)3); tasks.push_back((taskid_t)1); tasks.push_back((taskid_t)2); tasks.push_back((taskid_t)3); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -163,7 +163,7 @@ h.close((clientid_t)1); tasks.push_back((taskid_t)1); tasks.push_back((taskid_t)2); tasks.push_back((taskid_t)3); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -176,7 +176,7 @@ h.close((clientid_t)2); tasks.push_back((taskid_t)1); tasks.push_back((taskid_t)2); tasks.push_back((taskid_t)3); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -189,7 +189,7 @@ h.close((clientid_t)3); tasks.push_back((taskid_t)1); tasks.push_back((taskid_t)2); tasks.push_back((taskid_t)3); - std::set<clientid_t> clst = h.observerlist(tasks); + ObserverList clst = h.observerlist(tasks); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); |