diff options
| author | Mark H Weaver <mhw@netris.org> | 2013-11-17 04:00:29 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2013-11-17 04:35:14 -0500 |
| commit | 9b48be7107f3f98cdf2e756d4c1f4c937ff233d7 (patch) | |
| tree | 3f9972a0b7faf4350636bbe6a6813ce9859fac21 | |
| parent | 363df6cf108763e24eb5cb149131a3fa3f400734 (diff) | |
| download | guile-9b48be7107f3f98cdf2e756d4c1f4c937ff233d7.tar.gz | |
Add mutex locking functions that also block asyncs.
* libguile/async.h (scm_i_pthread_mutex_lock_with_asyncs,
scm_i_pthread_mutex_unlock_with_asyncs): New macros.
* libguile/threads.c (do_unlock_with_asyncs): New static helper.
(scm_i_dynwind_pthread_mutex_lock_with_asyncs): New function.
* libguile/threads.h (scm_i_dynwind_pthread_mutex_lock_with_asyncs):
Add prototype.
| -rw-r--r-- | libguile/async.h | 12 | ||||
| -rw-r--r-- | libguile/threads.c | 16 | ||||
| -rw-r--r-- | libguile/threads.h | 1 |
3 files changed, 29 insertions, 0 deletions
diff --git a/libguile/async.h b/libguile/async.h index ceb2b960b..6d0460cac 100644 --- a/libguile/async.h +++ b/libguile/async.h @@ -78,6 +78,18 @@ SCM_API void scm_critical_section_end (void); scm_async_click (); \ } while (0) +# define scm_i_pthread_mutex_lock_with_asyncs(m) \ + do { \ + SCM_I_CURRENT_THREAD->block_asyncs++; \ + scm_i_pthread_mutex_lock(m); \ + } while (0) + +# define scm_i_pthread_mutex_unlock_with_asyncs(m) \ + do { \ + scm_i_pthread_mutex_unlock(m); \ + SCM_I_CURRENT_THREAD->block_asyncs--; \ + } while (0) + #else /* !BUILDING_LIBGUILE */ # define SCM_CRITICAL_SECTION_START scm_critical_section_start () diff --git a/libguile/threads.c b/libguile/threads.c index 8cbe1e22f..6aeaeb919 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -2010,6 +2010,22 @@ scm_pthread_cond_timedwait (scm_i_pthread_cond_t *cond, #endif +static void +do_unlock_with_asyncs (void *data) +{ + scm_i_pthread_mutex_unlock ((scm_i_pthread_mutex_t *)data); + SCM_I_CURRENT_THREAD->block_asyncs--; +} + +void +scm_i_dynwind_pthread_mutex_lock_with_asyncs (scm_i_pthread_mutex_t *mutex) +{ + SCM_I_CURRENT_THREAD->block_asyncs++; + scm_i_scm_pthread_mutex_lock (mutex); + scm_dynwind_unwind_handler (do_unlock_with_asyncs, mutex, + SCM_F_WIND_EXPLICITLY); +} + unsigned long scm_std_usleep (unsigned long usecs) { diff --git a/libguile/threads.h b/libguile/threads.h index 901c37bb2..5a2afa2c7 100644 --- a/libguile/threads.h +++ b/libguile/threads.h @@ -143,6 +143,7 @@ SCM_INTERNAL void scm_init_threads (void); SCM_INTERNAL void scm_init_thread_procs (void); SCM_INTERNAL void scm_init_threads_default_dynamic_state (void); +SCM_INTERNAL void scm_i_dynwind_pthread_mutex_lock_with_asyncs (scm_i_pthread_mutex_t *mutex); #define SCM_THREAD_SWITCHING_CODE \ do { } while (0) |