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

Problem: syntax error on Windows related to socket descriptor type

Browse Source 
Solution: use proper fd_t type, and also define and use a zmq_fd_t in the API
This commit is contained in:
Simon Giesecke 2019-05-09 07:21:08 -04:00
parent d3f52b2b91
commit 63c4d8be78
5 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
include/zmq.h
View File

@ -685,14 +685,16 @@ ZMQ_EXPORT const char *zmq_msg_group (zmq_msg_t *msg);
#define ZMQ_HAVE_POLLER #define ZMQ_HAVE_POLLER
#if defined _WIN32
typedef SOCKET zmq_fd_t;
#else
typedef int zmq_fd_t;
#endif
typedef struct zmq_poller_event_t typedef struct zmq_poller_event_t
{ {
void *socket; void *socket;
#if defined _WIN32 zmq_fd_t fd;
SOCKET fd;
#else
int fd;
#endif
void *user_data; void *user_data;
short events; short events;
} zmq_poller_event_t; } zmq_poller_event_t;
@ -709,19 +711,12 @@ ZMQ_EXPORT int zmq_poller_wait_all (void *poller,
zmq_poller_event_t *events, zmq_poller_event_t *events,
int n_events, int n_events,
long timeout); long timeout);
ZMQ_EXPORT int zmq_poller_fd (void *poller); ZMQ_EXPORT zmq_fd_t zmq_poller_fd (void *poller);
#if defined _WIN32
ZMQ_EXPORT int ZMQ_EXPORT int
zmq_poller_add_fd (void *poller, SOCKET fd, void *user_data, short events); zmq_poller_add_fd (void *poller, zmq_fd_t fd, void *user_data, short events);
ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, SOCKET fd, short events); ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, zmq_fd_t fd, short events);
ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, SOCKET fd); ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, zmq_fd_t fd);
#else
ZMQ_EXPORT int
zmq_poller_add_fd (void *poller, int fd, void *user_data, short events);
ZMQ_EXPORT int zmq_poller_modify_fd (void *poller, int fd, short events);
ZMQ_EXPORT int zmq_poller_remove_fd (void *poller, int fd);
#endif
ZMQ_EXPORT int zmq_socket_get_peer_state (void *socket, ZMQ_EXPORT int zmq_socket_get_peer_state (void *socket,
const void *routing_id, const void *routing_id,

2
src/socket_poller.cpp
View File

@ -86,7 +86,7 @@ bool zmq::socket_poller_t::check_tag ()
return _tag == 0xCAFEBABE; return _tag == 0xCAFEBABE;
} }
int zmq::socket_poller_t::signaler_fd () zmq::fd_t zmq::socket_poller_t::signaler_fd ()
{ {
if (_signaler) { if (_signaler) {
return _signaler->get_fd (); return _signaler->get_fd ();

2
src/socket_poller.hpp
View File

@ -76,7 +76,7 @@ class socket_poller_t
int modify_fd (fd_t fd_, short events_); int modify_fd (fd_t fd_, short events_);
int remove_fd (fd_t fd_); int remove_fd (fd_t fd_);
// Returns the signaler's fd if there is one, otherwise errors. // Returns the signaler's fd if there is one, otherwise errors.
int signaler_fd (); fd_t signaler_fd ();
int wait (event_t *event_, int n_events_, long timeout_); int wait (event_t *event_, int n_events_, long timeout_);

2
src/zmq.cpp
View File

@ -1278,7 +1278,7 @@ int zmq_poller_wait_all (void *poller_,
return rc; return rc;
} }
int zmq_poller_fd (void *poller_) zmq_fd_t zmq_poller_fd (void *poller_)
{ {
if (!poller_ if (!poller_
|| !(static_cast<zmq::socket_poller_t *> (poller_)->check_tag ())) { || !(static_cast<zmq::socket_poller_t *> (poller_)->check_tag ())) {

26
src/zmq_draft.h
View File

@ -80,14 +80,16 @@ const char *zmq_msg_group (zmq_msg_t *msg_);
/* Poller polling on sockets,fd and thread-safe sockets */ /* Poller polling on sockets,fd and thread-safe sockets */
/******************************************************************************/ /******************************************************************************/
#if defined _WIN32
typedef SOCKET zmq_fd_t;
#else
typedef int zmq_fd_t;
#endif
typedef struct zmq_poller_event_t typedef struct zmq_poller_event_t
{ {
void *socket; void *socket;
#if defined _WIN32 zmq_fd_t fd;
SOCKET fd;
#else
int fd;
#endif
void *user_data; void *user_data;
short events; short events;
} zmq_poller_event_t; } zmq_poller_event_t;
@ -105,20 +107,14 @@ int zmq_poller_wait_all (void *poller_,
zmq_poller_event_t *events_, zmq_poller_event_t *events_,
int n_events_, int n_events_,
long timeout_); long timeout_);
int zmq_poller_fd (void *poller_); zmq_fd_t zmq_poller_fd (void *poller_);
#if defined _WIN32
int zmq_poller_add_fd (void *poller_, int zmq_poller_add_fd (void *poller_,
SOCKET fd_, zmq_fd_t fd_,
void *user_data_, void *user_data_,
short events_); short events_);
int zmq_poller_modify_fd (void *poller_, SOCKET fd_, short events_); int zmq_poller_modify_fd (void *poller_, zmq_fd_t fd_, short events_);
int zmq_poller_remove_fd (void *poller_, SOCKET fd_); int zmq_poller_remove_fd (void *poller_, zmq_fd_t fd_);
#else
int zmq_poller_add_fd (void *poller, int fd, void *user_data, short events);
int zmq_poller_modify_fd (void *poller, int fd, short events);
int zmq_poller_remove_fd (void *poller, int fd);
#endif
int zmq_socket_get_peer_state (void *socket_, int zmq_socket_get_peer_state (void *socket_,
const void *routing_id_, const void *routing_id_,