Author: dmeyer
Date: Mon Jan 7 16:31:11 2008
New Revision: 2950
Log:
adjust to latest kaa.notifier changes
Removed:
trunk/base/src/xmlrpc.py
Modified:
trunk/base/src/config.py
trunk/base/src/extensions/inotify/__init__.py
trunk/base/src/input/lirc.py
trunk/base/src/input/stdin.py
trunk/base/src/notifier/main.py
trunk/base/src/notifier/nf_thread.py
trunk/base/src/notifier/reactor.py
trunk/base/src/rpc.py
Modified: trunk/base/src/config.py
==============================================================================
--- trunk/base/src/config.py (original)
+++ trunk/base/src/config.py Mon Jan 7 16:31:11 2008
@@ -43,7 +43,7 @@
# kaa.base modules
from strutils import str_to_unicode, unicode_to_str, get_encoding
-from kaa.notifier import Callback, WeakCallback, WeakTimer, WeakOneShotTimer
+from kaa import Callback, WeakCallback, WeakTimer, WeakOneShotTimer
from kaa.inotify import INotify
# get logging object
Modified: trunk/base/src/extensions/inotify/__init__.py
==============================================================================
--- trunk/base/src/extensions/inotify/__init__.py (original)
+++ trunk/base/src/extensions/inotify/__init__.py Mon Jan 7 16:31:11 2008
@@ -36,7 +36,7 @@
import select
# kaa imports
-import kaa.notifier
+import kaa
try:
# imports C module
@@ -71,7 +71,7 @@
self.signals = {
# Master signal: this signal gets emitted on all events.
- "event": kaa.notifier.Signal()
+ "event": kaa.Signal()
}
self._watches = {}
@@ -83,7 +83,7 @@
self._watches_recently_removed = []
self._read_buffer = ""
self._move_state = None # For MOVED_FROM events
- self._moved_timer = kaa.notifier.WeakOneShotTimer(self._emit_last_move)
+ self._moved_timer = kaa.WeakOneShotTimer(self._emit_last_move)
self._fd = _inotify.init()
@@ -91,7 +91,7 @@
raise SystemError, "INotify support not detected on this system."
fcntl.fcntl(self._fd, fcntl.F_SETFL, os.O_NONBLOCK)
- self._mon = kaa.notifier.WeakSocketDispatcher(self._handle_data)
+ self._mon = kaa.WeakSocketDispatcher(self._handle_data)
self._mon.register(self._fd)
@@ -122,7 +122,7 @@
if wd < 0:
raise IOError, "Failed to add watch on '%s'" % path
- signal = kaa.notifier.Signal()
+ signal = kaa.Signal()
self._watches[wd] = [signal, path]
self._watches_by_path[path] = [signal, wd]
return signal
Modified: trunk/base/src/input/lirc.py
==============================================================================
--- trunk/base/src/input/lirc.py (original)
+++ trunk/base/src/input/lirc.py Mon Jan 7 16:31:11 2008
@@ -36,7 +36,7 @@
import time
# kaa imports
-import kaa.notifier
+import kaa
try:
# try to import python lirc module
@@ -54,8 +54,8 @@
# make sure we have the lirc signal, no matter
# if lirc is working or not
-signal = kaa.notifier.Signal()
-kaa.notifier.signals["lirc"] = signal
+signal = kaa.Signal()
+kaa.signals["lirc"] = signal
def _handle_lirc_input():
"""
@@ -111,7 +111,7 @@
_dispatcher.unregister()
_dispatcher = None
pylirc.exit()
- kaa.notifier.signals["shutdown"].disconnect(stop)
+ kaa.main.signals["shutdown"].disconnect(stop)
def init(appname = None, cfg = None):
@@ -144,9 +144,9 @@
return False
pylirc.blocking(0)
- _dispatcher = kaa.notifier.SocketDispatcher(_handle_lirc_input)
+ _dispatcher = kaa.SocketDispatcher(_handle_lirc_input)
_dispatcher.register(fd)
- kaa.notifier.signals["shutdown"].connect(stop)
+ kaa.main.signals["shutdown"].connect(stop)
return True
@@ -159,4 +159,4 @@
def cb(code):
print "CODE", code
signal.connect(cb)
- kaa.notifier.loop()
+ kaa.main.start()
Modified: trunk/base/src/input/stdin.py
==============================================================================
--- trunk/base/src/input/stdin.py (original)
+++ trunk/base/src/input/stdin.py Mon Jan 7 16:31:11 2008
@@ -40,7 +40,6 @@
# kaa imports
import kaa
-import kaa.notifier
_tc_orig_settings = None
_getch_enabled = False
@@ -126,17 +125,17 @@
return True
-_dispatcher = kaa.notifier.SocketDispatcher(_handle_stdin_keypress)
+_dispatcher = kaa.SocketDispatcher(_handle_stdin_keypress)
def _keypress_signal_changed(s, flag):
- if flag == kaa.notifier.Signal.SIGNAL_CONNECTED and s.count() == 1:
+ if flag == kaa.Signal.SIGNAL_CONNECTED and s.count() == 1:
getch_enable()
_dispatcher.register(sys.stdin)
- elif flag == kaa.notifier.Signal.SIGNAL_DISCONNECTED and s.count() == 0:
+ elif flag == kaa.Signal.SIGNAL_DISCONNECTED and s.count() == 0:
getch_disable()
_dispatcher.unregister()
# init
-signal = kaa.notifier.Signal(changed_cb = _keypress_signal_changed)
+signal = kaa.Signal(changed_cb = _keypress_signal_changed)
kaa.signals["stdin_key_press_event"] = signal
Modified: trunk/base/src/notifier/main.py
==============================================================================
--- trunk/base/src/notifier/main.py (original)
+++ trunk/base/src/notifier/main.py Mon Jan 7 16:31:11 2008
@@ -138,6 +138,9 @@
def is_running():
return _running
+def _set_running(status):
+ global _running
+ _running = status
def select_notifier(module, **options):
"""
Modified: trunk/base/src/notifier/nf_thread.py
==============================================================================
--- trunk/base/src/notifier/nf_thread.py (original)
+++ trunk/base/src/notifier/nf_thread.py Mon Jan 7 16:31:11 2008
@@ -36,8 +36,9 @@
import logging
# kaa.notifier imports
-import kaa.notifier
+import kaa
import nf_wrapper
+from main import _set_running as set_mainloop_running
# get logging object
log = logging.getLogger('notifier')
@@ -49,7 +50,7 @@
def __init__(self, interleave, shutdown = None):
super(ThreadLoop, self).__init__()
self._call_mainloop = interleave
- self._mainloop_shutdown = kaa.notifier.shutdown
+ self._mainloop_shutdown = kaa.main.stop
if shutdown:
self._mainloop_shutdown = shutdown
self._lock = threading.Semaphore(0)
@@ -64,7 +65,7 @@
try:
nf_wrapper.step(sleep = False)
except (KeyboardInterrupt, SystemExit):
- kaa.notifier.running = False
+ set_mainloop_running(False)
self._mainloop_shutdown()
finally:
self._lock.release()
@@ -74,27 +75,27 @@
"""
Thread part running the blocking, simulating loop.
"""
- kaa.notifier.running = True
+ set_mainloop_running(True)
try:
while True:
self.sleeping = True
nf_wrapper.step(simulate = True)
self.sleeping = False
- if not kaa.notifier.running:
+ if not kaa.main.is_running():
break
self._call_mainloop(self.handle)
self._lock.acquire()
- if not kaa.notifier.running:
+ if not kaa.main.is_running():
break
except (KeyboardInterrupt, SystemExit):
pass
except Exception, e:
log.exception('loop')
- if kaa.notifier.running:
+ if kaa.main.is_running():
# this loop stopped, call real mainloop stop. This
# should never happen because we call no callbacks.
log.warning('thread loop stopped')
- kaa.notifier.running = False
+ set_mainloop_running(False)
self._call_mainloop(self._mainloop_shutdown)
@@ -103,9 +104,9 @@
Stop the thread and cleanup.
"""
log.info('stop mainloop')
- kaa.notifier.running = False
- kaa.notifier.wakeup()
- kaa.notifier.shutdown()
+ set_mainloop_running(False)
+ kaa.main.wakeup()
+ kaa.main.stop()
class TwistedLoop(ThreadLoop):
@@ -130,7 +131,7 @@
def __call__(self, *args, **kwargs):
ret = self.func(*args, **kwargs)
if self.loop.sleeping:
- kaa.notifier.wakeup()
+ kaa.main.wakeup()
return ret
@@ -148,7 +149,7 @@
raise RuntimeError('unknown notifier module %s', module)
nf_wrapper.init( 'generic', force_internal=True, **options )
# set main thread and init thread pipe
- kaa.notifier.set_current_as_mainthread()
+ kaa.set_current_as_mainthread()
# adding a timer or socket is not thread safe in general but
# an additional wakeup we don't need does not hurt. And in
# simulation mode the step function does not modify the
Modified: trunk/base/src/notifier/reactor.py
==============================================================================
--- trunk/base/src/notifier/reactor.py (original)
+++ trunk/base/src/notifier/reactor.py Mon Jan 7 16:31:11 2008
@@ -32,8 +32,7 @@
# get and install reactor
from twisted.internet import threadedselectreactor
-import kaa.notifier
-import kaa.notifier.thread
+import kaa
class KaaReactor(threadedselectreactor.ThreadedSelectReactor):
"""
@@ -44,7 +43,7 @@
Callback from the Twisted thread kaa should execute from
the mainloop.
"""
- a = kaa.notifier.MainThreadCallback(func)
+ a = kaa.MainThreadCallback(func)
a.set_async(False)
return a()
@@ -53,10 +52,10 @@
"""
Callback when Twisted wants to stop.
"""
- if not kaa.notifier.is_mainthread():
- return kaa.notifier.MainThreadCallback(twisted_stop)()
- kaa.notifier.OneShotTimer(kaa.notifier.shutdown).start(0)
- kaa.notifier.signals['shutdown'].disconnect(self.stop)
+ if not kaa.is_mainthread():
+ return kaa.MainThreadCallback(twisted_stop)()
+ kaa.OneShotTimer(kaa.main.stop).start(0)
+ kaa.main.signals['shutdown'].disconnect(self.stop)
def connect(self):
@@ -65,7 +64,7 @@
"""
self.interleave(self._kaa_callback)
self.addSystemEventTrigger('after', 'shutdown', self._kaa_stop)
- kaa.notifier.signals['shutdown'].connect(self.stop)
+ kaa.main.signals['shutdown'].connect(self.stop)
def run(self, installSignalHandlers=1):
@@ -73,7 +72,7 @@
Run the reactor by starting the notifier mainloop.
"""
self.startRunning(installSignalHandlers=installSignalHandlers)
- kaa.notifier.loop()
+ kaa.main.start()
def install():
Modified: trunk/base/src/rpc.py
==============================================================================
--- trunk/base/src/rpc.py (original)
+++ trunk/base/src/rpc.py Mon Jan 7 16:31:11 2008
@@ -92,7 +92,6 @@
# kaa imports
import kaa
-import kaa.notifier
# get logging object
log = logging.getLogger('rpc')
@@ -137,13 +136,13 @@
self.socket.setblocking(False)
self.socket.bind(address)
self.socket.listen(5)
- self._mon = kaa.notifier.WeakSocketDispatcher(self._new_connection)
+ self._mon = kaa.WeakSocketDispatcher(self._new_connection)
self._mon.register(self.socket.fileno())
# Remove socket file and close clients on shutdown
kaa.signals["shutdown"].connect_weak(self.close)
self.signals = {
- "client_connected": kaa.notifier.Signal(),
+ "client_connected": kaa.Signal(),
}
self.objects = []
@@ -187,9 +186,9 @@
def __init__(self, socket, auth_secret):
self._socket = socket
- self._rmon = kaa.notifier.SocketDispatcher(self._handle_read)
- self._rmon.register(self._socket.fileno(), kaa.notifier.IO_READ)
- self._wmon = kaa.notifier.SocketDispatcher(self._handle_write)
+ self._rmon = kaa.SocketDispatcher(self._handle_read)
+ self._rmon.register(self._socket.fileno(), kaa.IO_READ)
+ self._wmon = kaa.SocketDispatcher(self._handle_write)
self._authenticated = False
self._write_buffer = ''
self._write_buffer_delayed = ''
@@ -200,7 +199,7 @@
self._auth_secret = auth_secret
self._pending_challenge = None
- self.signals = { 'closed': kaa.notifier.Signal() }
+ self.signals = { 'closed': kaa.Signal() }
kaa.signals["shutdown"].connect_weak(self._handle_close)
@@ -225,18 +224,18 @@
"""
Call the remote command and return InProgress.
"""
- if not kaa.notifier.is_mainthread():
+ if not kaa.is_mainthread():
# create InProgress object and return
- callback = kaa.notifier.InProgress()
+ callback = kaa.InProgress()
kwargs['_kaa_rpc_callback'] = callback
- kaa.notifier.MainThreadCallback(self.rpc)(cmd, *args, **kwargs)
+ kaa.MainThreadCallback(self.rpc)(cmd, *args, **kwargs)
return callback
if not self._wmon:
raise IOError('channel is disconnected')
seq = self._next_seq
self._next_seq += 1
# create InProgress object
- callback = kwargs.pop('_kaa_rpc_callback', kaa.notifier.InProgress())
+ callback = kwargs.pop('_kaa_rpc_callback', kaa.InProgress())
packet_type = 'CALL'
payload = cPickle.dumps((cmd, args, kwargs), pickle.HIGHEST_PROTOCOL)
self._send_packet(seq, packet_type, payload)
@@ -389,7 +388,7 @@
written next notifier loop.
"""
if not self._wmon.active() and self._write_buffer:
- self._wmon.register(self._socket.fileno(), kaa.notifier.IO_WRITE)
+ self._wmon.register(self._socket.fileno(), kaa.IO_WRITE)
def _handle_write(self, close_on_error=True):
@@ -447,7 +446,7 @@
if self._callbacks[function]._kaa_rpc_param[0]:
args = [ self ] + list(args)
payload = self._callbacks[function](*args, **kwargs)
- if isinstance(payload, kaa.notifier.InProgress):
+ if isinstance(payload, kaa.InProgress):
payload.connect(self._send_delayed_answer, seq, 'RETN')
payload.exception_handler.connect(self._send_delayed_exception, seq, 'EXCP')
return True
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
