From 25d463c67821901c8fd6736c815f11e85bbae66f Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 11 Nov 2016 20:26:49 +0100 Subject: Use the syscall clamp functions also for lock functions * src/posix-lock.c (pre_lock_func, post_lock_func): New. (_gpgrt_lock_set_lock_clamp): New. (_gpgrt_lock_lock): Use clamp functions. * src/w32-lock.c (pre_lock_func, post_lock_func): New. (_gpgrt_lock_set_lock_clamp): New. (_gpgrt_lock_lock): Use clamp functions. * src/posix-lock.c (pre_syscall_func, post_syscall_func): New. (_gpgrt_thread_set_syscall_clamp): New. (_gpgrt_yield): Use clamp functions. * src/w32-lock.c (pre_syscall_func, post_syscall_func): New. (_gpgrt_thread_set_syscall_clamp): New. (_gpgrt_yield): Use clamp functions. * src/estream.c: Include lock.h and thread.h. (do_deinit): Call _gpgrt_lock_set_lock_clamp. (_gpgrt_set_syscall_clamp): Ditto. Signed-off-by: Werner Koch --- src/w32-lock.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/w32-lock.c') diff --git a/src/w32-lock.c b/src/w32-lock.c index d1decc9..51b13a1 100644 --- a/src/w32-lock.c +++ b/src/w32-lock.c @@ -37,6 +37,26 @@ #include "w32-lock-obj.h" + +/* + * Functions called before and after blocking syscalls. + * gpgrt_set_syscall_clamp is used to set them. + */ +static void (*pre_lock_func)(void); +static void (*post_lock_func)(void); + + +/* Helper to set the clamp functions. This is called as a helper from + * _gpgrt_set_syscall_clamp to keep the function pointers local. */ +void +_gpgrt_lock_set_lock_clamp (void (*pre)(void), void (*post)(void)) +{ + pre_lock_func = pre; + post_lock_func = post; +} + + + static _gpgrt_lock_t * get_lock_object (gpgrt_lock_t *lockhd) { @@ -101,7 +121,11 @@ _gpgrt_lock_lock (gpgrt_lock_t *lockhd) } } + if (pre_lock_func) + pre_lock_func (); EnterCriticalSection (&lock->csec); + if (post_lock_func) + post_lock_func (); return 0; } -- cgit v1.2.3