diff options
| author | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-06 23:25:39 +0000 |
|---|---|---|
| committer | Chris Hall (GMCH) <chris.hall@highwayman.com> | 2009-12-06 23:25:39 +0000 |
| commit | 20b6b088dd8864472dc03b1aaabfbb33d9b7ad47 (patch) | |
| tree | c5c6089e9da2a7a6fe61fa72100fddf4e50230dd | |
| parent | 391f49fa132d167378dffbad44ac87d71dfa6b80 (diff) | |
| download | quagga-20b6b088dd8864472dc03b1aaabfbb33d9b7ad47.tar.bz2 quagga-20b6b088dd8864472dc03b1aaabfbb33d9b7ad47.tar.xz | |
Updates to lib/qpthreads.c & .h
Added qpt_thread_self().
Initialised output sigset_t before setting it in qpt_thread_sigmask().
| -rw-r--r-- | lib/qpthreads.c | 3 | ||||
| -rw-r--r-- | lib/qpthreads.h | 18 |
2 files changed, 18 insertions, 3 deletions
diff --git a/lib/qpthreads.c b/lib/qpthreads.c index 61ad80fc..1bfb4ddc 100644 --- a/lib/qpthreads.c +++ b/lib/qpthreads.c @@ -459,6 +459,9 @@ qpt_thread_sigmask(int how, const sigset_t* set, sigset_t* oset) { int err ; + if (oset != NULL) + sigemptyset(oset) ; /* to make absolutely sure */ + err = pthread_sigmask(how, set, oset) ; if (err != 0) zabort_err("pthread_sigmask failed", err) ; diff --git a/lib/qpthreads.h b/lib/qpthreads.h index d84b2c5c..8da7f3a6 100644 --- a/lib/qpthreads.h +++ b/lib/qpthreads.h @@ -87,7 +87,8 @@ typedef pthread_attr_t qpt_thread_attr_t ; * Thread Creation -- see qpthreads.c for further discussion. */ -enum qpt_attr_options { +enum qpt_attr_options +{ qpt_attr_joinable = 0, /* the default for Quagga */ qpt_attr_detached = 0x0001, /* otherwise will set joinable */ @@ -115,6 +116,15 @@ extern qpt_thread_t qpt_thread_create(void* (*start)(void*), void* arg, qpt_thread_attr_t* attr) ; /*============================================================================== + * Thread self knowledge. + */ + +Inline qpt_thread_t qpt_thread_self(void) +{ + return pthread_self() ; +} ; + +/*============================================================================== * Mutex handling. * * Quagga's default mutex type is: @@ -135,7 +145,8 @@ qpt_thread_create(void* (*start)(void*), void* arg, qpt_thread_attr_t* attr) ; * used to override this choice. */ -enum qpt_mutex_options { +enum qpt_mutex_options +{ qpt_mutex_quagga = 0x0000, /* Quagga's default */ qpt_mutex_normal = 0x0001, qpt_mutex_recursive = 0x0002, @@ -202,7 +213,8 @@ qpt_mutex_unlock(qpt_mutex_t* mx) ; /* do nothing if mx == NULL */ # endif #endif -enum qpt_cond_options { +enum qpt_cond_options +{ qpt_cond_quagga = 0x0000, /* Quagga's default */ qpt_cond_realtime = 0x0001, /* standard default */ qpt_cond_monotonic = 0x0002, |