From c97875d5c8f73e20dc04e5e9acfd6d6a3881a8ce Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 21 Apr 2011 15:04:15 -0700 Subject: [PATCH] Cross-platform thread functions. --- libguac/Makefile.am | 4 +-- libguac/include/thread.h | 63 ++++++++++++++++++++++++++++++++++++++++ libguac/src/thread.c | 63 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 libguac/include/thread.h create mode 100644 libguac/src/thread.c diff --git a/libguac/Makefile.am b/libguac/Makefile.am index 82e7fa7e..4a9e3f4c 100644 --- a/libguac/Makefile.am +++ b/libguac/Makefile.am @@ -40,11 +40,11 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = -Werror -Wall -pedantic -Iinclude libguacincdir = $(includedir)/guacamole -libguacinc_HEADERS = include/client.h include/guacio.h include/protocol.h include/log.h +libguacinc_HEADERS = include/client.h include/guacio.h include/protocol.h include/log.h include/thread.h lib_LTLIBRARIES = libguac.la -libguac_la_SOURCES = src/client.c src/guacio.c src/protocol.c src/client-handlers.c src/log.c +libguac_la_SOURCES = src/client.c src/guacio.c src/protocol.c src/client-handlers.c src/log.c src/thread.c libguac_la_LDFLAGS = -version-info 0:0:0 diff --git a/libguac/include/thread.h b/libguac/include/thread.h new file mode 100644 index 00000000..b0372e5a --- /dev/null +++ b/libguac/include/thread.h @@ -0,0 +1,63 @@ + +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is libguac. + * + * The Initial Developer of the Original Code is + * Michael Jumper. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef _GUAC_THREAD_H +#define _GUAC_THREAD_H + +/** + * Provides basic cross-platform threads. + * + * @file thread.h + */ + +#ifdef HAVE_LIBPTHREAD + +#include +typedef pthread_t guac_thread_t; + +#elif defined(__MINGW32__) + +#include +#include +typedef uintptr_t guac_thread_t; + +#endif + +void guac_thread_create(guac_thread_t* thread, void*(*function)(void*), void* data); +void guac_thread_join(guac_thread_t thread); + +#endif diff --git a/libguac/src/thread.c b/libguac/src/thread.c new file mode 100644 index 00000000..c22dc3a4 --- /dev/null +++ b/libguac/src/thread.c @@ -0,0 +1,63 @@ + +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (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.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is libguac. + * + * The Initial Developer of the Original Code is + * Michael Jumper. + * Portions created by the Initial Developer are Copyright (C) 2010 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "thread.h" + +#ifdef HAVE_LIBPTHREAD +#include +#elif defined(__MINGW32__) +#include +#include +#endif + +void guac_thread_create(guac_thread_t* thread, void*(*function)(void*), void* data) { +#ifdef HAVE_LIBPTHREAD + pthread_create(thread, NULL, function, data); +#elif defined(__MINGW32__) + *thread = _beginthreadex(NULL, 0, + function, data, 0 /* Create running */, NULL); +#endif +} + +void guac_thread_join(guac_thread_t thread) { +#ifdef HAVE_LIBPTHREAD + pthread_join(thread, NULL); +#elif defined(__MINGW32__) + WaitForSingleObject(thread, INFINITE); +#endif +} +