generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 12:17:39 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3887 from gummif/gfa/unify-fd

Browse Source 
Problem: Multiple fd_t definitions
This commit is contained in:
Luca Boccassi
2020-04-28 13:32:52 +01:00
committed by GitHub
parent 5867d7cf5f d426f2ab0c
commit 1443c0e787
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/fd.hpp
View File

@@ -36,18 +36,15 @@
namespace zmq namespace zmq
{ {
typedef zmq_fd_t fd_t;
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
#if defined _MSC_VER && _MSC_VER <= 1400 #if defined _MSC_VER && _MSC_VER <= 1400
///< \todo zmq.h uses SOCKET unconditionally, so probably VS versions before
/// VS2008 are unsupported anyway. Apart from that, this seems to depend on
/// the Windows SDK version rather than the VS version.
typedef UINT_PTR fd_t;
enum enum
{ {
retired_fd = (fd_t) (~0) retired_fd = (fd_t) (~0)
}; };
#else #else
typedef SOCKET fd_t;
enum enum
#if _MSC_VER >= 1800 #if _MSC_VER >= 1800
: fd_t : fd_t
@@ -57,7 +54,6 @@ enum
}; };
#endif #endif
#else #else
typedef int fd_t;
enum enum
{ {
retired_fd = -1 retired_fd = -1

6
tests/test_poller.cpp
View File

@@ -209,7 +209,7 @@ void test_null_poller_pointers_wait_all_indirect ()
void test_null_poller_pointer_poller_fd () void test_null_poller_pointer_poller_fd ()
{ {
void *null_poller = NULL; void *null_poller = NULL;
zmq_fd_t fd; fd_t fd;
TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_fd (&null_poller, &fd)); TEST_ASSERT_FAILURE_ERRNO (EFAULT, zmq_poller_fd (&null_poller, &fd));
} }
@@ -285,7 +285,7 @@ void test_call_poller_fd_no_signaler ()
TEST_ASSERT_SUCCESS_ERRNO ( TEST_ASSERT_SUCCESS_ERRNO (
zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN)); zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
zmq_fd_t fd; fd_t fd;
TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_poller_fd (poller, &fd)); TEST_ASSERT_FAILURE_ERRNO (EINVAL, zmq_poller_fd (poller, &fd));
TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller)); TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));
@@ -303,7 +303,7 @@ void test_call_poller_fd ()
TEST_ASSERT_SUCCESS_ERRNO ( TEST_ASSERT_SUCCESS_ERRNO (
zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN)); zmq_poller_add (poller, socket, NULL, ZMQ_POLLIN));
zmq_fd_t fd; fd_t fd;
TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_fd (poller, &fd)); TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_fd (poller, &fd));
TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller)); TEST_ASSERT_SUCCESS_ERRNO (zmq_poller_destroy (&poller));

2
tests/test_system.cpp
View File

@@ -85,7 +85,7 @@ void test_max_sockets ()
int count; int count;
for (count = 0; count < MAX_SOCKETS; count++) { for (count = 0; count < MAX_SOCKETS; count++) {
handle[count] = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP); handle[count] = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (handle[count] == -1) { if (handle[count] == retired_fd) {
printf ("W: Only able to create %d sockets on this box\n", count); printf ("W: Only able to create %d sockets on this box\n", count);
const char msg[] = const char msg[] =
"I: Tune your system to increase maximum allowed file handles\n" "I: Tune your system to increase maximum allowed file handles\n"

34
tests/testutil.hpp
View File

@@ -107,26 +107,32 @@ inline const char *as_setsockopt_opt_t (const void *opt)
{ {
return static_cast<const char *> (opt); return static_cast<const char *> (opt);
} }
#if defined _MSC_VER && _MSC_VER <= 1400
typedef UINT_PTR fd_t;
enum
{
retired_fd = (fd_t) (~0)
};
#else
typedef SOCKET fd_t;
enum
{
retired_fd = (fd_t) INVALID_SOCKET
};
#endif
#else #else
typedef size_t socket_size_t; typedef size_t socket_size_t;
inline const void *as_setsockopt_opt_t (const void *opt_) inline const void *as_setsockopt_opt_t (const void *opt_)
{ {
return opt_; return opt_;
} }
typedef int fd_t; #endif
// duplicated from fd.hpp
typedef zmq_fd_t fd_t;
#ifdef ZMQ_HAVE_WINDOWS
#if defined _MSC_VER && _MSC_VER <= 1400
enum
{
retired_fd = (zmq_fd_t) (~0)
};
#else
enum
#if _MSC_VER >= 1800
: zmq_fd_t
#endif
{
retired_fd = INVALID_SOCKET
};
#endif
#else
enum enum
{ {
retired_fd = -1 retired_fd = -1