Consolidate and improve ping code:

 - Foreground and keepalive pings now use the same code, which has been tidied and improved
 - Global variables are no longer incorrectly shared across multiple instances
 - If a ping thread blocks in a state where pthread_cancel no longer functions, the connection is assumed to have failed (network issues etc)
This should further improve MySQL crashes linked to pings, and will hopefully address Issue #830. Also update localizable strings

1 files changed, 19 insertions, 7 deletions

diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
index ef1da3df..609830ce 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h
@@ -32,6 +32,12 @@
 #import "MCPConstants.h"
 #import "mysql.h"
 
+typedef struct {
+	MYSQL	*mySQLConnection;
+	BOOL	*pingActivePointer;
+	BOOL	*lastPingSuccessPointer;
+} MCPConnectionPingDetails;
+
 @protocol MCPConnectionProxy;
 
 @class MCPResult, MCPStreamingResult;
@@ -168,10 +174,13 @@
 	NSMutableDictionary *structure;
 	NSMutableArray *allKeysofDbStructure;
 	
+	pthread_t pingThread;
+	NSInteger pingFailureCount;
+	BOOL pingThreadActive;
+	BOOL lastPingSuccess;
+	BOOL lastPingBlocked;
 	NSTimer *keepAliveTimer;
 	double lastKeepAliveTime;
-	pthread_t keepAliveThread;
-	pthread_t pingThread;
 	uint64_t connectionStartTime;
 	
 	BOOL retryAllowed;
@@ -231,15 +240,18 @@
 - (BOOL)isConnectedViaSSL;
 - (BOOL)userTriggeredDisconnect;
 - (BOOL)checkConnection;
-- (BOOL)pingConnection;
-void pingConnectionTask(void *ptr);
-- (void)keepAlive:(NSTimer *)theTimer;
-- (void)threadedKeepAlive;
-void performThreadedKeepAlive(void *ptr);
 - (void)restoreConnectionDetails;
 - (void)setAllowQueryRetries:(BOOL)allow;
 - (double)timeConnected;
 
+// Pinging and keepalive
+- (BOOL)pingConnectionUsingLoopDelay:(NSUInteger)loopDelay;
+void backgroundPingTask(void *ptr);
+void forceThreadExit(int signalNumber);
+void pingThreadCleanup();
+- (void)keepAlive:(NSTimer *)theTimer;
+- (void)threadedKeepAlive;
+
 // Server versions
 - (NSString *)serverVersionString;
 - (NSInteger)serverMajorVersion;