Added attributes to nodes as well as messages for manipulating and transporting them. Switched debug interface to hugin.

1 files changed, 9 insertions, 7 deletions

diff --git a/src/connectionhandler.cc b/src/connectionhandler.cc
index da94cb8..d78c053 100644
--- a/src/connectionhandler.cc
+++ b/src/connectionhandler.cc
@@ -29,6 +29,8 @@
 
 #include <stdio.h>
 
+#include "hugin.hpp"
+
 // Global ConnectionHandler.
 ConnectionHandler connection_handler;
 
@@ -38,26 +40,26 @@ ConnectionHandler::ConnectionHandler()
 
 void ConnectionHandler::init(clientid_t clientid)
 {
-  printf("Adding client %p to connection list\n", clientid);
+  DEBUG(conn, "Adding client %p to connection list\n", clientid);
   connlist[clientid] = std::set<taskid_t>();
 
-  printf("Connections (%d):\n", connlist.size());
+  DEBUG(conn, "Connections (%d):\n", connlist.size());
   ConnectionList::iterator it;
   for(it = connlist.begin(); it != connlist.end(); it++) {
-    printf("\t%p\n", it->first);
+    DEBUG(conn, "\t%p\n", it->first);
   }
 }
 
 void ConnectionHandler::close(clientid_t clientid)
 {
   connlist.erase(clientid);
-  printf("Removed connection\n");
+  DEBUG(conn, "Removed connection\n");
 }
 
 void ConnectionHandler::observe(clientid_t clientid, taskid_t taskid)
 {
   connlist[clientid].insert(taskid);
-  printf("Added observer of %d\n", taskid);
+  DEBUG(conn, "Added observer of %d\n", taskid);
 }
 
 void ConnectionHandler::unobserve(clientid_t clientid, taskid_t taskid)
@@ -67,13 +69,13 @@ void ConnectionHandler::unobserve(clientid_t clientid, taskid_t taskid)
 
 ObserverList ConnectionHandler::observerlist(TaskIdList tasks)
 {
-  printf("Observerlist request (#tasks: %d)\n", tasks.size());
+  DEBUG(conn, "Observerlist request (#tasks: %d)\n", tasks.size());
   ObserverList clients;
 
   for(TaskIdList::iterator i = tasks.begin(); i != tasks.end(); i++) {
     taskid_t tid = *i;
 
-    printf("Locating observers of node %d\n", tid);
+    DEBUG(conn, "Locating observers of node %d\n", tid);
     for(ConnectionList::iterator ci = connlist.begin();
         ci != connlist.end(); ci++) {
       std::set<taskid_t>::iterator ti = ci->second.find(tid);