Merge pull request #9 from llyzs/abstraction

Abstraction: mutex

cunit/test_utils.c

@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <freerdp/freerdp.h>
+#include <freerdp/utils/mutex.h>
 #include <freerdp/utils/semaphore.h>
 
 #include "test_utils.h"
@@ -39,11 +40,22 @@ int add_utils_suite(void)
 {
 	add_test_suite(utils);
 
+	add_test_function(mutex);
 	add_test_function(semaphore);
 
 	return 0;
 }
 
+void test_mutex(void)
+{
+	freerdp_mutex mutex;
+
+	mutex = freerdp_mutex_new();
+	freerdp_mutex_lock(mutex);
+	freerdp_mutex_unlock(mutex);
+	freerdp_mutex_free(mutex);
+}
+
 void test_semaphore(void)
 {
 	freerdp_sem sem;

cunit/test_utils.h

@@ -23,4 +23,5 @@ int init_list_suite(void);
 int clean_list_suite(void);
 int add_list_suite(void);
 
+void test_mutex(void);
 void test_semaphore(void);

include/freerdp/utils/mutex.h

@@ -0,0 +1,30 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Client
+ * Mutex 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 __MUTEX_UTILS_H
+#define __MUTEX_UTILS_H
+
+typedef void* freerdp_mutex;
+
+freerdp_mutex freerdp_mutex_new(void);
+void freerdp_mutex_free(freerdp_mutex mutex);
+void freerdp_mutex_lock(freerdp_mutex mutex);
+void freerdp_mutex_unlock(freerdp_mutex mutex);
+
+#endif /* __MUTEX_UTILS_H */

libfreerdp-utils/CMakeLists.txt

@@ -21,6 +21,7 @@ set(FREERDP_UTILS_SRCS
 	blob.c
 	hexdump.c
 	memory.c
+	mutex.c
 	semaphore.c
 	stream.c
 	unicode.c)

libfreerdp-utils/mutex.c

@@ -0,0 +1,77 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Client
+ * Mutex 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.
+ */
+
+#include <freerdp/utils/memory.h>
+#include <freerdp/utils/mutex.h>
+
+#if defined _WIN32
+
+#include <windows.h>
+#define freerdp_mutex_t HANDLE
+
+#else
+
+#include <pthread.h>
+#define freerdp_mutex_t pthread_mutex_t
+
+#endif
+
+freerdp_mutex freerdp_mutex_new(void)
+{
+	freerdp_mutex_t* mutex;
+
+	mutex = (freerdp_mutex_t*)xmalloc(sizeof(freerdp_mutex_t));
+
+#if defined _WIN32
+	*mutex = CreateMutex(NULL, FALSE, NULL);
+#else
+	pthread_mutex_init(mutex, 0);
+#endif
+
+	return mutex;
+}
+
+void freerdp_mutex_free(freerdp_mutex mutex)
+{
+#if defined _WIN32
+	CloseHandle(*((freerdp_mutex_t*)mutex));
+#else
+	pthread_mutex_destroy((freerdp_mutex_t*)mutex);
+#endif
+
+	xfree(mutex);
+}
+
+void freerdp_mutex_lock(freerdp_mutex mutex)
+{
+#if defined _WIN32
+	WaitForSingleObject(*((freerdp_mutex_t*)mutex), INFINITE);
+#else
+	pthread_mutex_lock(mutex);
+#endif
+}
+
+void freerdp_mutex_unlock(freerdp_mutex mutex)
+{
+#if defined _WIN32
+	ReleaseMutex(*((freerdp_mutex_t*)mutex));
+#else
+	pthread_mutex_unlock(mutex);
+#endif
+}