Merge pull request #335 from tim-ist/python-fixes

Fixes and some cleanup in the python tools

tools/configure.ac

@@ -290,7 +290,6 @@ AC_OUTPUT(
 	tinyos/python/misc/Makefile
 	tinyos/python/packet/Makefile
 	tinyos/python/tossim/Makefile
-	tinyos/python/utils/Makefile
 	tinyos/safe/Makefile
 	tinyos/safe/tos-decode-flid
 	tinyos/safe/tos-ramsize

tools/tinyos/python/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = message misc packet tossim utils
+SUBDIRS = message misc packet tossim
 
 tospy_PYTHON = tos.py __init__.py
 tospydir = $(pythondir)/tinyos

tools/tinyos/python/__init__.py

@@ -29,4 +29,4 @@
 # Author: Geoffrey Mainland <[email protected]>
 #
 
-__all__ = ["message", "packet", "utils", "tossim", "misc"]
+__all__ = ["message", "packet", "tossim", "misc"]

tools/tinyos/python/message/MoteIF.py

@@ -34,9 +34,8 @@
 import struct
 import sys
 import traceback
-from tinyos.utils.Watcher import Watcher
 
-from tinyos.packet.Serial import Serial
+from tinyos.packet.SerialH import Serial
 from tinyos.message.SerialPacket import SerialPacket
 import tinyos.packet.PacketDispatcher
 import tinyos.packet.PacketSource
@@ -55,7 +54,6 @@ def __init__(self, *args):
 class MoteIF:
     def __init__(self):
         self.listeners = {}
-        self.watcher = Watcher.getInstance()
 
     def addListener(self, listener, msgClass):
         if listener not in self.listeners:
@@ -93,8 +91,7 @@ def dispatchPacket(self, source, packet):
             print >>sys.stderr, x
             print >>sys.stderr, traceback.print_tb(sys.exc_info()[2])
 
-        for l in self.listeners:
-            amTypes = self.listeners[l]
+        for l, amTypes in self.listeners.items():
             if amType in amTypes:
                 try:
                     msgClass = amTypes[amType]

tools/tinyos/python/packet/Makefile.am

@@ -4,11 +4,11 @@ tospy_PYTHON = avrmote.py SerialIO.py SFProtocol.py __init__.py \
                SerialSource.py ThreadTask.py
 
 tospydir = $(pythondir)/tinyos/packet
-BUILT_SOURCES = Serial.py
+BUILT_SOURCES = SerialH.py
 
 SERIAL_H = $(TINYOS_OS_DIR)/lib/serial/Serial.h
 TINYOS_OS_DIR ?= ../../../../tos
 TFLAGS = -I$(TINYOS_OS_DIR)/lib/serial -I$(TINYOS_OS_DIR)/types
 
-Serial.py:
+SerialH.py:
 	nescc-ncg -o $@ $(TFLAGS) -python-classname=Serial python $(SERIAL_H) Serial.h

tools/tinyos/python/packet/PacketSource.py

@@ -58,6 +58,7 @@ def __init__(self, dispatcher):
         self.semaphore = Semaphore(1)
         self.semaphore.acquire()
 
+    # this will be called in the new thread
     def __call__(self):
         try:
             self.open()
@@ -112,6 +113,8 @@ def __call__(self):
                         print "Unknown exception when dispatching packet"
 #                    break
 
+        self.cancel()
+
         try:
             self.close()
         except:

tools/tinyos/python/packet/SerialIO.py

@@ -41,17 +41,21 @@ def __init__(self, device, baud):
 
 	def open(self):
 		self.serial = serial.Serial(port=self.device,
-	                                baudrate=self.baud)
+	                                baudrate=self.baud, timeout=1)
 
 	def close(self):
 		self.serial.close()
 
 	def read(self, count):
-		while self.serial.inWaiting() < count:
+		data = ""
+		while count - len(data) > 0:
 			if self.isDone():
 				raise IODone()
-
-		return self.serial.read(count)
+			p = self.serial.read(count)
+			if len(p) == 0:
+				self.serial.inWaiting() # A workaround: raises IOException if USB serial device is disconnected
+			data += p
+		return data
 
 	def write(self, data):
 		return self.serial.write(data)

tools/tinyos/python/packet/SerialProtocol.py

@@ -35,7 +35,7 @@
 
 from threading import Lock, Condition, Thread
 from IO import IODone
-from Serial import Serial
+from SerialH import Serial
 
 SYNC_BYTE = Serial.HDLC_FLAG_BYTE
 ESCAPE_BYTE = Serial.HDLC_CTLESC_BYTE 
@@ -88,15 +88,17 @@ def run(self):
             #OK, kind of ugly. finishing the SerialSource (ThreadTask)
             # leads (ultimately) to an IODone exception coming up
             # through here. At this point, the thread should complete.
-            except IODone:
+            except Exception, e:
                 with self.prot.ackCV:
                     self.prot.lastAck = None
                     self.prot.ackCV.notify()
                 with self.prot.dataCV:
+                    self.prot.read_exception = e # storing exception to inform the other thread
                     self.prot.lastData = None
                     self.prot.dataCV.notify()
                 break
 
+
 class SerialProtocol:
     def __init__(self, ins, outs):
         self.ins = ins
@@ -115,6 +117,7 @@ def __init__(self, ins, outs):
         self.ackCV = Condition(rxLock)
         self.lastData = None
         self.lastAck = None
+        self.read_exception = None
 
     #also a little ugly: can't start this thread until the
     # serial.Serial object has been opened. This should all be
@@ -125,7 +128,10 @@ def open(self):
 
     def readPacket(self):
         with self.dataCV:
+            self.read_exception = None
             self.dataCV.wait()
+            if self.read_exception != None:
+                raise self.read_exception # an exception from the other thread
             return self.lastData
 
     def readFramedPacket(self):

tools/tinyos/python/packet/SocketIO.py

@@ -57,8 +57,9 @@ def open(self):
         self.socket.settimeout(1)
 
     def close(self):
-        self.socket.close()
-        self.socket = None
+        if self.socket is not None:
+            self.socket.close()
+            self.socket = None
 
     def read(self, count):
         data = ""
@@ -67,8 +68,11 @@ def read(self, count):
                 raise IODone()
 
             try:
-                data += self.socket.recv(count - len(data))
-            except:
+                p = self.socket.recv(count - len(data))
+                if len(p) == 0:
+                    raise IODone() # the remote side closed the connection
+                data += p
+            except socket.timeout:
                 pass
 
         return data