mprove separation of system dependent code form main run loop code

Author: rfm

Headers/Foundation/NSRunLoop.h

@@ -52,7 +52,7 @@ GS_EXPORT_CLASS
   NSMapTable		*_contextMap;
   NSMutableArray	*_contextStack;
   NSMutableArray	*_timedPerformers;
-  void			*_extra;
+  void			*_internal;
 #endif
 }
 

Source/GSRunLoopCtxt.h

@@ -40,20 +40,13 @@
 
 #include "GNUstepBase/GSIArray.h"
 
-#ifdef  HAVE_POLL
-typedef struct{
-  int   limit;
-  short *index;
-}pollextra;
-#endif
-
 @class NSString;
 @class GSRunLoopWatcher;
 
 @interface	GSRunLoopCtxt : NSObject
 {
 @public
-  void		*extra;		/** Copy of the RunLoop ivar.		*/
+  void		*extra;		/** Common data for contexts in a loop  */
   NSString	*mode;		/** The mode for this context.		*/
   GSIArray	performers;	/** The actions to perform regularly.	*/
   unsigned	maxPerformers;
@@ -84,7 +77,7 @@ typedef struct{
               for: (GSRunLoopWatcher*)watcher;
 
 - (void) endPoll;
-- (id) initWithMode: (NSString*)theMode extra: (void*)e;
+- (id) initWithMode: (NSString*)theMode extra: (void**)e;
 - (BOOL) pollUntil: (int)milliseconds within: (NSArray*)contexts;
 
 /* Callbacks for a map table whose values are watchers.

Source/GSRunLoopCtxt.m

@@ -130,15 +130,15 @@ - (void) endPoll
   completed = YES;
 }
 
-- (id) initWithMode: (NSString*)theMode extra: (void*)e
+- (id) initWithMode: (NSString*)theMode extra: (void**)e
 {
   self = [super init];
   if (self != nil)
     {
       NSZone	*z;
 
       mode = [theMode copy];
-      extra = e;
+      extra = *e;
       z = [self zone];
       timers = [[GSMinHeap alloc] initWithCapacity: 100 andComparator: NULL];
       performers = NSZoneMalloc(z, sizeof(GSIArray_t));

Source/NSRunLoop.m

@@ -55,9 +55,6 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
-#ifdef HAVE_POLL_F
-#include <poll.h>
-#endif
 #include <math.h>
 #include <time.h>
 
@@ -72,10 +69,6 @@
 
 static NSDate	*theFuture = nil;
 
-@interface NSObject (OptionalPortRunLoop)
-- (void) getFds: (NSInteger*)fds count: (NSInteger*)count;
-@end
-
 
 
 /*
@@ -436,6 +429,13 @@ - (void) receivedEvent: (void*)data
 
 #endif
 
+typedef struct {
+  void                  *sharedContextInfo;
+} RunLoopInternal;
+                               
+#define internal        ((RunLoopInternal*)_internal)
+                                              
+
 @interface NSRunLoop (Private)
 
 - (void) _addWatcher: (GSRunLoopWatcher*)item
@@ -464,7 +464,8 @@ - (void) _addWatcher: (GSRunLoopWatcher*) item forMode: (NSString*)mode
   context = NSMapGet(_contextMap, mode);
   if (context == nil)
     {
-      context = [[GSRunLoopCtxt alloc] initWithMode: mode extra: _extra];
+      context = [[GSRunLoopCtxt alloc] initWithMode: mode
+	extra: &internal->sharedContextInfo];
       NSMapInsert(_contextMap, context->mode, context);
       RELEASE(context);
     }
@@ -594,17 +595,14 @@ - (GSRunLoopWatcher*) _getWatcher: (void*)data
 
 - (id) _init
 {
-  self = [super init];
-  if (self != nil)
+  if (nil != (self = [super init]))
     {
       _contextStack = [NSMutableArray new];
       _contextMap = NSCreateMapTable (NSNonRetainedObjectMapKeyCallBacks,
 					 NSObjectMapValueCallBacks, 0);
       _timedPerformers = [[NSMutableArray alloc] initWithCapacity: 8];
-#ifdef	HAVE_POLL_F
-      _extra = NSZoneMalloc(NSDefaultMallocZone(), sizeof(pollextra));
-      memset(_extra, '\0', sizeof(pollextra));
-#endif
+      _internal = (RunLoopInternal*)
+	NSZoneCalloc(NSDefaultMallocZone(), 1, sizeof(RunLoopInternal));
     }
   return self;
 }
@@ -850,15 +848,11 @@ - (id) init
 
 - (void) dealloc
 {
-#ifdef	HAVE_POLL_F
-  if (_extra != 0)
-    {
-      pollextra	*e = (pollextra*)_extra;
-      if (e->index != 0)
-	NSZoneFree(NSDefaultMallocZone(), e->index);
-      NSZoneFree(NSDefaultMallocZone(), e);
+  if (internal)
+    {   
+      NSZoneFree(NSDefaultMallocZone(), internal);
+      _internal = NULL;
     }
-#endif
   RELEASE(_contextStack);
   if (_contextMap != 0)
     {
@@ -924,7 +918,8 @@ - (void) addTimer: (NSTimer*)timer
   context = NSMapGet(_contextMap, mode);
   if (context == nil)
     {
-      context = [[GSRunLoopCtxt alloc] initWithMode: mode extra: _extra];
+      context = [[GSRunLoopCtxt alloc] initWithMode: mode
+	extra: &internal->sharedContextInfo];
       NSMapInsert(_contextMap, context->mode, context);
       RELEASE(context);
     }
@@ -1550,7 +1545,7 @@ - (void) performSelector: (SEL)aSelector
 	  if (context == nil)
 	    {
 	      context = [[GSRunLoopCtxt alloc] initWithMode: mode
-						      extra: _extra];
+		extra: &internal->sharedContextInfo];
 	      NSMapInsert(_contextMap, context->mode, context);
 	      RELEASE(context);
 	    }

Source/unix/GSRunLoopCtxt.m

@@ -24,6 +24,14 @@
 #include <poll.h>
 #endif
 
+#ifdef  HAVE_POLL
+typedef struct {
+  int   	limit;
+  short 	*index;
+  unsigned	refcount;
+} pollextra;
+#endif
+
 #define	FDCOUNT	1024
 
 @interface	GSRunLoopCtxtUnix: GSRunLoopCtxt
@@ -60,6 +68,19 @@ - (void) dealloc
     {
       NSZoneFree(NSDefaultMallocZone(), pollfds);
     }
+  if (extra)
+    {
+      pollextra	*pe = (pollextra*)extra;
+
+      if (--pe->refcount == 0)
+	{
+	  if (pe->index != 0)
+	    {
+	      NSZoneFree(NSDefaultMallocZone(), pe->index);
+	    }
+	  NSZoneFree(NSDefaultMallocZone(), pe);
+	}
+    }
 #endif
   DEALLOC
 }
@@ -112,7 +133,7 @@ - (void) endEvent: (void*)data
     }
 }
 
-- (id) initWithMode: (NSString*)theMode extra: (void*)e
+- (id) initWithMode: (NSString*)theMode extra: (void**)e
 {
   if (nil != (self = [super initWithMode: theMode extra: e]))
     {
@@ -122,6 +143,14 @@ - (id) initWithMode: (NSString*)theMode extra: (void*)e
 	[self watcherCallbacks], 0);
       _wfdMap = NSCreateMapTable (NSIntegerMapKeyCallBacks,
 	[self watcherCallbacks], 0);
+#ifdef	HAVE_POLL_F
+      if (NULL == *e)
+	{
+          *e = extra
+	    = NSZoneCalloc(NSDefaultMallocZone(), 1, sizeof(pollextra));
+	}
+      ((pollextra*)extra)->refcount++;
+#endif
     }
   return self;
 }

Source/win32/GSRunLoopCtxt.m

@@ -78,7 +78,7 @@ - (id) init
   return nil;
 }
 
-- (id) initWithMode: (NSString*)theMode extra: (void*)e
+- (id) initWithMode: (NSString*)theMode extra: (void**)e
 {
   if (nil != (self = [super initWithMode: theMode extra: e]))
     {