From fa5985ed620c3cd4c7b9712b6b80a2e2c1a8ba31 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 6 Jun 2020 18:32:11 +0200 Subject: Rename task to node everywhere. --- src/connectionhandler.cc | 92 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) (limited to 'src/connectionhandler.cc') diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc index 4cf8fc0..d0fb9e1 100644 --- a/src/connectionhandler.cc +++ b/src/connectionhandler.cc @@ -41,7 +41,7 @@ ConnectionHandler::ConnectionHandler() void ConnectionHandler::init(clientid_t clientid) { DEBUG(conn, "Adding client %p to connection list\n", clientid); - connlist[clientid] = std::set(); + connlist[clientid] = std::set(); DEBUG(conn, "Connections (%d):\n", (int)connlist.size()); ConnectionList::iterator it; @@ -74,34 +74,34 @@ bool ConnectionHandler::authenticated(clientid_t clientid) return authlist.find(clientid) != authlist.end() && authlist[clientid]; } -void ConnectionHandler::subscribe(clientid_t clientid, taskid_t taskid) +void ConnectionHandler::subscribe(clientid_t clientid, nodeid_t nodeid) { - connlist[clientid].insert(taskid); - DEBUG(conn, "Added subscriber of %d\n", taskid); + connlist[clientid].insert(nodeid); + DEBUG(conn, "Added subscriber of %d\n", nodeid); } -void ConnectionHandler::unsubscribe(clientid_t clientid, taskid_t taskid) +void ConnectionHandler::unsubscribe(clientid_t clientid, nodeid_t nodeid) { - connlist[clientid].erase(taskid); + connlist[clientid].erase(nodeid); } -SubscriberList ConnectionHandler::subscriberlist(TaskIdList tasks) +SubscriberList ConnectionHandler::subscriberlist(NodeIdList nodes) { - DEBUG(conn, "Subscriberlist request (#tasks: %d)\n", (int)tasks.size()); + DEBUG(conn, "Subscriberlist request (#nodes: %d)\n", (int)nodes.size()); SubscriberList clients; - for(TaskIdList::iterator i = tasks.begin(); i != tasks.end(); i++) + for(NodeIdList::iterator i = nodes.begin(); i != nodes.end(); i++) { - taskid_t tid = *i; + nodeid_t tid = *i; DEBUG(conn, "Locating subscribers of node %d\n", tid); for(ConnectionList::iterator ci = connlist.begin(); ci != connlist.end(); ci++) { - std::set::iterator ti = ci->second.find(tid); + std::set::iterator ti = ci->second.find(tid); if(ti != ci->second.end()) { - std::pair m; + std::pair m; m.first = ci->first; m.second = tid; clients.push_back(m); @@ -125,20 +125,20 @@ TEST_BEGIN; ConnectionHandler &h = connection_handler; h.init((clientid_t)1); -h.subscribe((clientid_t)1, (taskid_t)1); -h.subscribe((clientid_t)1, (taskid_t)2); +h.subscribe((clientid_t)1, (nodeid_t)1); +h.subscribe((clientid_t)1, (nodeid_t)2); h.init((clientid_t)2); -h.subscribe((clientid_t)2, (taskid_t)1); -h.subscribe((clientid_t)2, (taskid_t)2); +h.subscribe((clientid_t)2, (nodeid_t)1); +h.subscribe((clientid_t)2, (nodeid_t)2); h.init((clientid_t)3); -h.subscribe((clientid_t)3, (taskid_t)3); +h.subscribe((clientid_t)3, (nodeid_t)3); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)1); + SubscriberList clst = h.subscriberlist(nodes); TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -146,9 +146,9 @@ h.subscribe((clientid_t)3, (taskid_t)3); } { - TaskIdList tasks; - tasks.push_back((taskid_t)3); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)3); + SubscriberList clst = h.subscriberlist(nodes); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -156,9 +156,9 @@ h.subscribe((clientid_t)3, (taskid_t)3); } { - TaskIdList tasks; - tasks.push_back((taskid_t)4); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)4); + SubscriberList clst = h.subscriberlist(nodes); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -166,11 +166,11 @@ h.subscribe((clientid_t)3, (taskid_t)3); } { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)1); + nodes.push_back((nodeid_t)2); + nodes.push_back((nodeid_t)3); + SubscriberList clst = h.subscriberlist(nodes); TEST_TRUE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -179,11 +179,11 @@ h.subscribe((clientid_t)3, (taskid_t)3); h.close((clientid_t)1); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)1); + nodes.push_back((nodeid_t)2); + nodes.push_back((nodeid_t)3); + SubscriberList clst = h.subscriberlist(nodes); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_TRUE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -192,11 +192,11 @@ h.close((clientid_t)1); h.close((clientid_t)2); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)1); + nodes.push_back((nodeid_t)2); + nodes.push_back((nodeid_t)3); + SubscriberList clst = h.subscriberlist(nodes); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); @@ -205,11 +205,11 @@ h.close((clientid_t)2); h.close((clientid_t)3); { - TaskIdList tasks; - tasks.push_back((taskid_t)1); - tasks.push_back((taskid_t)2); - tasks.push_back((taskid_t)3); - SubscriberList clst = h.subscriberlist(tasks); + NodeIdList nodes; + nodes.push_back((nodeid_t)1); + nodes.push_back((nodeid_t)2); + nodes.push_back((nodeid_t)3); + SubscriberList clst = h.subscriberlist(nodes); TEST_FALSE(clst.find((clientid_t)1) != clst.end(), "Got client 1?"); TEST_FALSE(clst.find((clientid_t)2) != clst.end(), "Got client 2?"); -- cgit v1.2.3