Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Patrice's fixes for GNU Pthread support
- Loading branch information
Showing
8 changed files
with
259 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
/* | ||
* GNU pth conditions variables | ||
* | ||
* Patrice Mandin | ||
*/ | ||
|
||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <pth.h> | ||
|
||
#include "SDL_error.h" | ||
#include "SDL_thread.h" | ||
#include "SDL_syscond_c.h" | ||
#include "SDL_sysmutex_c.h" | ||
|
||
/* Create a condition variable */ | ||
SDL_cond * SDL_CreateCond(void) | ||
{ | ||
SDL_cond *cond; | ||
|
||
cond = (SDL_cond *) malloc(sizeof(SDL_cond)); | ||
if ( cond ) { | ||
if ( pth_cond_init(&(cond->condpth_p)) < 0 ) { | ||
SDL_SetError("pthread_cond_init() failed"); | ||
free(cond); | ||
cond = NULL; | ||
} | ||
} else { | ||
SDL_OutOfMemory(); | ||
} | ||
return(cond); | ||
} | ||
|
||
/* Destroy a condition variable */ | ||
void SDL_DestroyCond(SDL_cond *cond) | ||
{ | ||
if ( cond ) { | ||
free(cond); | ||
} | ||
} | ||
|
||
/* Restart one of the threads that are waiting on the condition variable */ | ||
int SDL_CondSignal(SDL_cond *cond) | ||
{ | ||
int retval; | ||
|
||
if ( ! cond ) { | ||
SDL_SetError("Passed a NULL condition variable"); | ||
return -1; | ||
} | ||
|
||
retval = 0; | ||
if ( pth_cond_notify(&(cond->condpth_p), FALSE) != 0 ) { | ||
SDL_SetError("pth_cond_notify() failed"); | ||
retval = -1; | ||
} | ||
return retval; | ||
} | ||
|
||
/* Restart all threads that are waiting on the condition variable */ | ||
int SDL_CondBroadcast(SDL_cond *cond) | ||
{ | ||
int retval; | ||
|
||
if ( ! cond ) { | ||
SDL_SetError("Passed a NULL condition variable"); | ||
return -1; | ||
} | ||
|
||
retval = 0; | ||
if ( pth_cond_notify(&(cond->condpth_p), TRUE) != 0 ) { | ||
SDL_SetError("pth_cond_notify() failed"); | ||
retval = -1; | ||
} | ||
return retval; | ||
} | ||
|
||
/* Wait on the condition variable for at most 'ms' milliseconds. | ||
The mutex must be locked before entering this function! | ||
The mutex is unlocked during the wait, and locked again after the wait. | ||
Typical use: | ||
Thread A: | ||
SDL_LockMutex(lock); | ||
while ( ! condition ) { | ||
SDL_CondWait(cond); | ||
} | ||
SDL_UnlockMutex(lock); | ||
Thread B: | ||
SDL_LockMutex(lock); | ||
... | ||
condition = true; | ||
... | ||
SDL_UnlockMutex(lock); | ||
*/ | ||
int SDL_CondWaitTimeout(SDL_cond *cond, SDL_mutex *mutex, Uint32 ms) | ||
{ | ||
int retval; | ||
pth_event_t ev; | ||
int sec; | ||
|
||
if ( ! cond ) { | ||
SDL_SetError("Passed a NULL condition variable"); | ||
return -1; | ||
} | ||
|
||
retval = 0; | ||
|
||
sec = ms/1000; | ||
ev = pth_event(PTH_EVENT_TIME, pth_timeout(sec,(ms-sec*1000)*1000)); | ||
|
||
if ( pth_cond_await(&(cond->condpth_p), &(mutex->mutexpth_p), ev) != 0 ) { | ||
SDL_SetError("pth_cond_await() failed"); | ||
retval = -1; | ||
} | ||
|
||
pth_event_free(ev, PTH_FREE_ALL); | ||
|
||
return retval; | ||
} | ||
|
||
/* Wait on the condition variable forever */ | ||
int SDL_CondWait(SDL_cond *cond, SDL_mutex *mutex) | ||
{ | ||
int retval; | ||
|
||
if ( ! cond ) { | ||
SDL_SetError("Passed a NULL condition variable"); | ||
return -1; | ||
} | ||
|
||
retval = 0; | ||
if ( pth_cond_await(&(cond->condpth_p), &(mutex->mutexpth_p), NULL) != 0 ) { | ||
SDL_SetError("pth_cond_await() failed"); | ||
retval = -1; | ||
} | ||
return retval; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
#ifndef _SDL_SYSCOND_C_H_ | ||
#define _SDL_SYSCOND_C_H_ | ||
|
||
struct SDL_cond | ||
{ | ||
pth_cond_t condpth_p; | ||
}; | ||
|
||
#endif /* _SDL_SYSCOND_C_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
/* | ||
* GNU pth mutexes | ||
* | ||
* Patrice Mandin | ||
*/ | ||
|
||
#include <stdio.h> | ||
#include <stdlib.h> | ||
#include <pth.h> | ||
|
||
#include "SDL_error.h" | ||
#include "SDL_mutex.h" | ||
#include "SDL_sysmutex_c.h" | ||
|
||
/* Create a mutex */ | ||
SDL_mutex *SDL_CreateMutex(void) | ||
{ | ||
SDL_mutex *mutex; | ||
|
||
/* Allocate mutex memory */ | ||
mutex = (SDL_mutex *)malloc(sizeof(*mutex)); | ||
if ( mutex ) { | ||
/* Create the mutex, with initial value signaled */ | ||
if (!pth_mutex_init(&(mutex->mutexpth_p))) { | ||
SDL_SetError("Couldn't create mutex"); | ||
free(mutex); | ||
mutex = NULL; | ||
} | ||
} else { | ||
SDL_OutOfMemory(); | ||
} | ||
return(mutex); | ||
} | ||
|
||
/* Free the mutex */ | ||
void SDL_DestroyMutex(SDL_mutex *mutex) | ||
{ | ||
if ( mutex ) { | ||
free(mutex); | ||
} | ||
} | ||
|
||
/* Lock the mutex */ | ||
int SDL_mutexP(SDL_mutex *mutex) | ||
{ | ||
if ( mutex == NULL ) { | ||
SDL_SetError("Passed a NULL mutex"); | ||
return -1; | ||
} | ||
|
||
pth_mutex_acquire(&(mutex->mutexpth_p), FALSE, NULL); | ||
|
||
return(0); | ||
} | ||
|
||
/* Unlock the mutex */ | ||
int SDL_mutexV(SDL_mutex *mutex) | ||
{ | ||
if ( mutex == NULL ) { | ||
SDL_SetError("Passed a NULL mutex"); | ||
return -1; | ||
} | ||
|
||
pth_mutex_release(&(mutex->mutexpth_p)); | ||
|
||
return(0); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#ifndef _SDL_SYSMUTEX_C_H_ | ||
#define _SDL_SYSMUTEX_C_H_ | ||
|
||
struct SDL_mutex { | ||
pth_mutex_t mutexpth_p; | ||
}; | ||
|
||
#endif /* _SDL_SYSMUTEX_C_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters