diff options
| author | Michael Sweet <michael.r.sweet@gmail.com> | 2016-05-30 19:45:17 -0400 |
|---|---|---|
| committer | Michael Sweet <michael.r.sweet@gmail.com> | 2016-05-30 19:45:17 -0400 |
| commit | ad7daa2593a91dbe3e73ef94dc32d93dee7f7517 (patch) | |
| tree | 0a0c9ea7bed4774a757e158ff4305baa107e736d /cups/thread-private.h | |
| parent | 34facc5ce0cb95cc169b5580ac3bfd9b86caedd1 (diff) | |
| download | cups-ad7daa2593a91dbe3e73ef94dc32d93dee7f7517.tar.gz | |
Update private threading API.
Diffstat (limited to 'cups/thread-private.h')
| -rw-r--r-- | cups/thread-private.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/cups/thread-private.h b/cups/thread-private.h index 9acae0ec7..64897a350 100644 --- a/cups/thread-private.h +++ b/cups/thread-private.h @@ -1,7 +1,7 @@ /* * Private threading definitions for CUPS. * - * Copyright 2009-2014 by Apple Inc. + * Copyright 2009-2016 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -31,22 +31,27 @@ extern "C" { # endif /* __cplusplus */ -# ifdef HAVE_PTHREAD_H +# ifdef HAVE_PTHREAD_H /* POSIX threading */ # include <pthread.h> typedef void *(*_cups_thread_func_t)(void *arg); +typedef pthread_t _cups_thread_t; +typedef pthread_cond_t _cups_cond_t; typedef pthread_mutex_t _cups_mutex_t; typedef pthread_rwlock_t _cups_rwlock_t; typedef pthread_key_t _cups_threadkey_t; +# define _CUPS_COND_INITIALIZER PTHREAD_COND_INITIALIZER # define _CUPS_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER # define _CUPS_RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER # define _CUPS_THREADKEY_INITIALIZER 0 # define _cupsThreadGetData(k) pthread_getspecific(k) # define _cupsThreadSetData(k,p) pthread_setspecific(k,p) -# elif defined(WIN32) +# elif defined(WIN32) /* Windows threading */ # include <winsock2.h> # include <windows.h> typedef void *(__stdcall *_cups_thread_func_t)(void *arg); +typedef int _cups_thread_t; +typedef char _cups_cond_t; /* TODO: Implement Win32 conditional */ typedef struct _cups_mutex_s { int m_init; /* Flag for on-demand initialization */ @@ -55,17 +60,21 @@ typedef struct _cups_mutex_s } _cups_mutex_t; typedef _cups_mutex_t _cups_rwlock_t; /* TODO: Implement Win32 reader/writer lock */ typedef DWORD _cups_threadkey_t; +# define _CUPS_COND_INITIALIZER 0 # define _CUPS_MUTEX_INITIALIZER { 0, 0 } # define _CUPS_RWLOCK_INITIALIZER { 0, 0 } # define _CUPS_THREADKEY_INITIALIZER 0 # define _cupsThreadGetData(k) TlsGetValue(k) # define _cupsThreadSetData(k,p) TlsSetValue(k,p) -# else +# else /* No threading */ typedef void *(*_cups_thread_func_t)(void *arg); +typedef int _cups_thread_t; +typedef char _cups_cond_t; typedef char _cups_mutex_t; typedef char _cups_rwlock_t; typedef void *_cups_threadkey_t; +# define _CUPS_COND_INITIALIZER 0 # define _CUPS_MUTEX_INITIALIZER 0 # define _CUPS_RWLOCK_INITIALIZER 0 # define _CUPS_THREADKEY_INITIALIZER (void *)0 @@ -78,6 +87,9 @@ typedef void *_cups_threadkey_t; * Functions... */ +extern void _cupsCondBroadcast(_cups_cond_t *cond); +extern void _cupsCondInit(_cups_cond_t *cond); +extern void _cupsCondWait(_cups_cond_t *cond, _cups_mutex_t *mutex, double timeout); extern void _cupsMutexInit(_cups_mutex_t *mutex); extern void _cupsMutexLock(_cups_mutex_t *mutex); extern void _cupsMutexUnlock(_cups_mutex_t *mutex); @@ -85,8 +97,9 @@ extern void _cupsRWInit(_cups_rwlock_t *rwlock); extern void _cupsRWLockRead(_cups_rwlock_t *rwlock); extern void _cupsRWLockWrite(_cups_rwlock_t *rwlock); extern void _cupsRWUnlock(_cups_rwlock_t *rwlock); -extern int _cupsThreadCreate(_cups_thread_func_t func, void *arg); - +extern void _cupsThreadCancel(_cups_thread_t thread); +extern _cups_thread_t _cupsThreadCreate(_cups_thread_func_t func, void *arg); +extern void *_cupsThreadWait(_cups_thread_t thread); # ifdef __cplusplus } |