libfreerdp-utils: purge thread utils

channels/serial/client/serial_tty.c

@@ -31,7 +31,6 @@
 
 #include <winpr/stream.h>
 #include <freerdp/utils/list.h>
-#include <freerdp/utils/thread.h>
 #include <freerdp/utils/svc_plugin.h>
 #include <freerdp/channels/rdpdr.h>
 

channels/smartcard/client/smartcard_operations.c

@@ -38,13 +38,12 @@
 #undef BOOL
 
 #include <winpr/crt.h>
-
-#include <freerdp/freerdp.h>
 #include <winpr/print.h>
 #include <winpr/stream.h>
-#include <freerdp/utils/svc_plugin.h>
+
-#include <freerdp/utils/thread.h>
+#include <freerdp/freerdp.h>
 #include <freerdp/channels/rdpdr.h>
+#include <freerdp/utils/svc_plugin.h>
 
 #include "smartcard_main.h"
 

include/freerdp/utils/thread.h

@@ -1,69 +0,0 @@
-/**
- * FreeRDP: A Remote Desktop Protocol Implementation
- * Thread Utils
- *
- * Copyright 2011 Vic Lee
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef FREERDP_UTILS_THREAD_H
-#define FREERDP_UTILS_THREAD_H
-
-#include <freerdp/api.h>
-#include <freerdp/types.h>
-
-#ifndef _WIN32
-#include <pthread.h>
-#endif
-
-#include <winpr/synch.h>
-
-typedef struct _freerdp_thread freerdp_thread;
-
-struct _freerdp_thread
-{
-	HANDLE mutex;
-
-	HANDLE signals[5];
-	int num_signals;
-
-	int status;
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-FREERDP_API freerdp_thread* freerdp_thread_new(void);
-FREERDP_API void freerdp_thread_start(freerdp_thread* thread, void* func, void* arg);
-FREERDP_API void freerdp_thread_stop(freerdp_thread* thread);
-FREERDP_API void freerdp_thread_free(freerdp_thread* thread);
-
-#ifdef __cplusplus
-}
-#endif
-
-#define freerdp_thread_wait(_t) ((WaitForMultipleObjects(_t->num_signals, _t->signals, FALSE, INFINITE) == WAIT_FAILED) ? -1 : 0)
-#define freerdp_thread_wait_timeout(_t, _timeout) ((WaitForMultipleObjects(_t->num_signals, _t->signals, FALSE, _timeout) == WAIT_FAILED) ? -1 : 0)
-#define freerdp_thread_is_stopped(_t) (WaitForSingleObject(_t->signals[0], 0) == WAIT_OBJECT_0)
-#define freerdp_thread_is_running(_t) (_t->status == 1)
-#define freerdp_thread_quit(_t) do { \
-	_t->status = -1; \
-	ResetEvent(_t->signals[0]); } while (0)
-#define freerdp_thread_signal(_t) SetEvent(_t->signals[1])
-#define freerdp_thread_reset(_t) ResetEvent(_t->signals[1])
-#define freerdp_thread_lock(_t) WaitForSingleObject(_t->mutex, INFINITE)
-#define freerdp_thread_unlock(_t) ReleaseMutex(_t->mutex)
-
-#endif /* FREERDP_UTILS_THREAD_H */

libfreerdp/utils/CMakeLists.txt

@@ -32,7 +32,6 @@ set(${MODULE_PREFIX}_SRCS
 	string.c
 	svc_plugin.c
 	tcp.c
-	thread.c
 	time.c
 	uds.c)
 

libfreerdp/utils/thread.c

@@ -1,99 +0,0 @@
-/**
- * FreeRDP: A Remote Desktop Protocol Implementation
- * Thread Utils
- *
- * Copyright 2011 Vic Lee
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <winpr/crt.h>
-#include <winpr/synch.h>
-#include <winpr/windows.h>
-
-#ifdef _WIN32
-#ifdef _MSC_VER
-#include <process.h>
-#endif
-#endif
-
-#include <freerdp/utils/thread.h>
-
-freerdp_thread* freerdp_thread_new(void)
-{
-	freerdp_thread* thread;
-
-	thread = (freerdp_thread*) malloc(sizeof(freerdp_thread));
-	ZeroMemory(thread, sizeof(freerdp_thread));
-
-	thread->mutex = CreateMutex(NULL, FALSE, NULL);
-	thread->signals[0] = CreateEvent(NULL, TRUE, FALSE, NULL);
-	thread->signals[1] = CreateEvent(NULL, TRUE, FALSE, NULL);
-	thread->num_signals = 2;
-
-	return thread;
-}
-
-void freerdp_thread_start(freerdp_thread* thread, void* func, void* arg)
-{
-	thread->status = 1;
-
-#ifdef _WIN32
-	{
-		CloseHandle(CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) func, arg, 0, NULL));
-	}
-#else
-	{
-		pthread_t th;
-		pthread_create(&th, 0, func, arg);
-		pthread_detach(th);
-	}
-#endif
-}
-
-void freerdp_thread_stop(freerdp_thread* thread)
-{
-	int i = 0;
-
-	SetEvent(thread->signals[0]);
-
-	while ((thread->status > 0) && (i < 1000))
-	{
-		i++;
-		Sleep(100);
-	}
-}
-
-void freerdp_thread_free(freerdp_thread* thread)
-{
-	int i;
-
-	for (i = 0; i < thread->num_signals; i++)
-		CloseHandle(thread->signals[i]);
-
-	thread->num_signals = 0;
-
-	CloseHandle(thread->mutex);
-	thread->mutex = NULL;
-
-	free(thread);
-}

server/X11/xf_peer.c

@@ -39,7 +39,6 @@
 #include <freerdp/locale/keyboard.h>
 #include <freerdp/codec/color.h>
 #include <freerdp/utils/file.h>
-#include <freerdp/utils/thread.h>
 
 #include "xf_input.h"
 #include "xf_encode.h"