gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

patch by Alexander Malmberg allowing event polling to time out more quickly

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@20296 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
arobert 2004-11-05 03:52:22 +00:00
parent 65997ec654
commit 7b13142643
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2004-11-04 Adrian Robert <arobert@cogsci.ucsd.edu>
* Source/NSRunLoop.m (limitDateForMode:) Correction to housekeeper
timer logic so event polling times out within reasonable time.
Patch by Alexander Malmberg <alexander@malmberg.org>.
2004-11-04 Georg Fleischmann
* Headers/Foundation/NSTimeZone.h, Source/NSTimeZone.m
(+knownTimeZoneNames:): New method.

25
Source/NSRunLoop.m
View file

@ -1724,13 +1724,12 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
*/
- (NSDate*) limitDateForMode: (NSString*)mode
{
extern NSTimer *GSHousekeeper();
extern NSTimer *GSHousekeeper(void);
GSRunLoopCtxt *context = NSMapGet(_contextMap, mode);
NSDate *when = nil;
if (context != nil)
{
NSTimer *min_timer = nil;
GSRunLoopWatcher *min_watcher = nil;
NSString *savedMode = _currentMode;
CREATE_AUTORELEASE_POOL(arp);
@ -1743,7 +1742,7 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
while (GSIArrayCount(timers) != 0)
{
min_timer = GSIArrayItemAtIndex(timers, 0).obj;
NSTimer *min_timer = GSIArrayItemAtIndex(timers, 0).obj;
if (timerInvalidated(min_timer) == YES)
{
GSIArrayRemoveItemAtIndex(timers, 0);
@ -1751,6 +1750,9 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
continue;
}
if (!when)
when = [timerDate(min_timer) copy];
if ([timerDate(min_timer) timeIntervalSinceNow] > 0)
{
break;
@ -1768,7 +1770,6 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
{
RELEASE(min_timer);
}
min_timer = nil;
GSNotifyASAP(); /* Post notifications. */
}
@ -1844,12 +1845,11 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
/*
* If there is nothing being watched, and no valid timers
* other than the housekeeper, we set min_timer to nil so
* other than the housekeeper, we set when to nil so
* that the housekeeper timer does not keep the runloop
* active. It's a special case set up in NSThread.m
*/
if (min_watcher == nil && min_timer != nil
&& min_timer == GSHousekeeper())
if (min_watcher == nil && when)
{
unsigned count = GSIArrayCount(timers);
@ -1863,7 +1863,7 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
}
if (GSIArrayCount(timers) == 1)
{
min_timer = nil;
DESTROY(when);
}
}
@ -1879,19 +1879,22 @@ static void setPollfd(int fd, int event, GSRunLoopCtxt *ctxt)
RELEASE(arp);
/*
* If there are timers - set limit date to the earliest of them.
* If there are timers, when is already set to the limit date of the
* earliest of them (and retained!).
* If there are watchers, set the limit date to that of the earliest
* watcher (or leave it as the date of the earliest timer if that is
* before the watchers limit).
*/
if (min_timer != nil)
if (when)
{
when = timerDate(min_timer);
if (min_watcher != nil
&& [min_watcher->_date compare: when] == NSOrderedAscending)
{
RELEASE(when);
when = min_watcher->_date;
}
else
AUTORELEASE(when);
}
else if (min_watcher != nil)
{