- Simplify connection keepalives, moving to a single repeating timer on the main thread. This cleans up calls, results in small speed improvements when making lots of queries (no more stopping/starting of keepalives), and ensures only the main thread handles the initial keepalives.

 - Move connection unlocking to a blocking call to fix http://log.sequelpro.com/view/73
 - Fix memory leaks caused by non-detached pthreads

1 files changed, 1 insertions, 6 deletions

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
index af38e99c..c6d81bd6 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
@@ -112,6 +112,7 @@ static inline NSData* NSStringDataUsingLossyEncoding(NSString* self, NSInteger e
 	NSArray *allKeysofDbStructure;
 	
 	NSTimer *keepAliveTimer;
+	double lastKeepAliveTime;
 	pthread_t keepAliveThread;
 	pthread_t pingThread;
 	uint64_t connectionStartTime;
@@ -127,15 +128,11 @@ static inline NSData* NSStringDataUsingLossyEncoding(NSString* self, NSInteger e
 	// Pointers
 	IMP cStringPtr;
 	IMP willQueryStringPtr;
-	IMP stopKeepAliveTimerPtr;
-	IMP startKeepAliveTimerPtr;
 	IMP timeConnectedPtr;
 	
 	// Selectors
 	SEL cStringSEL;
 	SEL willQueryStringSEL;
-	SEL stopKeepAliveTimerSEL;
-	SEL startKeepAliveTimerSEL;
 	SEL timeConnectedSEL;
 }
 
@@ -173,8 +170,6 @@ static inline NSData* NSStringDataUsingLossyEncoding(NSString* self, NSInteger e
 - (BOOL)checkConnection;
 - (BOOL)pingConnection;
 void pingConnectionTask(void *ptr);
-- (void)startKeepAliveTimer;
-- (void)stopKeepAliveTimer;
 - (void)keepAlive:(NSTimer *)theTimer;
 - (void)threadedKeepAlive;
 void performThreadedKeepAlive(void *ptr);