From 5daca000df283b9ef4a8ec8e51eab086818be979 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@lysator.liu.se>
Date: Mon, 11 Oct 2010 23:33:57 +0200
Subject: [PATCH] Removed unused functions to "trylock" the interpreter lock.
---
src/pike_threadlib.h | 4 ----
src/threads.c | 18 ------------------
2 files changed, 22 deletions(-)
diff --git a/src/pike_threadlib.h b/src/pike_threadlib.h
index 4fd9fc7f2b..1902072d9b 100644
--- a/src/pike_threadlib.h
+++ b/src/pike_threadlib.h
@@ -455,14 +455,12 @@ extern int num_pike_threads;
} while (0)
PMOD_EXPORT void pike_low_lock_interpreter (DLOC_DECL);
-PMOD_EXPORT int pike_low_trylock_interpreter (DLOC_DECL);
PMOD_EXPORT void pike_low_wait_interpreter (COND_T *cond COMMA_DLOC_DECL);
PMOD_EXPORT int pike_low_timedwait_interpreter (COND_T *cond,
long sec, long nsec
COMMA_DLOC_DECL);
PMOD_EXPORT void pike_lock_interpreter (DLOC_DECL);
-PMOD_EXPORT int pike_trylock_interpreter (DLOC_DECL);
PMOD_EXPORT void pike_unlock_interpreter (DLOC_DECL);
PMOD_EXPORT void pike_wait_interpreter (COND_T *cond COMMA_DLOC_DECL);
PMOD_EXPORT int pike_timedwait_interpreter (COND_T *cond,
@@ -470,14 +468,12 @@ PMOD_EXPORT int pike_timedwait_interpreter (COND_T *cond,
COMMA_DLOC_DECL);
#define low_mt_lock_interpreter() pike_low_lock_interpreter (DLOC)
-#define low_mt_trylock_interpreter() pike_low_trylock_interpreter (DLOC)
#define low_co_wait_interpreter(COND) \
pike_low_wait_interpreter (COND COMMA_DLOC)
#define low_co_wait_interpreter_timeout(COND, SEC, NSEC) \
pike_low_timedwait_interpreter (COND, SEC, NSEC COMMA_DLOC)
#define mt_lock_interpreter() pike_lock_interpreter (DLOC)
-#define mt_trylock_interpreter() pike_trylock_interpreter (DLOC)
#define mt_unlock_interpreter() pike_unlock_interpreter (DLOC)
#define co_wait_interpreter(COND) pike_wait_interpreter (COND COMMA_DLOC)
#define co_wait_interpreter_timeout(COND, SEC, NSEC) \
diff --git a/src/threads.c b/src/threads.c
index b83f8065f3..ee584c6e9a 100644
--- a/src/threads.c
+++ b/src/threads.c
@@ -417,17 +417,6 @@ PMOD_EXPORT INLINE void pike_low_lock_interpreter (DLOC_DECL)
COMMA_DLOC_ARGS_OPT));
}
-PMOD_EXPORT INLINE int pike_low_trylock_interpreter (DLOC_DECL)
-{
- int res = mt_trylock (&interpreter_lock);
- if (!res) {
- SET_LOCKING_THREAD;
- THREADS_FPRINTF (1, (stderr, "Got iplock" DLOC_PF(" @ ",) "\n"
- COMMA_DLOC_ARGS_OPT));
- }
- return res;
-}
-
PMOD_EXPORT INLINE void pike_low_wait_interpreter (COND_T *cond COMMA_DLOC_DECL)
{
THREADS_FPRINTF (1, (stderr,
@@ -477,13 +466,6 @@ PMOD_EXPORT INLINE void pike_lock_interpreter (DLOC_DECL)
if (threads_disabled) threads_disabled_wait (DLOC_ARGS_OPT);
}
-PMOD_EXPORT INLINE int pike_trylock_interpreter (DLOC_DECL)
-{
- int res = pike_low_trylock_interpreter (DLOC_ARGS_OPT);
- if (!res && threads_disabled) threads_disabled_wait (DLOC_ARGS_OPT);
- return res;
-}
-
PMOD_EXPORT INLINE void pike_unlock_interpreter (DLOC_DECL)
{
THREADS_FPRINTF (1, (stderr, "Releasing iplock" DLOC_PF(" @ ",) "\n"
--
GitLab