X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fglapi%2Fglthread.h;h=8ec933a85148fef41efcac5e10db9c263ff771fb;hb=56c4226fcc54158eb7fe54eeb13539a979ec155c;hp=72fe08ff7f9c0db72b06bdffc7643f7706b887e2;hpb=a9601f1b4c57d1579aee36370e7d4bb8820de4bc;p=mesa.git diff --git a/src/mesa/glapi/glthread.h b/src/mesa/glapi/glthread.h index 72fe08ff7f9..8ec933a8514 100644 --- a/src/mesa/glapi/glthread.h +++ b/src/mesa/glapi/glthread.h @@ -1,21 +1,19 @@ -/* $Id: glthread.h,v 1.3 2000/02/10 21:27:25 brianp Exp $ */ - /* * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999-2000 Brian Paul All Rights Reserved. - * + * Version: 6.5.2 + * + * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), * to deal in the Software without restriction, including without limitation * the rights to use, copy, modify, merge, publish, distribute, sublicense, * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: - * + * * The above copyright notice and this permission notice shall be included * in all copies or substantial portions of the Software. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL @@ -56,26 +54,32 @@ * */ +/* + * If this file is accidentally included by a non-threaded build, + * it should not cause the build to fail, or otherwise cause problems. + * In general, it should only be included when needed however. + */ #ifndef GLTHREAD_H #define GLTHREAD_H -/* - * If this file is accidentally included by a non-threaded build, - * it should not cause the build to fail, or otherwise cause problems. - * In general, it should only be included when needed however. - */ -#ifdef THREADS -/* - * It is an error not to select a specific threads API when compiling. - */ -#if !defined(PTHREADS) && !defined(SOLARIS_THREADS) && !defined(WIN32) && !defined(XTHREADS) -#error One of PTHREADS, SOLARIS_THREADS, WIN32 or XTHREADS must be defined. +#if defined(USE_MGL_NAMESPACE) +#define _glapi_Dispatch _mglapi_Dispatch #endif +#if (defined(PTHREADS) || defined(SOLARIS_THREADS) ||\ + defined(WIN32_THREADS) || defined(BEOS_THREADS)) \ + && !defined(THREADS) +# define THREADS +#endif + +#ifdef VMS +#include +#endif + /* * POSIX threads. This should be your choice in the Unix world * whenever possible. When building with POSIX threads, be sure @@ -85,7 +89,7 @@ * compiler flag. On Solaris with gcc, use -D_REENTRANT to enable * proper compiling for MT-safe libc etc. */ -#ifdef PTHREADS +#if defined(PTHREADS) #include /* POSIX threads headers */ typedef struct { @@ -103,21 +107,64 @@ typedef pthread_mutex_t _glthread_Mutex; #define _glthread_INIT_MUTEX(name) \ pthread_mutex_init(&(name), NULL) +#define _glthread_DESTROY_MUTEX(name) \ + pthread_mutex_destroy(&(name)) + #define _glthread_LOCK_MUTEX(name) \ (void) pthread_mutex_lock(&(name)) #define _glthread_UNLOCK_MUTEX(name) \ (void) pthread_mutex_unlock(&(name)) -#endif /* PTHREADS */ +typedef pthread_cond_t _glthread_Cond; + +#define _glthread_DECLARE_STATIC_COND(name) \ + static _glthread_Cond name = PTHREAD_COND_INITIALIZER + +#define _glthread_INIT_COND(cond) \ + pthread_cond_init(&(cond), NULL) + +#define _glthread_DESTROY_COND(name) \ + pthread_cond_destroy(&(name)) + +#define _glthread_COND_WAIT(cond, mutex) \ + pthread_cond_wait(&(cond), &(mutex)) +#define _glthread_COND_SIGNAL(cond) \ + pthread_cond_signal(&(cond)) +#define _glthread_COND_BROADCAST(cond) \ + pthread_cond_broadcast(&(cond)) + + +#else /* PTHREADS */ + +typedef unsigned int _glthread_Cond; +#define _glthread_DECLARE_STATIC_COND(name) \ +// #warning Condition variables not implemented. + +#define _glthread_INIT_COND(cond) \ + ASSERT(0); + +#define _glthread_DESTROY_COND(name) \ + ASSERT(0); + +#define _glthread_COND_WAIT(cond, mutex) \ + ASSERT(0); + +#define _glthread_COND_SIGNAL(cond) \ + ASSERT(0); + +#define _glthread_COND_BROADCAST(cond) \ + ASSERT(0); + +#endif /* - * Solaris threads. Use only up to Solaris 2.4. + * Solaris threads. Use only up to Solaris 2.4. * Solaris 2.5 and higher provide POSIX threads. - * Be sure to compile with -mt on the Solaris compilers, or + * Be sure to compile with -mt on the Solaris compilers, or * use -D_REENTRANT if using gcc. */ #ifdef SOLARIS_THREADS @@ -136,6 +183,7 @@ typedef mutex_t _glthread_Mutex; /* XXX need to really implement mutex-related macros */ #define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0 #define _glthread_INIT_MUTEX(name) (void) name +#define _glthread_DESTROY_MUTEX(name) (void) name #define _glthread_LOCK_MUTEX(name) (void) name #define _glthread_UNLOCK_MUTEX(name) (void) name @@ -145,11 +193,11 @@ typedef mutex_t _glthread_Mutex; /* - * Windows threads. Should work with Windows NT and 95. + * Windows threads. Should work with Windows NT and 95. * IMPORTANT: Link with multithreaded runtime library when THREADS are * used! */ -#ifdef WIN32 +#ifdef WIN32_THREADS #include typedef struct { @@ -161,77 +209,88 @@ typedef HANDLE _glthread_Thread; typedef CRITICAL_SECTION _glthread_Mutex; -/* XXX need to really implement mutex-related macros */ -#define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0 -#define _glthread_INIT_MUTEX(name) (void) name -#define _glthread_LOCK_MUTEX(name) (void) name -#define _glthread_UNLOCK_MUTEX(name) (void) name - -#endif /* WIN32 */ - +#define _glthread_DECLARE_STATIC_MUTEX(name) /*static*/ _glthread_Mutex name = {0,0,0,0,0,0} +#define _glthread_INIT_MUTEX(name) InitializeCriticalSection(&name) +#define _glthread_DESTROY_MUTEX(name) DeleteCriticalSection(&name) +#define _glthread_LOCK_MUTEX(name) EnterCriticalSection(&name) +#define _glthread_UNLOCK_MUTEX(name) LeaveCriticalSection(&name) +#endif /* WIN32_THREADS */ /* - * XFree86 has its own thread wrapper, Xthreads.h - * We wrap it again for GL. + * BeOS threads. R5.x required. */ -#ifdef XTHREADS -#include "Xthreads.h" - -typedef struct { - xthread_key_t key; - int initMagic; -} _glthread_TSD; +#ifdef BEOS_THREADS -typedef xthread_t _glthread_Thread; +/* Problem with OS.h and this file on haiku */ +#ifndef __HAIKU__ +#include +#endif -typedef xmutex_rec _glthread_Mutex; +#include -#define _glthread_DECLARE_STATIC_MUTEX(name) \ - static _glthread_Mutex name = XMUTEX_INITIALIZER +/* The only two typedefs required here + * this is cause of the OS.h problem + */ +#ifdef __HAIKU__ +typedef int32 thread_id; +typedef int32 sem_id; +#endif -#define _glthread_INIT_MUTEX(name) \ - xmutex_init(&(name)) +typedef struct { + int32 key; + int initMagic; +} _glthread_TSD; -#define _glthread_LOCK_MUTEX(name) \ - (void) xmutex_lock(&(name)) +typedef thread_id _glthread_Thread; -#define _glthread_UNLOCK_MUTEX(name) \ - (void) xmutex_unlock(&(name)) +/* Use Benaphore, aka speeder semaphore */ +typedef struct { + int32 lock; + sem_id sem; +} benaphore; +typedef benaphore _glthread_Mutex; -#endif /* XTHREADS */ +#define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = { 0, 0 } +#define _glthread_INIT_MUTEX(name) name.sem = create_sem(0, #name"_benaphore"), name.lock = 0 +#define _glthread_DESTROY_MUTEX(name) delete_sem(name.sem), name.lock = 0 +#define _glthread_LOCK_MUTEX(name) if (name.sem == 0) _glthread_INIT_MUTEX(name); \ + if (atomic_add(&(name.lock), 1) >= 1) acquire_sem(name.sem) +#define _glthread_UNLOCK_MUTEX(name) if (atomic_add(&(name.lock), -1) > 1) release_sem(name.sem) +#endif /* BEOS_THREADS */ -#else /* THREADS */ +#ifndef THREADS /* * THREADS not defined */ -typedef GLuint _glthread_TSD; +typedef unsigned _glthread_TSD; -typedef GLuint _glthread_Thread; +typedef unsigned _glthread_Thread; -typedef GLuint _glthread_Mutex; +typedef unsigned _glthread_Mutex; #define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = 0 #define _glthread_INIT_MUTEX(name) (void) name +#define _glthread_DESTROY_MUTEX(name) (void) name + #define _glthread_LOCK_MUTEX(name) (void) name #define _glthread_UNLOCK_MUTEX(name) (void) name - #endif /* THREADS */ /* - * Platform independent thread specific data API. + * Platform independent thread specific data API. */ extern unsigned long @@ -249,8 +308,26 @@ _glthread_GetTSD(_glthread_TSD *); extern void _glthread_SetTSD(_glthread_TSD *, void *); +#if !defined __GNUC__ || __GNUC__ < 3 +# define __builtin_expect(x, y) x +#endif +#if defined(GLX_USE_TLS) +extern __thread struct _glapi_table * _glapi_tls_Dispatch + __attribute__((tls_model("initial-exec"))); -#endif /* THREADS_H */ +#define GET_DISPATCH() _glapi_tls_Dispatch +#elif !defined(GL_CALL) +# if defined(THREADS) +# define GET_DISPATCH() \ + ((__builtin_expect( _glapi_Dispatch != NULL, 1 )) \ + ? _glapi_Dispatch : _glapi_get_dispatch()) +# else +# define GET_DISPATCH() _glapi_Dispatch +# endif /* defined(THREADS) */ +#endif /* ndef GL_CALL */ + + +#endif /* THREADS_H */