Navigation

← Previous Changeset
Next Changeset →

Changeset 2579

Timestamp:

04/30/05 15:49:38 (3 years ago)

Author:

timothy

Message:

This disables all the DO stuff added a while back. It made things rather unstable and prone to deadlocks.
Fixes a deadlock when sending 6 or more lines of text at once. However, some minor delay might occur when sending.
Fixes ticket #102 and some of #130.

Files:

trunk/MVIRCChatConnection.m (modified) (8 diffs)
trunk/MVIRCChatRoom.m (modified) (1 diff)
trunk/MVIRCChatUser.m (modified) (1 diff)
trunk/Resources/Changes.rtf (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/MVIRCChatConnection.m

r2568	r2579
1095	1095	while( ! irssiThreadReady ) usleep( 50 );
1096	1096
1097		extern NSPort *threadConnectionPort;
	1097	/* extern NSPort *threadConnectionPort;
1098	1098	NSConnection *threadConnection = [NSConnection connectionWithReceivePort:nil sendPort:threadConnectionPort];
1099	1099	_irssiThreadConnection = [[(MVIRCConnectionThreadHelper *)[threadConnection rootProxy] vendChatConnection:self] retain];
	1100
1100	1101	NSConnection *connection = [NSConnection connectionWithReceivePort:[_irssiThreadConnection sendPort] sendPort:[_irssiThreadConnection receivePort]];
	1102	[connection setRequestTimeout:2.];
	1103	[connection setReplyTimeout:2.];
	1104
1101	1105	_irssiThreadProxy = [[connection rootProxy] retain];
1102		[(NSDistantObject *)_irssiThreadProxy setProtocolForProxy:@protocol( MVIRCChatConnectionIrssiThread )];
	1106	[(NSDistantObject )_irssiThreadProxy setProtocolForProxy:@protocol( MVIRCChatConnectionIrssiThread )]; /
1103	1107	}
1104	1108
…	…
1106	1110	}
1107	1111
1108		- (void) release {
	1112	/* - (void) release {
1109	1113	if( ( [self retainCount] - 2 ) == 1 ) {
1110	1114	[MVIRCChatConnectionThreadLock lock];
…	…
1121	1125
1122	1126	[super release];
1123		}
	1127	} */
1124	1128
1125	1129	- (void) dealloc {
…	…
1450	1454	NSParameterAssert( raw != nil );
1451	1455	if( ! _chatConnection ) return;
1452		[_irssiThreadProxy _sendRawMessage:raw immediately:now];
	1456	// [_irssiThreadProxy _sendRawMessage:raw immediately:now];
	1457	[self _sendRawMessage:raw immediately:now];
1453	1458	}
1454	1459
…	…
1703	1708	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
1704	1709
1705		MVIRCConnectionThreadHelper *helper = [[MVIRCConnectionThreadHelper alloc] init];
	1710	/* MVIRCConnectionThreadHelper *helper = [[MVIRCConnectionThreadHelper alloc] init];
	1711
1706	1712	NSConnection *server = [[NSConnection defaultConnection] retain];
1707	1713	[server enableMultipleThreads];
…	…
1709	1715
1710	1716	extern NSPort *threadConnectionPort;
1711		threadConnectionPort = [[[NSConnection defaultConnection] receivePort] retain];
	1717	threadConnectionPort = [[[NSConnection defaultConnection] receivePort] retain]; */
1712	1718
1713	1719	GMainLoop *glibMainLoop = g_main_new( TRUE );
…	…
1737	1743	core_deinit();
1738	1744
1739		[threadConnectionPort release];
	1745	/* [threadConnectionPort release];
1740	1746	threadConnectionPort = nil;
1741	1747
1742	1748	[server release];
1743		[helper release];
	1749	[helper release]; */
1744	1750
1745	1751	[MVIRCChatConnectionThreadLock unlock];
…	…
1958	1964	- (NSConnection ) vendChatConnection:(MVIRCChatConnection ) connection {
1959	1965	NSConnection *server = [[[NSConnection alloc] initWithReceivePort:[NSPort port] sendPort:[NSPort port]] autorelease];
	1966	[server setRequestTimeout:2.];
	1967	[server setReplyTimeout:2.];
1960	1968	[server setRootObject:connection];
1961	1969	[server enableMultipleThreads];

trunk/MVIRCChatRoom.m

r2454	r2579
64	64	NSParameterAssert( message != nil );
65	65	const char *msg = [MVIRCChatConnection _flattenedIRCStringForMessage:message withEncoding:encoding andChatFormat:[[self connection] outgoingChatFormat]];
66		[[[self connection] _irssiThreadProxy] _sendMessage:msg toTarget:[self name] asAction:action];
	66	// [[[self connection] _irssiThreadProxy] _sendMessage:msg toTarget:[self name] asAction:action];
	67	[[self connection] _sendMessage:msg toTarget:[self name] asAction:action];
67	68	}
68	69

trunk/MVIRCChatUser.m

r2454	r2579
50	50	NSParameterAssert( message != nil );
51	51	const char *msg = [MVIRCChatConnection _flattenedIRCStringForMessage:message withEncoding:encoding andChatFormat:[[self connection] outgoingChatFormat]];
52		[[[self connection] _irssiThreadProxy] _sendMessage:msg toTarget:[self nickname] asAction:action];
	52	// [[[self connection] _irssiThreadProxy] _sendMessage:msg toTarget:[self nickname] asAction:action];
	53	[[self connection] _sendMessage:msg toTarget:[self nickname] asAction:action];
53	54	}
54	55

trunk/Resources/Changes.rtf

r2567	r2579
1		{\rtf1\mac\ansicpg10000\cocoartf~~102~~
	1	{\rtf1\mac\ansicpg10000\cocoartf824
2	2	{\fonttbl\f0\fswiss\fcharset77 Arial-Black;\f1\fswiss\fcharset77 Helvetica-Bold;\f2\ftech\fcharset2 Symbol;
3	3	\f3\fswiss\fcharset77 Helvetica;\f4\fnil\fcharset77 Monaco;\f5\fswiss\fcharset77 Helvetica-Oblique;
…	…
24	24	\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
25	25
26		\fs20 \cf0 Build 2D9
	26	\fs20 \cf0 Build 2D10
	27	\f3\b0 (scheduled for May 1, 2005) \'d1\
	28	\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
	29
	30	\f2 \cf0 \'b7
	31	\f3\fs24
	32	\fs20 Initial support for Spotlight, searching for nicknames will pull up relevant transcripts.
	33	\f1\b\fs28 \
	34
	35	\f2\b0\fs20 \'b7
	36	\f3\fs24
	37	\fs20 Fixes a deadlock when sending 6 or more lines of text at once. However, some minor delay might occur when sending.
	38	\f1\b\fs28 \
	39	\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
	40
	41	\fs20 \cf0 \
	42	Build 2D9
27	43	\f3\b0 (April 28, 2005) \'d1\
28	44	\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural