generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-12 10:33:52 +01:00
Code Issues Projects Releases Wiki Activity

Functions passed to pthread_create are declared as extern "C"

Browse Source 
So far these were declared as C++ static functions which
was incorrect and caused warnings with SunStudio.

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
This commit is contained in:
Martin Sustrik 2010-11-27 22:19:43 +01:00
parent 0bc2a05d84
commit 325dd2f091
3 changed files with 46 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/thread.cpp
View File

@ -23,6 +23,16 @@
#ifdef ZMQ_HAVE_WINDOWS
extern "C"
{
static unsigned int __stdcall thread_routine (void *arg_)
{
thread_t *self = (zmq::thread_t*) arg_;
self->tfn (self->arg);
return 0;
}
}
void zmq::thread_t::start (thread_fn *tfn_, void *arg_)
{
tfn = tfn_;
@ -38,17 +48,30 @@ void zmq::thread_t::stop ()
win_assert (rc != WAIT_FAILED);
}
unsigned int __stdcall zmq::thread_t::thread_routine (void *arg_)
{
thread_t *self = (thread_t*) arg_;
self->tfn (self->arg);
return 0;
}
#else
#include <signal.h>
extern "C"
{
static void *thread_routine (void *arg_)
{
#if !defined ZMQ_HAVE_OPENVMS
// Following code will guarantee more predictable latecnies as it'll
// disallow any signal handling in the I/O thread.
sigset_t signal_set;
int rc = sigfillset (&signal_set);
errno_assert (rc == 0);
rc = pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
errno_assert (rc == 0);
#endif
zmq::thread_t *self = (zmq::thread_t*) arg_;
self->tfn (self->arg);
return NULL;
}
}
void zmq::thread_t::start (thread_fn *tfn_, void *arg_)
{
tfn = tfn_;
@ -63,23 +86,6 @@ void zmq::thread_t::stop ()
errno_assert (rc == 0);
}
void *zmq::thread_t::thread_routine (void *arg_)
{
#if !defined ZMQ_HAVE_OPENVMS
// Following code will guarantee more predictable latecnies as it'll
// disallow any signal handling in the I/O thread.
sigset_t signal_set;
int rc = sigfillset (&signal_set);
errno_assert (rc == 0);
rc = pthread_sigmask (SIG_BLOCK, &signal_set, NULL);
errno_assert (rc == 0);
#endif
thread_t *self = (thread_t*) arg_;
self->tfn (self->arg);
return NULL;
}
#endif

10
src/thread.hpp
View File

@ -54,20 +54,20 @@ namespace zmq
// Waits for thread termination.
void stop ();
// These are internal members. They should be private, however then
// they would not be accessible from the main C routine of the thread.
thread_fn *tfn;
void *arg;
private:
#ifdef ZMQ_HAVE_WINDOWS
static unsigned int __stdcall thread_routine (void *arg_);
HANDLE descriptor;
#else
static void *thread_routine (void *arg_);
pthread_t descriptor;
#endif
thread_fn *tfn;
void *arg;
thread_t (const thread_t&);
void operator = (const thread_t&);
};

19
tests/test_shutdown_stress.cpp
View File

@ -24,18 +24,21 @@
#define THREAD_COUNT 100
void *worker (void *s)
extern "C"
{
int rc;
static void *worker (void *s)
{
int rc;
rc = zmq_connect (s, "tcp://127.0.0.1:5555");
assert (rc == 0);
rc = zmq_connect (s, "tcp://127.0.0.1:5555");
assert (rc == 0);
// Start closing the socket while the connecting process is underway.
rc = zmq_close (s);
assert (rc == 0);
// Start closing the socket while the connecting process is underway.
rc = zmq_close (s);
assert (rc == 0);
return NULL;
return NULL;
}
}
int main (int argc, char *argv [])