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/estream.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/estream.c') diff --git a/src/estream.c b/src/estream.c index 95d7211..d0f0ba9 100644 --- a/src/estream.c +++ b/src/estream.c @@ -95,7 +95,8 @@ #include "gpgrt-int.h" #include "estream-printf.h" - +#include "thread.h" +#include "lock.h" #ifndef O_BINARY # define O_BINARY 0 @@ -564,6 +565,8 @@ do_deinit (void) /* Reset the syscall clamp. */ pre_syscall_func = NULL; post_syscall_func = NULL; + _gpgrt_thread_set_syscall_clamp (NULL, NULL); + _gpgrt_lock_set_lock_clamp (NULL, NULL); } @@ -598,6 +601,8 @@ _gpgrt_set_syscall_clamp (void (*pre)(void), void (*post)(void)) { pre_syscall_func = pre; post_syscall_func = post; + _gpgrt_thread_set_syscall_clamp (pre, post); + _gpgrt_lock_set_lock_clamp (pre, post); } -- cgit v1.2.3