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 <[email protected]>

1 files changed, 26 insertions, 0 deletions

diff --git a/src/posix-thread.c b/src/posix-thread.c
index 270dc91..00a43e2 100644
--- a/src/posix-thread.c
+++ b/src/posix-thread.c
@@ -43,18 +43,44 @@
 
 #include "thread.h"
 
+/*
+ * Functions called before and after blocking syscalls.
+ * gpgrt_set_syscall_clamp is used to set them.
+ */
+static void (*pre_syscall_func)(void);
+static void (*post_syscall_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_thread_set_syscall_clamp (void (*pre)(void), void (*post)(void))
+{
+  pre_syscall_func = pre;
+  post_syscall_func = post;
+}
+
+
 
 gpg_err_code_t
 _gpgrt_yield (void)
 {
 #if USE_POSIX_THREADS
 # ifdef _POSIX_PRIORITY_SCHEDULING
+   if (pre_syscall_func)
+     pre_syscall_func ();
    sched_yield ();
+   if (post_syscall_func)
+     post_syscall_func ();
 # else
    return GPG_ERR_NOT_SUPPORTED;
 # endif
 #elif USE_SOLARIS_THREADS
+  if (pre_syscall_func)
+    pre_syscall_func ();
   thr_yield ();
+  if (post_syscall_func)
+    post_syscall_func ();
 #else
   return GPG_ERR_NOT_SUPPORTED;
 #endif