generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-06 21:56:25 +01:00
Code Issues Projects Releases Wiki Activity

Problem: ZMQ_PRE_ALLOCATED_FD is too long

Browse Source 
Solution: rename socket option (and variables and files) from
pre_allocated_fd to usefd.
This commit is contained in:
Luca Boccassi
2016-02-08 22:40:20 +00:00
parent 66d9a5f5ae
commit c158178798
13 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ipc_listener.cpp
View File

@@ -158,7 +158,7 @@ int zmq::ipc_listener_t::set_address (const char *addr_)
// MUST NOT unlink if the FD is managed by the user, or it will stop
// working after the first client connects. The user will take care of
// cleaning up the file after the service is stopped.
if (options.pre_allocated_fd == -1) {
if (options.usefd == -1) {
::unlink (addr.c_str());
}
filename.clear ();
@@ -171,8 +171,8 @@ int zmq::ipc_listener_t::set_address (const char *addr_)
address.to_string (endpoint);
if (options.pre_allocated_fd != -1) {
s = options.pre_allocated_fd;
if (options.usefd != -1) {
s = options.usefd;
} else {
// Create a listening socket.
s = open_socket (AF_UNIX, SOCK_STREAM, 0);
@@ -216,7 +216,7 @@ int zmq::ipc_listener_t::close ()
// MUST NOT unlink if the FD is managed by the user, or it will stop
// working after the first client connects. The user will take care of
// cleaning up the file after the service is stopped.
if (has_file && !filename.empty () && options.pre_allocated_fd == -1) {
if (has_file && !filename.empty () && options.usefd == -1) {
rc = ::unlink(filename.c_str ());
if (rc != 0) {
socket->event_close_failed (endpoint, zmq_errno());