From: Nikodemus S. <de...@us...> - 2007-04-29 21:57:48
|
Update of /cvsroot/sbcl/sbcl/src/runtime In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv12847/src/runtime Modified Files: linux-os.c pthread-futex.c Log Message: 1.0.5.9: experimental semi-synchronous deadlines * WITH-DEADLINE provides an interface to a synchronous deadline/timeout facility that can interrupt execution only on blocking IO and when waiting on locks (latter Linux only for now.) * DECODE-DEADLINE provides an interface that implementors of blocking functions can use to hook into the deadline mechanism. * Add SB-IMPL::*ON-DANGEROUS-SELECT* for debugging: can be used to warn/ signal an error / obtain a backtrace when SBCL calls select without a timeout while interrupts are disabled. * Undocumented and unexported periodic polling functionality has been removed from SERVE-EVENT, but can be reinstated should it be desired. Index: linux-os.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/linux-os.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- linux-os.c 2 Apr 2007 08:37:37 -0000 1.69 +++ linux-os.c 29 Apr 2007 21:57:45 -0000 1.70 @@ -82,21 +82,30 @@ } int -futex_wait(int *lock_word, int oldval) +futex_wait(int *lock_word, int oldval, long sec, unsigned long usec) { - int t; - again: - t = sys_futex(lock_word,FUTEX_WAIT,oldval, 0); - - /* Interrupted FUTEX_WAIT calls may return early. - * - * If someone manages to wake the futex while we're spinning - * around it, we will just return with -1 and errno EWOULDBLOCK, - * because the value has changed, so that's ok. */ - if (t != 0 && errno == EINTR) - goto again; + struct timespec timeout; + int t; - return t; + again: + if (sec<0) { + t = sys_futex(lock_word,FUTEX_WAIT,oldval, 0); + } + else { + timeout.tv_sec = sec; + timeout.tv_nsec = usec * 1000; + t = sys_futex(lock_word,FUTEX_WAIT,oldval, &timeout); + } + if (t==0) + return 0; + else if (errno==ETIMEDOUT) + return 1; + else if (errno==EINTR) + /* spurious wakeup from interrupt */ + goto again; + else + /* EWOULDBLOCK and others, need to check the lock */ + return -1; } int @@ -172,7 +181,7 @@ } #ifdef LISP_FEATURE_SB_THREAD #if !defined(LISP_FEATURE_SB_LUTEX) && !defined(LISP_FEATURE_SB_PTHREAD_FUTEX) - futex_wait(futex,-1); + futex_wait(futex,-1,-1,0); if(errno==ENOSYS) { lose("This version of SBCL is compiled with threading support, but your kernel\n" "is too old to support this. Please use a more recent kernel or\n" Index: pthread-futex.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/pthread-futex.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- pthread-futex.c 15 Dec 2006 03:28:36 -0000 1.2 +++ pthread-futex.c 29 Apr 2007 21:57:45 -0000 1.3 @@ -206,7 +206,7 @@ } int -futex_wait(int *lock_word, int oldval) +futex_wait(int *lock_word, int oldval, long sec, unsigned long usec) { int ret, result; struct futex *futex; |