From d4d2ba3af3d49379ab95f5dc9041583a5c3892af Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Wed, 23 Nov 2011 00:23:53 -0800 Subject: [PATCH] Moved thread API from libguac. --- guacd/Makefile.am | 4 +-- guacd/include/thread.h | 63 +++++++++++++++++++++++++++++++++++++++ guacd/src/client.c | 2 +- guacd/src/thread.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 guacd/include/thread.h create mode 100644 guacd/src/thread.c diff --git a/guacd/Makefile.am b/guacd/Makefile.am index cd5989b2..9e923db9 100644 --- a/guacd/Makefile.am +++ b/guacd/Makefile.am @@ -42,8 +42,8 @@ AM_CFLAGS = -Werror -Wall -pedantic -Iinclude sbin_PROGRAMS = guacd init_SCRIPTS = init.d/guacd -noinst_HEADERS = include/client.h -guacd_SOURCES = src/daemon.c src/client.c +noinst_HEADERS = include/client.h include/thread.h +guacd_SOURCES = src/daemon.c src/client.c src/thread.c EXTRA_DIST = init.d/guacd.in CLEANFILES = $(init_SCRIPTS) diff --git a/guacd/include/thread.h b/guacd/include/thread.h new file mode 100644 index 00000000..b0493def --- /dev/null +++ b/guacd/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 guacd. + * + * 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; + +#elif defined(__MINGW32__) + +#include +#include +typedef HANDLE guac_thread; + +#endif + +int guac_thread_create(guac_thread* thread, void*(*function)(void*), void* data); +void guac_thread_join(guac_thread thread); + +#endif diff --git a/guacd/src/client.c b/guacd/src/client.c index d7d1c979..ce84eb51 100644 --- a/guacd/src/client.c +++ b/guacd/src/client.c @@ -40,9 +40,9 @@ #include #include #include -#include #include "client.h" +#include "thread.h" void guac_client_stop(guac_client* client) { client->state = STOPPING; diff --git a/guacd/src/thread.c b/guacd/src/thread.c new file mode 100644 index 00000000..a4b4bc2e --- /dev/null +++ b/guacd/src/thread.c @@ -0,0 +1,67 @@ + +/* ***** 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 guacd. + * + * 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 + +int guac_thread_create(guac_thread* thread, void*(*function)(void*), void* data) { +#ifdef HAVE_LIBPTHREAD + return pthread_create(thread, NULL, function, data); +#elif defined(__MINGW32__) + *thread = (guac_thread) _beginthreadex(NULL, 0, + (unsigned(__stdcall*)(void*)) function, data, + 0 /* Create running */, NULL); + if (thread == 0) + return errno; + return 0; +#endif +} + +void guac_thread_join(guac_thread thread) { +#ifdef HAVE_LIBPTHREAD + pthread_join(thread, NULL); +#elif defined(__MINGW32__) + WaitForSingleObject(thread, INFINITE); +#endif +} +