oops, Waker needs locking

[saartuer.git] / tuerd

diff --git a/tuerd b/tuerd
index 92c4122c2cf0678e8f0fc20f875a3bf6ae481e6b..e828ebb6d5ecc85725163e5bd626292bd6239cb4 100755 (executable)
--- a/tuerd
+++ b/tuerd
@@ -30,10 +30,10 @@ GPIO.setmode(GPIO.BOARD)
 
 # bring 'em all up
 the_actor = actor.Actor()
 
 # bring 'em all up
 the_actor = actor.Actor()

-the_machine = statemachine.StateMachine(the_actor, args.fallback)
+the_waker = waker.Waker(the_machine)
+the_machine = statemachine.StateMachine(the_actor, the_waker, args.fallback)

 the_socket = tysock.TySocket(the_machine)
 the_pins = pins.PinsWatcher(the_machine)
 the_socket = tysock.TySocket(the_machine)
 the_pins = pins.PinsWatcher(the_machine)

-the_waker = waker.Waker(the_machine)

 
 # we do the socket accept thing in the main thread
 try:
 
 # we do the socket accept thing in the main thread
 try:


@@ -44,8 +44,8 @@ except KeyboardInterrupt:
        pass
 
 # bring 'em all down
        pass
 
 # bring 'em all down

-the_waker.stop()
-the_pins.stop()
+the_waker.stop() # this one first, it "randomly" calls other threads
+the_pins.stop() # as does this

 the_machine.stop()
 the_actor.stop()
 
 the_machine.stop()
 the_actor.stop()