[GNUnet-SVN] r22722 - gnunet-planetlab/gplmt

[gnunet]

Author: wachs
Date: 2012-07-17 17:25:40 +0200 (Tue, 17 Jul 2012)
New Revision: 22722

Modified:
   gnunet-planetlab/gplmt/Notifications.py
   gnunet-planetlab/gplmt/Tasks.py
   gnunet-planetlab/gplmt/Worker.py
   gnunet-planetlab/gplmt/gplmt.py
Log:
- notifications

Modified: gnunet-planetlab/gplmt/Notifications.py
===================================================================
--- gnunet-planetlab/gplmt/Notifications.py     2012-07-17 15:17:21 UTC (rev 
22721)
+++ gnunet-planetlab/gplmt/Notifications.py     2012-07-17 15:25:40 UTC (rev 
22722)
@@ -27,4 +27,10 @@
         assert (None != logger)
         self.logger = logger
     def tasklist_started (self, tasks):
-        print "Tasklist '" +  tasks.name + "' started"
\ No newline at end of file
+        print "Tasklist '" +  tasks.name + "' started"
+    def tasklist_completed (self, tasks):
+        print "Tasklist '" +  tasks.name + "' completed"
+    def task_started (self, tasks):
+        print "Task '" +  tasks.name + "' started"
+    def task_completed (self, tasks):
+        print "Task '" +  tasks.name + "' completed"        
\ No newline at end of file

Modified: gnunet-planetlab/gplmt/Tasks.py
===================================================================
--- gnunet-planetlab/gplmt/Tasks.py     2012-07-17 15:17:21 UTC (rev 22721)
+++ gnunet-planetlab/gplmt/Tasks.py     2012-07-17 15:25:40 UTC (rev 22722)
@@ -152,13 +152,14 @@
         glogger = logger
         self.logger = logger
         self.filename = filename
-        self.name = None
+        self.name = "<Undefined>"
         self.l = list ()
     def load (self):        
         self.logger.log ("Loading nodes file '" + self.filename + "'")
         try:
-           root = ElementTree.parse (self.filename).getroot()     
-           self.name = root.attrib.get("name")
+           root = ElementTree.parse (self.filename).getroot()
+           if (None != root.attrib.get("name")):
+               self.name = root.attrib.get("name") 
         except IOError:
             print "File " + self.filename + " not found"
             return False

Modified: gnunet-planetlab/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/Worker.py    2012-07-17 15:17:21 UTC (rev 22721)
+++ gnunet-planetlab/gplmt/Worker.py    2012-07-17 15:25:40 UTC (rev 22722)
@@ -29,11 +29,12 @@
 
 
 class NodeWorkerThread (threading.Thread):
-    def __init__(self, threadID, name, tasks):
+    def __init__(self, threadID, name, tasks, notifications):
         threading.Thread.__init__(self)
         self.threadID = threadID
         self.name = name
         self.tasks = tasks
+        self.notifications = notifications
     def run(self):
         print "Starting " + self.name
         task = self.tasks.get()
@@ -49,29 +50,34 @@
 
 
 class NodeWorker:
-    def __init__(self, logger, node, tasks):
+    def __init__(self, logger, node, tasks, notifications):
         assert (None != logger)
         assert (None != node)
         assert (None != tasks)
+        assert (None != notifications)
         self.logger = logger
         self.node = node
         self.tasks = tasks
         self.thread = None
+        self.notifications = notifications
     def start (self):
         self.logger.log ("Starting execution for node " + self.node)
-        self.thread = NodeWorkerThread (1, self.node, self.tasks)
+        self.notifications.tasklist_started (self.tasks)
+        self.thread = NodeWorkerThread (1, self.node, self.tasks, 
self.notifications)
         self.thread.start()
     
 class Worker:
-    def __init__(self, logger, nodes, tasks):
+    def __init__(self, logger, nodes, tasks, notifications):
         assert (None != logger)
         assert (None != nodes)
         assert (None != tasks)
+        assert (None != notifications)
         self.logger = logger
         self.nodes = nodes
         self.tasks = tasks
+        self.notifications = notifications
     def start (self):
         self.logger.log ("Starting execution")
         for n in self.nodes.nodes:
-            nw = NodeWorker (self.logger, n, self.tasks.copy())
+            nw = NodeWorker (self.logger, n, self.tasks.copy(), 
self.notifications)
             nw.start()

Modified: gnunet-planetlab/gplmt/gplmt.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt.py     2012-07-17 15:17:21 UTC (rev 22721)
+++ gnunet-planetlab/gplmt/gplmt.py     2012-07-17 15:25:40 UTC (rev 22722)
@@ -29,6 +29,7 @@
 import Nodes;
 import Tasks;
 import Worker;
+import Notifications;
 
 # Checking dependencies
 # ElementTree XML Parser
@@ -119,13 +120,12 @@
     tasks = Tasks.Tasks (main.tasks_file, main.logger);
     if (tasks.load() == False):
         sys.exit(2)        
-    sys.exit(2)   
 
 # Set up notifications
+    notifications = Notifications.Notification (main.logger)
 
-
 # Start execution
-    worker = Worker.Worker (main.logger, nodes, tasks)
+    worker = Worker.Worker (main.logger, nodes, tasks, notifications)
     worker.start()
 # Clean up