pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lots of fixes importing SDL source wholesale into a new iOS project

Browse source 
--HG--
rename : src/libm/math.h => src/libm/math_libm.h
This commit is contained in:
Sam Lantinga 2011-10-31 05:56:58 -04:00
parent e112859e94
commit ad2a21d404
135 changed files with 493 additions and 1093 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/thread/SDL_thread.c
View file

@ -26,6 +26,7 @@
#include "SDL_thread.h"
#include "SDL_thread_c.h"
#include "SDL_systhread.h"
#include "../SDL_error_c.h"
#define ARRAY_CHUNKSIZE 32
/* The array of threads currently active in the application

3
src/thread/SDL_thread_c.h
View file

@ -32,8 +32,6 @@
#include "epoc/SDL_systhread_c.h"
#elif SDL_THREAD_PTHREAD
#include "pthread/SDL_systhread_c.h"
#elif SDL_THREAD_SPROC
#include "irix/SDL_systhread_c.h"
#elif SDL_THREAD_WINDOWS
#include "windows/SDL_systhread_c.h"
#elif SDL_THREAD_NDS
@ -59,4 +57,5 @@ struct SDL_Thread
extern void SDL_RunThread(void *data);
#endif /* _SDL_thread_c_h */
/* vi: set ts=4 sw=4 expandtab: */

4
src/thread/beos/SDL_syssem.c
View file

@ -20,6 +20,8 @@
*/
#include "SDL_config.h"
#ifdef SDL_THREAD_BEOS
/* Semaphores in the BeOS environment */
#include <be/kernel/OS.h>
@ -148,4 +150,6 @@ SDL_SemPost(SDL_sem * sem)
return 0;
}
#endif /* SDL_THREAD_BEOS */
/* vi: set ts=4 sw=4 expandtab: */

4
src/thread/beos/SDL_systhread.c
View file

@ -20,6 +20,8 @@
*/
#include "SDL_config.h"
#ifdef SDL_THREAD_BEOS
/* BeOS thread management routines for SDL */
#include <stdio.h>
@ -120,4 +122,6 @@ SDL_SYS_WaitThread(SDL_Thread * thread)
wait_for_thread(thread->handle, &the_status);
}
#endif /* SDL_THREAD_BEOS */
/* vi: set ts=4 sw=4 expandtab: */

230
src/thread/irix/SDL_syssem.c
View file

@ -1,230 +0,0 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#include "SDL_config.h"
#include "SDL_thread.h"
#include "SDL_timer.h"
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/sem.h>
#include <errno.h>
#include "SDL_error.h"
#include "SDL_thread.h"
struct SDL_semaphore
{
int id;
};
/* Not defined by many operating systems, use configure to detect */
/*
#if !defined(HAVE_SEMUN)
union semun {
int val;
struct semid_ds *buf;
ushort *array;
};
#endif
*/
static struct sembuf op_trywait[2] = {
{0, -1, (IPC_NOWAIT | SEM_UNDO)} /* Decrement semaphore, no block */
};
static struct sembuf op_wait[2] = {
{0, -1, SEM_UNDO} /* Decrement semaphore */
};
static struct sembuf op_post[1] = {
{0, 1, (IPC_NOWAIT | SEM_UNDO)} /* Increment semaphore */
};
/* Create a blockable semaphore */
SDL_sem *
SDL_CreateSemaphore(Uint32 initial_value)
{
extern int _creating_thread_lock; /* SDL_threads.c */
SDL_sem *sem;
union semun init;
sem = (SDL_sem *) SDL_malloc(sizeof(*sem));
if (sem == NULL) {
SDL_OutOfMemory();
return (NULL);
}
sem->id = semget(IPC_PRIVATE, 1, (0600 | IPC_CREAT));
if (sem->id < 0) {
SDL_SetError("Couldn't create semaphore");
SDL_free(sem);
return (NULL);
}
init.val = initial_value; /* Initialize semaphore */
semctl(sem->id, 0, SETVAL, init);
return (sem);
}
void
SDL_DestroySemaphore(SDL_sem * sem)
{
if (sem) {
#ifdef __IRIX__
semctl(sem->id, 0, IPC_RMID);
#else
union semun dummy;
dummy.val = 0;
semctl(sem->id, 0, IPC_RMID, dummy);
#endif
SDL_free(sem);
}
}
int
SDL_SemTryWait(SDL_sem * sem)
{
int retval;
if (!sem) {
SDL_SetError("Passed a NULL semaphore");
return -1;
}
retval = 0;
tryagain:
if (semop(sem->id, op_trywait, 1) < 0) {
if (errno == EINTR) {
goto tryagain;
}
retval = SDL_MUTEX_TIMEDOUT;
}
return retval;
}
int
SDL_SemWait(SDL_sem * sem)
{
int retval;
if (!sem) {
SDL_SetError("Passed a NULL semaphore");
return -1;
}
retval = 0;
tryagain:
if (semop(sem->id, op_wait, 1) < 0) {
if (errno == EINTR) {
goto tryagain;
}
SDL_SetError("Semaphore operation error");
retval = -1;
}
return retval;
}
int
SDL_SemWaitTimeout(SDL_sem * sem, Uint32 timeout)
{
int retval;
if (!sem) {
SDL_SetError("Passed a NULL semaphore");
return -1;
}
/* Try the easy cases first */
if (timeout == 0) {
return SDL_SemTryWait(sem);
}
if (timeout == SDL_MUTEX_MAXWAIT) {
return SDL_SemWait(sem);
}
/* Ack! We have to busy wait... */
timeout += SDL_GetTicks();
do {
retval = SDL_SemTryWait(sem);
if (retval == 0) {
break;
}
SDL_Delay(1);
} while (SDL_GetTicks() < timeout);
return retval;
}
Uint32
SDL_SemValue(SDL_sem * sem)
{
int semval;
Uint32 value;
value = 0;
if (sem) {
tryagain:
#ifdef __IRIX__
semval = semctl(sem->id, 0, GETVAL);
#else
{
union semun arg;
arg.val = 0;
semval = semctl(sem->id, 0, GETVAL, arg);
}
#endif
if (semval < 0) {
if (errno == EINTR) {
goto tryagain;
}
} else {
value = (Uint32) semval;
}
}
return value;
}
int
SDL_SemPost(SDL_sem * sem)
{
int retval;
if (!sem) {
SDL_SetError("Passed a NULL semaphore");
return -1;
}
retval = 0;
tryagain:
if (semop(sem->id, op_post, 1) < 0) {
if (errno == EINTR) {
goto tryagain;
}
SDL_SetError("Semaphore operation error");
retval = -1;
}
return retval;
}
/* vi: set ts=4 sw=4 expandtab: */

81
src/thread/irix/SDL_systhread.c
View file

@ -1,81 +0,0 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#include "SDL_config.h"
/* IRIX thread management routines for SDL */
#include <errno.h>
#include <signal.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/prctl.h>
#include "SDL_thread.h"
#include "../SDL_systhread.h"
static int sig_list[] = {
SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCLD, SIGWINCH,
SIGVTALRM, SIGPROF, 0
};
int
SDL_SYS_CreateThread(SDL_Thread * thread, void *args)
{
/* Create the thread and go! */
if (sproc(SDL_RunThread, PR_SALL, args) < 0) {
SDL_SetError("Not enough resources to create thread");
return (-1);
}
return (0);
}
void
SDL_SYS_SetupThread(const char *name)
{
int i;
sigset_t mask;
/* Mask asynchronous signals for this thread */
sigemptyset(&mask);
for (i = 0; sig_list[i]; ++i) {
sigaddset(&mask, sig_list[i]);
}
sigprocmask(SIG_BLOCK, &mask, NULL);
}
SDL_threadID
SDL_ThreadID(void)
{
return ((SDL_threadID) getpid());
}
void
SDL_WaitThread(SDL_Thread * thread, int *status)
{
errno = 0;
while (errno != ECHILD) {
waitpid(thread->handle, NULL, 0);
}
}
/* vi: set ts=4 sw=4 expandtab: */

27
src/thread/irix/SDL_systhread_c.h
View file

@ -1,27 +0,0 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#include "SDL_config.h"
#include <sys/types.h>
typedef pid_t SYS_ThreadHandle;
/* vi: set ts=4 sw=4 expandtab: */

6
src/thread/nds/SDL_systhread.c
View file

@ -61,10 +61,4 @@ SDL_SYS_SetThreadPriority(SDL_ThreadPriority priority)
return (0);
}
void
SDL_SYS_KillThread(SDL_Thread * thread)
{
return;
}
/* vi: set ts=4 sw=4 expandtab: */

4
src/thread/windows/SDL_sysmutex.c
View file

@ -20,6 +20,8 @@
*/
#include "SDL_config.h"
#if SDL_THREAD_WINDOWS
/* Mutex functions using the Win32 API */
#include "../../core/windows/SDL_windows.h"
@ -90,4 +92,6 @@ SDL_mutexV(SDL_mutex * mutex)
return (0);
}
#endif /* SDL_THREAD_WINDOWS */
/* vi: set ts=4 sw=4 expandtab: */

4
src/thread/windows/SDL_syssem.c
View file

@ -20,6 +20,8 @@
*/
#include "SDL_config.h"
#if SDL_THREAD_WINDOWS
/* Semaphore functions using the Win32 API */
#include "../../core/windows/SDL_windows.h"
@ -169,4 +171,6 @@ SDL_SemPost(SDL_sem * sem)
return 0;
}
#endif /* SDL_THREAD_WINDOWS */
/* vi: set ts=4 sw=4 expandtab: */

4
src/thread/windows/SDL_systhread.c
View file

@ -20,6 +20,8 @@
*/
#include "SDL_config.h"
#if SDL_THREAD_WINDOWS
/* Win32 thread management routines for SDL */
#include "SDL_thread.h"
@ -216,4 +218,6 @@ SDL_SYS_WaitThread(SDL_Thread * thread)
CloseHandle(thread->handle);
}
#endif /* SDL_THREAD_WINDOWS */
/* vi: set ts=4 sw=4 expandtab: */

8
src/thread/windows/win_ce_semaphore.c
View file

@ -26,7 +26,11 @@
6. The wait function emulates WaitForSingleObject only. An emulation of
WaitForMultipleObjects is much harder to implement outside the kernel,
and it is not clear how to handle a mixture of WCE semaphores and normal
events and mutexes. */
events and mutexes.
*/
#include "SDL_config.h"
#if SDL_THREAD_WINDOWS
#include "../../core/windows/SDL_windows.h"
@ -224,4 +228,6 @@ CleanUp(SYNCHHANDLE hSynch, DWORD Flags)
return hSynch;
}
#endif /* SDL_THREAD_WINDOWS */
/* vi: set ts=4 sw=4 expandtab: */