Fix nbytes>0 assertion failure when using a EM.kqueue with EM.start_s…

…erver
stripe-archive · Jan 22, 2009 · 64d0925 · 64d0925
1 parent 353a30b
commit 64d0925
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/ext/ed.cpp b/ext/ed.cpp
@@ -189,9 +189,7 @@ ConnectionDescriptor::ConnectionDescriptor (int sd, EventMachine_t *em):
 	#ifdef HAVE_EPOLL
 	EpollEvent.events = EPOLLOUT;
 	#endif
-	#ifdef HAVE_KQUEUE
-	MyEventMachine->ArmKqueueWriter (this);
-	#endif
+	// 22Jan09: Moved ArmKqueueWriter into SetConnectPending() to fix assertion failure in _WriteOutboundData()
 }
 
 
@@ -263,6 +261,17 @@ int ConnectionDescriptor::ReportErrorStatus (const char *binding)
 	return -1;
 }
 
+/***************************************
+ConnectionDescriptor::SetConnectPending
+****************************************/
+
+void ConnectionDescriptor::SetConnectPending(bool f)
+{
+	bConnectPending = f;
+	#ifdef HAVE_KQUEUE
+	MyEventMachine->ArmKqueueWriter (this);
+	#endif
+}
 
 
 /**************************************

diff --git a/ext/ed.h b/ext/ed.h
@@ -139,7 +139,7 @@ class ConnectionDescriptor: public EventableDescriptor
 
 		int SendOutboundData (const char*, int);
 
-		void SetConnectPending (bool f) { bConnectPending = f; }
+		void SetConnectPending (bool f);
 
 		void SetNotifyReadable (bool readable) { bNotifyReadable = readable; }
 		void SetNotifyWritable (bool writable) { bNotifyWritable = writable; }