Moved thread API from libguac.
This commit is contained in:
parent
e4cbb8b4e8
commit
d4d2ba3af3
@ -42,8 +42,8 @@ AM_CFLAGS = -Werror -Wall -pedantic -Iinclude
|
|||||||
sbin_PROGRAMS = guacd
|
sbin_PROGRAMS = guacd
|
||||||
init_SCRIPTS = init.d/guacd
|
init_SCRIPTS = init.d/guacd
|
||||||
|
|
||||||
noinst_HEADERS = include/client.h
|
noinst_HEADERS = include/client.h include/thread.h
|
||||||
guacd_SOURCES = src/daemon.c src/client.c
|
guacd_SOURCES = src/daemon.c src/client.c src/thread.c
|
||||||
|
|
||||||
EXTRA_DIST = init.d/guacd.in
|
EXTRA_DIST = init.d/guacd.in
|
||||||
CLEANFILES = $(init_SCRIPTS)
|
CLEANFILES = $(init_SCRIPTS)
|
||||||
|
63
guacd/include/thread.h
Normal file
63
guacd/include/thread.h
Normal file
@ -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 <pthread.h>
|
||||||
|
typedef pthread_t guac_thread;
|
||||||
|
|
||||||
|
#elif defined(__MINGW32__)
|
||||||
|
|
||||||
|
#include <windows.h>
|
||||||
|
#include <process.h>
|
||||||
|
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
|
@ -40,9 +40,9 @@
|
|||||||
#include <guacamole/guacio.h>
|
#include <guacamole/guacio.h>
|
||||||
#include <guacamole/client.h>
|
#include <guacamole/client.h>
|
||||||
#include <guacamole/log.h>
|
#include <guacamole/log.h>
|
||||||
#include <guacamole/thread.h>
|
|
||||||
|
|
||||||
#include "client.h"
|
#include "client.h"
|
||||||
|
#include "thread.h"
|
||||||
|
|
||||||
void guac_client_stop(guac_client* client) {
|
void guac_client_stop(guac_client* client) {
|
||||||
client->state = STOPPING;
|
client->state = STOPPING;
|
||||||
|
67
guacd/src/thread.c
Normal file
67
guacd/src/thread.c
Normal file
@ -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 <pthread.h>
|
||||||
|
#elif defined(__MINGW32__)
|
||||||
|
#include <windows.h>
|
||||||
|
#include <process.h>
|
||||||
|
#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
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user