@@ -106,7 +106,6 @@ EventManager do( */ addEvent := method(e, descriptorId, eventType, timeout, //writeln("addEvent") - //writeln(Coroutine currentCoroutine backTraceString) //Exception raise("EventManager addEvent " .. e eventTypeName .. " - begin") //writeln("addEvent2") r := self realAddEvent(e, descriptorId, eventType, timeout) addons/Socket/io/A0_EventManager.io @@ -307,14 +307,16 @@ IoObject *IoEventManager_resetEventTimeout(IoEventManager *self, IoObject *local IoObject *IoEventManager_setListenTimeout(IoEventManager *self, IoObject *locals, IoMessage *m) { double timeout = IoMessage_locals_doubleArgAt_(m, locals, 0); - struct timeval tv = timevalFromDouble(timeout); - event_loopexit(&tv); + DATA(self)->listenTimeout = timevalFromDouble(timeout); return self; } IoObject *IoEventManager_listen(IoEventManager *self, IoObject *locals, IoMessage *m) { - int hadEvents = event_base_loop(DATA(self)->eventBase, EVLOOP_NONBLOCK); + int hadEvents; + + event_loopexit(&(DATA(self)->listenTimeout)); + hadEvents = event_base_loop(DATA(self)->eventBase, EVLOOP_NONBLOCK); //printf("IoEventManager_listen %p\n", (void *)self); if (hadEvents == -1) addons/Socket/source/IoEventManager.c @@ -29,6 +29,7 @@ typedef struct IoMessage *handleEventMessageFalse; List *activeEvents; //int activeHttpClientRequests; + struct timeval listenTimeout; } IoEventManagerData; #define ISEEVENTMANAGER(self) IoObject_hasCloneFunc_(self, (IoTagCloneFunc *)IoEventManager_rawClone) addons/Socket/source/IoEventManager.h 52542ca6af0716fd63932989fdee29a2a9a4e695 Steve Dekorte steve@StevesLaptop-7.local http://github.com/stevedekorte/io/commit/960e9e6c093bf9e5bc2b8fa9a401fcd87948ec5a 960e9e6c093bf9e5bc2b8fa9a401fcd87948ec5a 2009-11-10T19:13:36-08:00 2009-11-10T19:13:36-08:00 fix for setListenTimeout 979e9c7e672cb505560c8996367469b26f34b64c Steve Dekorte steve@StevesLaptop-7.local