Commit 628bc977 authored by Sam Lantinga's avatar Sam Lantinga

Added support for the GNU Pth thread lib (thanks Mandin!)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40186
parent 3ed3b9a2
......@@ -1131,6 +1131,33 @@ CheckPTHREAD()
AM_CONDITIONAL(USE_CLONE, test x$use_clone = xyes)
}
dnl See if we can use GNU pth library for threads
CheckPTH()
{
dnl Check for pth support
AC_ARG_ENABLE(pth,
[ --enable-pth use GNU pth library for multi-threading [default=yes]],
, enable_pth=yes)
if test x$enable_threads = xyes -a x$enable_pth = xyes; then
AC_PATH_PROG(PTH_CONFIG, pth-config, no)
if test "$PTH_CONFIG" = "no"; then
use_pth=no
else
PTH_CFLAGS=`$PTH_CONFIG --cflags`
PTH_LIBS=`$PTH_CONFIG --libs`
SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
SDL_LIBS="$SDL_LIBS $PTH_LIBS"
use_pth=yes
fi
AC_MSG_CHECKING(pth)
if test "x$use_pth" = xyes; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
fi
fi
}
dnl Determine whether the compiler can produce Win32 executables
CheckWIN32()
{
......
......@@ -16,6 +16,8 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
Major changes since SDL 1.0.0:
</H2>
<UL>
<LI> 1.2.3: Added support for the GNU Pth thread lib (thanks Mandin!)
<LI> 1.2.3: Added the Undo key for the Atari keyboard (thanks Mandin!)
<LI> 1.2.3: Fixed XVideo on GeForce by using last available adaptor
<LI> 1.2.3: Added CD-ROM support for BSD/OS (thanks Steven!)
<LI> 1.2.3: Added library version information to the Windows DLL
......
......@@ -3,12 +3,13 @@
noinst_LTLIBRARIES = libthread.la
ARCH_SUBDIRS = $(srcdir)/generic \
$(srcdir)/amigaos \
$(srcdir)/beos \
$(srcdir)/epoc \
$(srcdir)/irix \
$(srcdir)/linux \
ARCH_SUBDIRS = $(srcdir)/generic \
$(srcdir)/amigaos \
$(srcdir)/beos \
$(srcdir)/epoc \
$(srcdir)/irix \
$(srcdir)/linux \
$(srcdir)/pth \
$(srcdir)/win32
# Older versions of Linux require an asm clone() implementation
......
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Sam Lantinga
slouken@devolution.com
*/
#ifdef SAVE_RCSID
static char rcsid =
"@(#) $Id$";
#endif
/* Pth thread management routines for SDL */
#include "SDL_error.h"
#include "SDL_thread.h"
#include "SDL_systhread.h"
#include <signal.h>
#include <pth.h>
/* List of signals to mask in the subthreads */
static int sig_list[] = {
SIGHUP, SIGINT, SIGQUIT, SIGPIPE, SIGALRM, SIGTERM, SIGCHLD, SIGWINCH,
SIGVTALRM, SIGPROF, 0
};
static void *RunThread(void *data)
{
SDL_RunThread(data);
pth_exit((void*)0);
return((void *)0); /* Prevent compiler warning */
}
int SDL_SYS_CreateThread(SDL_Thread *thread, void *args)
{
pth_attr_t type;
/* Set the thread attributes */
if ( pth_attr_init(&type) != 0 ) {
SDL_SetError("Couldn't initialize pth attributes");
return(-1);
}
pth_attr_set(&type, PTH_ATTR_JOINABLE, TRUE);
/* Create the thread and go! */
if ( pth_spawn( &type, RunThread, args) != 0 ) {
SDL_SetError("Not enough resources to create thread");
return(-1);
}
return(0);
}
void SDL_SYS_SetupThread(void)
{
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]);
}
pth_sigmask(SIG_BLOCK, &mask, 0);
/* Allow ourselves to be asynchronously cancelled */
{ int oldstate;
pth_cancel_state(PTH_CANCEL_ASYNCHRONOUS, &oldstate);
}
}
/* WARNING: This may not work for systems with 64-bit pid_t */
Uint32 SDL_ThreadID(void)
{
return((Uint32)pth_self());
}
void SDL_SYS_WaitThread(SDL_Thread *thread)
{
pth_join(thread->handle, 0);
}
void SDL_SYS_KillThread(SDL_Thread *thread)
{
pth_cancel(thread->handle);
pth_join(thread->handle, NULL);
}
/*
SDL - Simple DirectMedia Layer
Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Sam Lantinga
slouken@devolution.com
*/
#include <pth.h>
typedef pth_t SYS_ThreadHandle;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment