Changeset 3093

Timestamp:

12/27/05 01:51:20 (3 years ago)

Author:

timothy

Message:

• Make the new connection code run in a thread.
  
• Adding the InterThreadMessaging? code to let use call methods on the connection thread.
  

Files:

• branches/cocoa-networking/Chat Core.xcodeproj/project.pbxproj (modified) (4 diffs)
• branches/cocoa-networking/Chat Core/InterThreadMessaging.h (added)
• branches/cocoa-networking/Chat Core/InterThreadMessaging.m (added)
• branches/cocoa-networking/Chat Core/MVChatConnection.m (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.h (modified) (1 diff)
• branches/cocoa-networking/Chat Core/MVIRCChatConnection.m (modified) (11 diffs)

branches/cocoa-networking/Chat Core.xcodeproj/project.pbxproj

@@ -45 +45 @@
-                1CD020B505759347000F93B4 /* NSStringAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD020B305759347000F93B4 /* NSStringAdditions.m */; };
-                1CD020C0057593F9000F93B4 /* NSColorAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD020BD057593A9000F93B4 /* NSColorAdditions.m */; };
+                1CD6296709611B9100BD1DD2 /* InterThreadMessaging.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CD6290D096118B900BD1DD2 /* InterThreadMessaging.m */; };
-                1CDDD9AD0718BD2E00FE11C3 /* MVChatRoom.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C5CC07A06FFCB0B0006C5B1 /* MVChatRoom.h */; settings = {ATTRIBUTES = (Public, ); }; };
-                1CE4630F095ECCFE00AB7732 /* MVChatUserPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1CE4630E095ECCFE00AB7732 /* MVChatUserPrivate.h */; };
@@ -323 +324 @@
-                1CD020BC057593A9000F93B4 /* NSColorAdditions.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = NSColorAdditions.h; path = Additions/NSColorAdditions.h; sourceTree = "<group>"; };
-                1CD020BD057593A9000F93B4 /* NSColorAdditions.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = NSColorAdditions.m; path = Additions/NSColorAdditions.m; sourceTree = "<group>"; };
+                1CD6290C096118B900BD1DD2 /* InterThreadMessaging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InterThreadMessaging.h; path = "Chat Core/InterThreadMessaging.h"; sourceTree = "<group>"; };
+                1CD6290D096118B900BD1DD2 /* InterThreadMessaging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = InterThreadMessaging.m; path = "Chat Core/InterThreadMessaging.m"; sourceTree = "<group>"; };
-                1CE4630E095ECCFE00AB7732 /* MVChatUserPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatUserPrivate.h; path = "Chat Core/MVChatUserPrivate.h"; sourceTree = "<group>"; };
-                1CE4631D095ECD7300AB7732 /* MVChatRoomPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MVChatRoomPrivate.h; path = "Chat Core/MVChatRoomPrivate.h"; sourceTree = "<group>"; };
@@ -738 +741 @@
-                                1CEEB164095BE36700166A54 /* AsyncSocket.m */,
-                                1CEEB163095BE36700166A54 /* AsyncSocket.h */,
+                                1CD6290D096118B900BD1DD2 /* InterThreadMessaging.m */,
+                                1CD6290C096118B900BD1DD2 /* InterThreadMessaging.h */,
-                        );
-                        name = "Sources & Headers";
@@ -974 +979 @@
-                                1C7C776A07DBBA4500FB5F83 /* NSScriptCommandAdditions.m in Sources */,
-                                1CEEB166095BE36700166A54 /* AsyncSocket.m in Sources */,
+                                1CD6296709611B9100BD1DD2 /* InterThreadMessaging.m in Sources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

branches/cocoa-networking/Chat Core/MVChatConnection.m

@@ -759 +759 @@
-
-- (void) _didDisconnect {
-
+|| _status == MVChatConnectionServerDisconnectedStatus 
-
-        [[self localUser] _setStatus:MVChatUserOfflineStatus];

branches/cocoa-networking/Chat Core/MVIRCChatConnection.h

@@ -7 +7 @@
-@private
-        AsyncSocket *_chatConnection;
+        NSThread *_connectionThread;
-        NSMutableDictionary *_knownUsers;
-        NSString *_server;

branches/cocoa-networking/Chat Core/MVIRCChatConnection.m

@@ +1 @@
+#import <sched.h>
+
-#import "MVIRCChatConnection.h"
-#import "MVIRCChatRoom.h"
@@ -5 +7 @@
-
-#import "AsyncSocket.h"
+#import "InterThreadMessaging.h"
-#import "MVChatPluginManager.h"
-#import "NSAttributedStringAdditions.h"
@@ -717 +720 @@
-        [self disconnect];
-
+        [_chatConnection release];
-        [_knownUsers release];
+        [_proxyUsername release];
+        [_proxyPassword release];
+
+        _chatConnection = nil;
+        _connectionThread = nil;
-        _knownUsers = nil;
-
-        [_proxyUsername release];
-        _proxyUsername = nil;
-
-        [_proxyPassword release];
-        _proxyPassword = nil;
-
@@ -764 +769 @@
-        [self _willConnect]; // call early so other code has a chance to change our info
-
-
-
+
+
+
+
+
+
+
-
-/*
@@ -795 +805 @@
-        }
-
-
+
+
-}
-
@@ -988 +999 @@
-        [data appendBytes:"\x0D\x0A" length:2];
-
-_chatConnection writeData:data withTimeout:-1. tag:0
+self performSelector:@selector( _writeDataToServer: ) withObject:data inThread:_connectionThread
-
-        [[NSNotificationCenter defaultCenter] postNotificationName:MVChatConnectionGotRawMessageNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:string, @"message", [NSNumber numberWithBool:YES], @"outbound", nil]];
@@ -1123 +1134 @@
-
-@implementation MVIRCChatConnection (MVIRCChatConnectionPrivate)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        [[NSRunLoop currentRunLoop] run];
+
+        _connectionThread = nil;
+
+        [pool release];
+}
+
+- (void) _didDisconnect {
+        if( ABS( [_lastConnectAttempt timeIntervalSinceNow] ) > 300. )
+                [self performSelector:@selector( connect ) withObject:nil afterDelay:5.];
+        [self scheduleReconnectAttemptEvery:30.];
+        [super _didDisconnect];
-}
-
@@ -1130 +1166 @@
-        NSLog(@"willDisconnectWithError: %@", error );
-        _status = MVChatConnectionServerDisconnectedStatus;
-        if( ABS( [_lastConnectAttempt timeIntervalSinceNow] ) > 300. )
-                [self performSelector:@selector( connect ) withObject:nil afterDelay:5.];
-        [self scheduleReconnectAttemptEvery:30.];
-}
-
-- (void) socketDidDisconnect:(AsyncSocket *) sock {
-        if( _status != MVChatConnectionServerDisconnectedStatus )
-                _status = MVChatConnectionDisconnectedStatus;
-
-        id old = _localUser;
-        _localUser = nil;
-        [old release];
-
-_didDisconnect
+performSelectorOnMainThread:@selector( _didDisconnect ) withObject:nil waitUntilDone:NO
-}
-
@@ -1155 +1185 @@
-        [old release];
-
-_didConnect
+performSelectorOnMainThread:@selector( _didConnect ) withObject:nil waitUntilDone:NO
-        [self _readNextMessageFromServer];
-}
@@ -1291 +1321 @@
-
-        [self _readNextMessageFromServer];
+}
+
+- (void) _writeDataToServer:(NSData *) data {
+        [_chatConnection writeData:data withTimeout:-1. tag:0];
-}
-
@@ -1510 +1544 @@
-                                                if( ! [self nicknamePassword] ) {
-                                                        [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:MVChatConnectionNeedNicknamePasswordNotification object:self userInfo:nil];
-%@ :IDENTIFY %@", [self nickname]
+NickServ :IDENTIFY %@"
-                                        } else if( [msg rangeOfString:@"Password accepted"].location != NSNotFound ) {
-                                                [[self localUser] _setIdentified:YES];