Skip to content

Commit b58294e

Browse files
committed
fixes until()
1 parent 4240feb commit b58294e

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: nanonext
22
Type: Package
33
Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
4-
Version: 0.8.1.9026
4+
Version: 0.8.1.9027
55
Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is
66
a socket library providing high-performance scalability protocols, a
77
cross-platform standard for messaging and communications. Serves as a

NEWS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# nanonext 0.8.1.9026
1+
# nanonext 0.8.1.9027
22

33
#### New Features
44

@@ -8,7 +8,8 @@
88

99
* `context()` gains the argument 'verify' with a default of TRUE. This adds additional protection to notably the `request()` and `request_signal()` functions when using timeouts, as these require a connection to be present.
1010
* Sending and hashing of language objects and symbols is now possible after fixes to serialisation.
11-
* Removes `msg_pipe()` and `'weakref<-'()` introduced in the last release to maintain simplicity of user interface.
11+
* `until()` now works as intended.
12+
* Removes recently-introduced `msg_pipe()` and `'weakref<-'()` to maintain simplicity of user interface.
1213
* Internal performance enhancements.
1314

1415
# nanonext 0.8.1

R/context.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ reply <- function(context,
161161
#' @param data an object (if send_mode = 'raw', a vector).
162162
#' @param timeout [default NULL] integer value in milliseconds or NULL, which
163163
#' applies a socket-specific default, usually the same as no timeout. The
164-
#' context must be verified - created with \code{context(verify = TRUE)}, or
165-
#' else this value will be ignored.
164+
#' context must have created with \code{context(verify = TRUE)}, or else
165+
#' this value will be ignored.
166166
#'
167167
#' @return A 'recvAio' (object of class 'recvAio') (invisibly).
168168
#'

man/request.Rd

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/aio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1411,8 +1411,8 @@ SEXP rnng_cv_until(SEXP cvar, SEXP msec) {
14111411
nng_mtx_lock(mtx);
14121412
while (ncv->condition == 0) {
14131413
if (nng_cv_until(cv, time) == NNG_ETIMEDOUT) break;
1414-
ncv->condition--;
14151414
}
1415+
if (ncv->condition > 0) ncv->condition--;
14161416
nng_mtx_unlock(mtx);
14171417

14181418
return ncv->flag ? Rf_ScalarLogical(0) : Rf_ScalarLogical(1);

0 commit comments

Comments
 (0)