Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
a26bb743
Commit
a26bb743
authored
Feb 01, 2016
by
Constantin Rack
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: docs are still referring to deprecated `zmq_term`
Solution: Replace with `zmq_ctx_term`
parent
589464ce
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
15 additions
and
15 deletions
+15
-15
test_fork.cpp
builds/zos/test_fork.cpp
+1
-1
zmq_close.txt
doc/zmq_close.txt
+3
-3
zmq_ctx_set.txt
doc/zmq_ctx_set.txt
+1
-1
zmq_disconnect.txt
doc/zmq_disconnect.txt
+2
-2
zmq_getsockopt.txt
doc/zmq_getsockopt.txt
+3
-3
zmq_init.txt
doc/zmq_init.txt
+1
-1
zmq_setsockopt.txt
doc/zmq_setsockopt.txt
+4
-4
No files found.
builds/zos/test_fork.cpp
View file @
a26bb743
...
@@ -52,7 +52,7 @@ int main (void)
...
@@ -52,7 +52,7 @@ int main (void)
// Child process
// Child process
// Immediately close parent sockets and context
// Immediately close parent sockets and context
zmq_close
(
pull
);
zmq_close
(
pull
);
zmq_term
(
ctx
);
zmq_
ctx_
term
(
ctx
);
// Create new context, socket, connect and send some messages
// Create new context, socket, connect and send some messages
void
*
child_ctx
=
zmq_ctx_new
();
void
*
child_ctx
=
zmq_ctx_new
();
...
...
doc/zmq_close.txt
View file @
a26bb743
...
@@ -22,8 +22,8 @@ not yet physically transferred to the network depends on the value of the
...
@@ -22,8 +22,8 @@ not yet physically transferred to the network depends on the value of the
_ZMQ_LINGER_ socket option for the specified 'socket'.
_ZMQ_LINGER_ socket option for the specified 'socket'.
NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
this behaviour may cause the application to block when calling _zmq_term()_.
this behaviour may cause the application to block when calling _zmq_
ctx_
term()_.
For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_term[3].
For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_
ctx_
term[3].
RETURN VALUE
RETURN VALUE
...
@@ -41,7 +41,7 @@ The provided 'socket' was invalid.
...
@@ -41,7 +41,7 @@ The provided 'socket' was invalid.
SEE ALSO
SEE ALSO
--------
--------
linkzmq:zmq_socket[3]
linkzmq:zmq_socket[3]
linkzmq:zmq_term[3]
linkzmq:zmq_
ctx_
term[3]
linkzmq:zmq_setsockopt[3]
linkzmq:zmq_setsockopt[3]
linkzmq:zmq[7]
linkzmq:zmq[7]
...
...
doc/zmq_ctx_set.txt
View file @
a26bb743
...
@@ -30,7 +30,7 @@ applications receive termination messages, and then terminate the context
...
@@ -30,7 +30,7 @@ applications receive termination messages, and then terminate the context
with 'ZMQ_LINGER' set to zero on all sockets. This setting is an easier way
with 'ZMQ_LINGER' set to zero on all sockets. This setting is an easier way
to get the same result. When 'ZMQ_BLOCKY' is set to false, all new sockets
to get the same result. When 'ZMQ_BLOCKY' is set to false, all new sockets
are given a linger timeout of zero. You must still close all sockets before
are given a linger timeout of zero. You must still close all sockets before
calling zmq_term.
calling zmq_
ctx_
term.
[horizontal]
[horizontal]
Default value:: true (old behavior)
Default value:: true (old behavior)
...
...
doc/zmq_disconnect.txt
View file @
a26bb743
...
@@ -25,8 +25,8 @@ _ZMQ_LINGER_ socket option for the specified 'socket'.
...
@@ -25,8 +25,8 @@ _ZMQ_LINGER_ socket option for the specified 'socket'.
The 'endpoint' argument is as described in linkzmq:zmq_connect[3]
The 'endpoint' argument is as described in linkzmq:zmq_connect[3]
NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
NOTE: The default setting of _ZMQ_LINGER_ does not discard unsent messages;
this behaviour may cause the application to block when calling _zmq_term()_.
this behaviour may cause the application to block when calling _zmq_
ctx_
term()_.
For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_term[3].
For details refer to linkzmq:zmq_setsockopt[3] and linkzmq:zmq_
ctx_
term[3].
RETURN VALUE
RETURN VALUE
...
...
doc/zmq_getsockopt.txt
View file @
a26bb743
...
@@ -349,12 +349,12 @@ The 'ZMQ_LINGER' option shall retrieve the linger period for the specified
...
@@ -349,12 +349,12 @@ The 'ZMQ_LINGER' option shall retrieve the linger period for the specified
'socket'. The linger period determines how long pending messages which have
'socket'. The linger period determines how long pending messages which have
yet to be sent to a peer shall linger in memory after a socket is closed with
yet to be sent to a peer shall linger in memory after a socket is closed with
linkzmq:zmq_close[3], and further affects the termination of the socket's
linkzmq:zmq_close[3], and further affects the termination of the socket's
context with linkzmq:zmq_term[3]. The following outlines the different
context with linkzmq:zmq_
ctx_
term[3]. The following outlines the different
behaviours:
behaviours:
* The default value of '-1' specifies an infinite linger period. Pending
* The default value of '-1' specifies an infinite linger period. Pending
messages shall not be discarded after a call to _zmq_close()_; attempting to
messages shall not be discarded after a call to _zmq_close()_; attempting to
terminate the socket's context with _zmq_term()_ shall block until all
terminate the socket's context with _zmq_
ctx_
term()_ shall block until all
pending messages have been sent to a peer.
pending messages have been sent to a peer.
* The value of '0' specifies no linger period. Pending messages shall be
* The value of '0' specifies no linger period. Pending messages shall be
...
@@ -362,7 +362,7 @@ behaviours:
...
@@ -362,7 +362,7 @@ behaviours:
* Positive values specify an upper bound for the linger period in milliseconds.
* Positive values specify an upper bound for the linger period in milliseconds.
Pending messages shall not be discarded after a call to _zmq_close()_;
Pending messages shall not be discarded after a call to _zmq_close()_;
attempting to terminate the socket's context with _zmq_term()_ shall block
attempting to terminate the socket's context with _zmq_
ctx_
term()_ shall block
until either all pending messages have been sent to a peer, or the linger
until either all pending messages have been sent to a peer, or the linger
period expires, after which any pending messages shall be discarded.
period expires, after which any pending messages shall be discarded.
...
...
doc/zmq_init.txt
View file @
a26bb743
...
@@ -43,7 +43,7 @@ An invalid number of 'io_threads' was requested.
...
@@ -43,7 +43,7 @@ An invalid number of 'io_threads' was requested.
SEE ALSO
SEE ALSO
--------
--------
linkzmq:zmq[7]
linkzmq:zmq[7]
linkzmq:zmq_term[3]
linkzmq:zmq_
ctx_
term[3]
AUTHORS
AUTHORS
...
...
doc/zmq_setsockopt.txt
View file @
a26bb743
...
@@ -385,12 +385,12 @@ The 'ZMQ_LINGER' option shall set the linger period for the specified 'socket'.
...
@@ -385,12 +385,12 @@ The 'ZMQ_LINGER' option shall set the linger period for the specified 'socket'.
The linger period determines how long pending messages which have yet to be
The linger period determines how long pending messages which have yet to be
sent to a peer shall linger in memory after a socket is disconnected with
sent to a peer shall linger in memory after a socket is disconnected with
linkzmq:zmq_disconnect[3] or closed with linkzmq:zmq_close[3], and further
linkzmq:zmq_disconnect[3] or closed with linkzmq:zmq_close[3], and further
affects the termination of the socket's context with linkzmq:zmq_
term[3]. The
affects the termination of the socket's context with linkzmq:zmq_
ctx_term[3].
following outlines the different behaviours:
The
following outlines the different behaviours:
* A value of '-1' specifies an infinite linger period. Pending
* A value of '-1' specifies an infinite linger period. Pending
messages shall not be discarded after a call to _zmq_disconnect()_ or
messages shall not be discarded after a call to _zmq_disconnect()_ or
_zmq_close()_; attempting to terminate the socket's context with _zmq_term()_
_zmq_close()_; attempting to terminate the socket's context with _zmq_
ctx_
term()_
shall block until all pending messages have been sent to a peer.
shall block until all pending messages have been sent to a peer.
* The value of '0' specifies no linger period. Pending messages shall be
* The value of '0' specifies no linger period. Pending messages shall be
...
@@ -398,7 +398,7 @@ following outlines the different behaviours:
...
@@ -398,7 +398,7 @@ following outlines the different behaviours:
* Positive values specify an upper bound for the linger period in milliseconds.
* Positive values specify an upper bound for the linger period in milliseconds.
Pending messages shall not be discarded after a call to _zmq_disconnect()_ or
Pending messages shall not be discarded after a call to _zmq_disconnect()_ or
_zmq_close()_; attempting to terminate the socket's context with _zmq_term()_
_zmq_close()_; attempting to terminate the socket's context with _zmq_
ctx_
term()_
shall block until either all pending messages have been sent to a peer, or the
shall block until either all pending messages have been sent to a peer, or the
linger period expires, after which any pending messages shall be discarded.
linger period expires, after which any pending messages shall be discarded.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment