Author: dmeyer
Date: Sun Dec 2 07:59:54 2007
New Revision: 2908
Log:
sync with pynotifier
o call timer after select
o cleanup try/except blocks
o handle unix events
Modified:
trunk/base/src/notifier/pynotifier/nf_generic.py
Modified: trunk/base/src/notifier/pynotifier/nf_generic.py
==============================================================================
--- trunk/base/src/notifier/pynotifier/nf_generic.py (original)
+++ trunk/base/src/notifier/pynotifier/nf_generic.py Sun Dec 2 07:59:54 2007
@@ -5,7 +5,7 @@
#
# generic notifier implementation
#
-# Copyright (C) 2004, 2005, 2006
+# Copyright (C) 2004, 2005, 2006, 2007
# Andreas Büsching <[EMAIL PROTECTED]>
#
# This library is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
from select import select
from select import error as select_error
from time import time
-import os, sys
+import errno, os, sys
import socket
@@ -127,55 +127,8 @@
try:
if __step_depth > __step_depth_max:
log.exception( 'maximum recursion depth reached' )
- __step_depth -= 1
- __in_step = False
return
- # handle timers
- _copy = __timers.copy()
- for i, timer in _copy.items():
- timestamp = timer[ TIMESTAMP ]
- if not timestamp:
- # prevert recursion, ignore this timer
- continue
- now = int( time() * 1000 )
- if timestamp <= now:
- if simulate:
- # we only simulate and we should be
called
- __step_depth -= 1
- __in_step = False
- return
- # Update timestamp on timer before calling the
callback to
- # prevent infinite recursion in case the
callback calls
- # step().
- timer[ TIMESTAMP ] = 0
- try:
- if not timer[ CALLBACK ]():
- if __timers.has_key( i ):
- del __timers[ i ]
- else:
- # Find a moment in the future.
If interval is 0, we
- # just reuse the old
timestamp, doesn't matter.
- now = int( time() * 1000 )
- if timer[ INTERVAL ]:
- timestamp += timer[
INTERVAL ]
- while timestamp <= now:
- timestamp +=
timer[ INTERVAL ]
- timer[ TIMESTAMP ] = timestamp
- except ( KeyboardInterrupt, SystemExit ), e:
- __step_depth -= 1
- __in_step = False
- raise e
- except:
- log.exception( 'removed timer %d' % i )
- if __timers.has_key( i ):
- del __timers[ i ]
-
- # if it causes problems to iterate over probably
non-existing
- # timers, I think about adding the following code:
- # if not __in_step:
- # break
-
# get minInterval for max timeout
timeout = None
if not sleep:
@@ -202,21 +155,48 @@
timeout = 30000
if __min_timer and __min_timer < timeout: timeout =
__min_timer
+ # wait for event
r = w = e = ()
try:
- r, w, e = select( __sockets[ IO_READ ].keys(),
- __sockets[ IO_WRITE
].keys(),
- __sockets[ IO_EXCEPT
].keys(), timeout / 1000.0 )
- except ( ValueError, select_error ):
- log.exception( 'error in select' )
- sys.exit( 1 )
+ if timeout:
+ timeout /= 1000.0
+ r, w, e = select( __sockets[ IO_READ ].keys(),
__sockets[ IO_WRITE ].keys(),
+ __sockets[ IO_EXCEPT
].keys(), timeout )
+ except select_error, e:
+ if e[ 0 ] != errno.EINTR:
+ raise e
if simulate:
- __step_depth -= 1
- __in_step = False
# we only simulate
return
+ # handle timers
+ _copy = __timers.copy()
+ for i, timer in _copy.items():
+ timestamp = timer[ TIMESTAMP ]
+ if not timestamp:
+ # prevent recursion, ignore this timer
+ continue
+ now = int( time() * 1000 )
+ if timestamp <= now:
+ # Update timestamp on timer before calling the
callback to
+ # prevent infinite recursion in case the
callback calls
+ # step().
+ timer[ TIMESTAMP ] = 0
+ if not timer[ CALLBACK ]():
+ if __timers.has_key( i ):
+ del __timers[ i ]
+ else:
+ # Find a moment in the future. If
interval is 0, we
+ # just reuse the old timestamp, doesn't
matter.
+ now = int( time() * 1000 )
+ if timer[ INTERVAL ]:
+ timestamp += timer[ INTERVAL ]
+ while timestamp <= now:
+ timestamp += timer[
INTERVAL ]
+ timer[ TIMESTAMP ] = timestamp
+
+ # handle sockets
for sl in ( ( r, IO_READ ), ( w, IO_WRITE ), ( e, IO_EXCEPT ) ):
sockets, condition = sl
# append all unknown sockets to check list
@@ -225,38 +205,19 @@
__current_sockets[ condition ].append(
s )
while len( __current_sockets[ condition ] ):
sock = __current_sockets[ condition ].pop( 0 )
- is_socket = isinstance( sock, ( socket.socket,
file,
-
socket._socketobject ) )
+ is_socket = isinstance( sock, ( socket.socket,
file, socket._socketobject ) )
if ( is_socket and sock.fileno() != -1 ) or \
( isinstance( sock, int ) and sock
!= -1 ):
- if __sockets[ condition ].has_key( sock
):
- try:
- if not __sockets[
condition ][ sock ]( sock ):
- socket_remove(
sock, condition )
- except ( KeyboardInterrupt,
SystemExit ), e:
- raise e
- except:
- log.exception( 'error
in socket callback' )
- sys.exit( 1 )
+ if __sockets[ condition ].has_key( sock
) and \
+ not __sockets[ condition ][
sock ]( sock ):
+ socket_remove( sock, condition )
# handle external dispatchers
if external:
- try:
- dispatch.dispatcher_run()
- except ( KeyboardInterrupt, SystemExit ), e:
- raise e
- except Exception, e:
- __step_depth -= 1
- __in_step = False
- log.exception( 'error in dispatcher function' )
- raise e
- except ( KeyboardInterrupt, SystemExit ), e:
+ dispatch.dispatcher_run()
+ finally:
__step_depth -= 1
__in_step = False
- raise e
-
- __step_depth -= 1
- __in_step = False
def loop():
"""Executes the 'main loop' forever by calling step in an endless
loop"""
-------------------------------------------------------------------------
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
