Changeset 5831 for WiredAdditions/trunk

Timestamp:

08/29/08 16:55:56 (3 months ago)

Author:

morris

Message:

Add a simple runloop callback for read events for socket

Files:

• WiredAdditions/trunk/WiredNetworking/WISocket.h (modified) (4 diffs)
• WiredAdditions/trunk/WiredNetworking/WISocket.m (modified) (3 diffs)

WiredAdditions/trunk/WiredNetworking/WISocket.h

@@ -57 +57 @@
-
-
+enum _WISocketEvent {
+        WISocketEventNone                               = (0 << 0),
+        WISocketEventHasBytesAvailable  = (1 << 0)
+};
+typedef enum _WISocketEvent                     WISocketEvent;
+
+
+@protocol WISocketDelegate;
-@class WIAddress, WIError;
-
-@interface WISocket : WIObject {
+        id <WISocketDelegate>                   delegate;
+        
-        wi_socket_t                                             *_socket;
-        
@@ -65 +75 @@
-        
-        NSMutableString                                 *_buffer;
+
+        NSUInteger                                              _sources;
+        CFSocketRef                                             _socketRef;
+        CFRunLoopSourceRef                              _sourceRef;
-}
-
@@ -84 +98 @@
-- (NSString *)certificateHostname;
-
+- (void)setDelegate:(id <WISocketDelegate>)delegate;
+- (id <WISocketDelegate>)delegate;
-- (void)setPort:(NSUInteger)port;
-- (NSUInteger)port;
@@ -104 +120 @@
-- (NSString *)readStringUpToString:(NSString *)separator encoding:(NSStringEncoding)encoding timeout:(NSTimeInterval)timeout error:(WIError **)error;
-
+- (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode;
+- (void)removeFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode;
+
-@end
+
+
+@protocol WISocketDelegate <NSObject>
+
+- (void)socket:(WISocket *)socket handleEvent:(WISocketEvent)event;
+
+@end

WiredAdditions/trunk/WiredNetworking/WISocket.m

@@ -35 +35 @@
-
-
+static void _WISocketCallback(CFSocketRef, CFSocketCallBackType, CFDataRef, const void *, void *);
+
+static void _WISocketCallback(CFSocketRef socketRef, CFSocketCallBackType callbackType, CFDataRef address, const void *data, void *info) {
+        WISocket                *socket = info;
+        
+        if(callbackType == kCFSocketReadCallBack)
+                [[socket delegate] socket:socket handleEvent:WISocketEventHasBytesAvailable];
+}
+
+
+
-@interface WISocketTLS(Private)
-
@@ -266 +277 @@
-
-#pragma mark -
+
+- (void)setDelegate:(id <WISocketDelegate>)newDelegate {
+        delegate = newDelegate;
+}
+
+
+
+- (id <WISocketDelegate>)delegate {
+        return delegate;
+}
+
+
-
-- (void)setPort:(NSUInteger)port {
@@ -536 +559 @@
-}
-
+
+
+- (void)scheduleInRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode {
+        CFSocketContext                 context;
+        
+        if(!_sourceRef) {
+                context.version                         = 0;
+                context.info                            = self;
+                context.retain                          = NULL;
+                context.release                         = NULL;
+                context.copyDescription         = NULL;
+                
+                _socketRef = CFSocketCreateWithNative(NULL,
+                                                                                          wi_socket_descriptor(_socket),
+                                                                                          kCFSocketReadCallBack,
+                                                                                          _WISocketCallback,
+                                                                                          &context);
+                
+                _sourceRef = CFSocketCreateRunLoopSource(NULL, _socketRef, 0);
+        }
+
+        if(!CFRunLoopContainsSource([runLoop getCFRunLoop], _sourceRef, (CFStringRef) mode)) {
+                CFRunLoopAddSource([runLoop getCFRunLoop], _sourceRef, (CFStringRef) mode);
+        
+                _sources++;
+        }
+}
+
+
+
+- (void)removeFromRunLoop:(NSRunLoop *)runLoop forMode:(NSString *)mode {
+        if(CFRunLoopContainsSource([runLoop getCFRunLoop], _sourceRef, (CFStringRef) mode)) {
+                CFRunLoopRemoveSource([runLoop getCFRunLoop], _sourceRef, (CFStringRef) mode);
+        
+                _sources--;
+        }
+        
+        if(_sources == 0) {
+                if(_sourceRef) {
+                        CFRelease(_sourceRef);
+                        _sourceRef = NULL;
+                }
+                
+                if(_socketRef) {
+                        CFRelease(_socketRef);
+                        _socketRef = NULL;
+                }
+        }
+}
+
-@end