Merge pull request #63 from telerik/fatme/fix-settimeout

fix: fix the behavior of setTimeout

Author: Fatme

IOSDeviceLib/IOSDeviceLib.cpp

@@ -666,7 +666,7 @@ std::map<std::string, boost::any> receive_con_message(ConnectionMessageData data
 	receive_con_message_mutex.lock();
 
 	ServiceConnRef conn = data.conn;
-	TimeoutOutputData timeoutOutputData = setTimeout(data.timeout, &data, clean_con_resources);
+	TimeoutOutputData* timeoutOutputData = setTimeout(data.timeout, &data, clean_con_resources);
 
 	std::map<std::string, boost::any> dict;
 	char *buffer = new char[4];
@@ -680,12 +680,10 @@ std::map<std::string, boost::any> receive_con_message(ConnectionMessageData data
 		if (bytes_read > 0)
 		{
 			Plist::readPlist(buffer, res, dict);
-			clearTimeout(timeoutOutputData);
 		}
-	} else {
-		clearTimeout(timeoutOutputData);
 	}
 
+	clearTimeout(timeoutOutputData);
 	delete[] buffer;
 	receive_con_message_mutex.unlock();
 	return dict;
@@ -1059,7 +1057,7 @@ void get_application_infos(std::string device_identifier, std::string method_id)
 	std::vector<json> livesync_app_infos;
 	while (true)
 	{
-		ConnectionMessageData connectionMessageData = { serviceInfo.connection, device_identifier, method_id, kInstallationProxy, 10 };
+		ConnectionMessageData connectionMessageData = { serviceInfo.connection, device_identifier, method_id, kInstallationProxy, 0 };
 		std::map<std::string, boost::any> dict = receive_con_message(connectionMessageData);
 		PRINT_ERROR_AND_RETURN_IF_FAILED_RESULT(dict.count(kErrorKey), boost::any_cast<std::string>(dict[kErrorKey]).c_str(), device_identifier, method_id);
 		if (dict.empty() || (dict.count(kStatusKey) && has_complete_status(dict)))

IOSDeviceLib/SetTimeout.cpp

@@ -8,12 +8,11 @@ DWORD WINAPI TimeoutThreadExecutor(LPVOID lpParam) {
 	TimeoutData* threadData = (TimeoutData*)lpParam;
 	std::this_thread::sleep_for(std::chrono::milliseconds(threadData->timeout * 1000));
 	threadData->operation(threadData->data);
-	free(threadData);
 	return 0;
 }
 #endif
 
-TimeoutOutputData setTimeout(int timeout, void * data, void(*operation)(void*)) {
+TimeoutOutputData* setTimeout(int timeout, void * data, void(*operation)(void*)) {
 	std::thread::native_handle_type darwinHandle = nullptr;
 	HANDLE windowsHandle = nullptr;
 	struct TimeoutData* timeoutData = nullptr;
@@ -43,27 +42,35 @@ TimeoutOutputData setTimeout(int timeout, void * data, void(*operation)(void*))
 #endif
 	}
 
-	return { darwinHandle, windowsHandle, timeoutData };
+	TimeoutOutputData* result = reinterpret_cast<TimeoutOutputData*>(malloc(sizeof(struct TimeoutOutputData)));
+	result->windowsHandle = windowsHandle;
+	result->darwinHandle = darwinHandle;
+	result->timeoutData = timeoutData;
+
+	return result;
 }
 
-void clearTimeout(TimeoutOutputData data) {
-	if (data.timeoutData) {
-		free(data.timeoutData);
-		data.timeoutData = nullptr;
+void clearTimeout(TimeoutOutputData* data) {
+	if (data->timeoutData) {
+		free(data->timeoutData);
+		data->timeoutData = nullptr;
 	}
 
 #ifdef WIN32
-	if (data.windowsHandle) {
-		int terminateThreadResult = TerminateThread(data.windowsHandle, 9);
+	if (data->windowsHandle) {
+		int terminateThreadResult = TerminateThread(data->windowsHandle, 9);
 		// https://docs.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-terminatethread#return-value
 		if (terminateThreadResult == 0)
 		{
 			DWORD errorCode = GetLastError();
 		}
 	}
 #else
-	if (data.darwinHandle) {
-		pthread_cancel(data.darwinHandle);
+	if (data->darwinHandle) {
+		pthread_cancel(data->darwinHandle);
 	}
 #endif
+
+	free(data);
+	data = nullptr;
 }

IOSDeviceLib/SetTimeout.h

@@ -36,5 +36,5 @@ struct TimeoutOutputData {
     TimeoutData* timeoutData;
 };
 
-TimeoutOutputData setTimeout(int timeout, void * data, void(*operation)(void*));
-void clearTimeout(TimeoutOutputData data);
+TimeoutOutputData* setTimeout(int timeout, void * data, void(*operation)(void*));
+void clearTimeout(TimeoutOutputData* data);