simplify cv_reset()

Author: shikokuchuo

R/sync.R

@@ -48,9 +48,9 @@
 #' @section Condition:
 #'
 #'     The condition internal to this 'conditionVariable' maintains a state
-#'     (counter). Each signal increments the counter by 1. Each time
+#'     (value). Each signal increments the value by 1. Each time
 #'     \code{wait} or \code{until} returns (apart from due to timeout), the
-#'     counter is decremented by 1.
+#'     value is decremented by 1.
 #'
 #'     The internal condition may be inspected at any time using \code{cv_value}
 #'     and reset to zero using \code{cv_reset}. This affords a high degree of
@@ -118,19 +118,15 @@ cv_value <- function(cv) .Call(rnng_cv_value, cv)
 
 #' Condition Variables - Reset
 #'
-#' \code{cv_reset} resets the internal value and/or flag of a condition variable.
-#'
-#' @param condition [default TRUE] logical value whether to reset the
-#'     condition (counter) to zero.
-#' @param flag [default TRUE] logical value whether to reset the flag.
+#' \code{cv_reset} resets the internal value and flag of a condition variable.
 #'
 #' @examples
 #' cv_reset(cv)
 #'
 #' @rdname cv
 #' @export
 #'
-cv_reset <- function(cv, condition = TRUE, flag = TRUE) invisible(.Call(rnng_cv_reset, cv, condition, flag))
+cv_reset <- function(cv) invisible(.Call(rnng_cv_reset, cv))
 
 #' Pipe Notify
 #'

README.Rmd

@@ -326,7 +326,7 @@ As the R interpreter runs on a single thread, synchronisation primitives such as
 
 The events that can be signalled include asynchronous receive completions, and pipe events - these are when connections are established or when they are dropped.
 
-Condition variables can be used simply to record such events, or more powerfully, to wait upon these events. The condition variables implemented in {nanonext} include a both a condition (counter) and flag (binary). Each signal increments the counter, and each return of `wait()` or `until()` decrements the counter. A non-zero condition allows waiting threads to continue.
+Condition variables can be used simply to record such events, or more powerfully, to wait upon these events. The condition variables implemented in {nanonext} include a both a condition (value) and flag (binary). Each signal increments the value, and each return of `wait()` or `until()` decrements the value. A non-zero condition allows waiting threads to continue.
 
 In any situation where polling for an event presents a solution, waiting upon a condition to be signalled can be more efficient, both in terms of consuming no resources while waiting, and also being synchronised with the event (having no latency).
 

README.md

@@ -367,7 +367,7 @@ aio
 #> < recvAio >
 #>  - $data for message data
 aio$data |> str()
-#>  num [1:100000000] 0.4905 -0.6613 0.4074 -0.7236 -0.0115 ...
+#>  num [1:100000000] -1.959 0.507 0.83 -0.458 0.844 ...
 ```
 
 As `call_aio()` is blocking and will wait for completion, an alternative
@@ -408,10 +408,10 @@ established or when they are dropped.
 
 Condition variables can be used simply to record such events, or more
 powerfully, to wait upon these events. The condition variables
-implemented in {nanonext} include a both a condition (counter) and flag
-(binary). Each signal increments the counter, and each return of
-`wait()` or `until()` decrements the counter. A non-zero condition
-allows waiting threads to continue.
+implemented in {nanonext} include a both a condition (value) and flag
+(binary). Each signal increments the value, and each return of `wait()`
+or `until()` decrements the value. A non-zero condition allows waiting
+threads to continue.
 
 In any situation where polling for an event presents a solution, waiting
 upon a condition to be signalled can be more efficient, both in terms of
@@ -651,11 +651,11 @@ ncurl("https://httpbin.org/headers")
 #>   [1] 7b 0a 20 20 22 68 65 61 64 65 72 73 22 3a 20 7b 0a 20 20 20 20 22 48 6f 73
 #>  [26] 74 22 3a 20 22 68 74 74 70 62 69 6e 2e 6f 72 67 22 2c 20 0a 20 20 20 20 22
 #>  [51] 58 2d 41 6d 7a 6e 2d 54 72 61 63 65 2d 49 64 22 3a 20 22 52 6f 6f 74 3d 31
-#>  [76] 2d 36 34 31 62 36 64 30 30 2d 31 38 35 65 66 31 64 65 37 31 34 31 34 65 33
-#> [101] 34 35 63 64 63 35 34 35 37 22 0a 20 20 7d 0a 7d 0a
+#>  [76] 2d 36 34 31 64 34 64 36 63 2d 34 65 62 61 38 36 65 66 37 62 34 35 64 37 65
+#> [101] 36 36 30 30 65 33 62 31 30 22 0a 20 20 7d 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-641b6d00-185ef1de71414e345cdc5457\"\n  }\n}\n"
+#> [1] "{\n  \"headers\": {\n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-641d4d6c-4eba86ef7b45d7e6600e3b10\"\n  }\n}\n"
 ```
 
 For advanced use, supports additional HTTP methods such as POST or PUT.
@@ -676,13 +676,13 @@ res
 
 call_aio(res)$headers
 #> $Date
-#> [1] "Wed, 22 Mar 2023 21:02:56 GMT"
+#> [1] "Fri, 24 Mar 2023 07:12:44 GMT"
 #> 
 #> $Server
 #> [1] "gunicorn/19.9.0"
 
 res$data
-#> [1] "{\n  \"args\": {}, \n  \"data\": \"{\\\"key\\\": \\\"value\\\"}\", \n  \"files\": {}, \n  \"form\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Length\": \"16\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-641b6d00-4e94393a5393f2d4210c7334\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"131.111.5.14\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
+#> [1] "{\n  \"args\": {}, \n  \"data\": \"{\\\"key\\\": \\\"value\\\"}\", \n  \"files\": {}, \n  \"form\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Length\": \"16\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-641d4d6c-4ff4b2e17fd2884123ae75b1\"\n  }, \n  \"json\": {\n    \"key\": \"value\"\n  }, \n  \"origin\": \"131.111.5.14\", \n  \"url\": \"http://httpbin.org/post\"\n}\n"
 ```
 
 In this respect, it may be used as a performant and lightweight method
@@ -708,7 +708,7 @@ transact(sess)
 #> 
 #> $headers
 #> $headers$date
-#> [1] "Wed, 22 Mar 2023 21:02:57 GMT"
+#> [1] "Fri, 24 Mar 2023 07:12:45 GMT"
 #> 
 #> 
 #> $raw
@@ -718,15 +718,15 @@ transact(sess)
 #>  [76] 22 43 6f 6e 74 65 6e 74 2d 54 79 70 65 22 3a 20 22 61 70 70 6c 69 63 61 74
 #> [101] 69 6f 6e 2f 6a 73 6f 6e 22 2c 20 0a 20 20 20 20 22 48 6f 73 74 22 3a 20 22
 #> [126] 68 74 74 70 62 69 6e 2e 6f 72 67 22 2c 20 0a 20 20 20 20 22 58 2d 41 6d 7a
-#> [151] 6e 2d 54 72 61 63 65 2d 49 64 22 3a 20 22 52 6f 6f 74 3d 31 2d 36 34 31 62
-#> [176] 36 64 30 31 2d 34 37 38 35 65 30 31 62 33 31 61 34 61 61 31 65 32 61 64 33
-#> [201] 39 65 64 65 22 0a 20 20 7d 2c 20 0a 20 20 22 6f 72 69 67 69 6e 22 3a 20 22
+#> [151] 6e 2d 54 72 61 63 65 2d 49 64 22 3a 20 22 52 6f 6f 74 3d 31 2d 36 34 31 64
+#> [176] 34 64 36 64 2d 37 33 32 39 61 30 35 61 36 65 34 35 38 31 33 37 36 35 36 36
+#> [201] 37 38 37 34 22 0a 20 20 7d 2c 20 0a 20 20 22 6f 72 69 67 69 6e 22 3a 20 22
 #> [226] 31 38 35 2e 32 32 35 2e 34 35 2e 34 39 22 2c 20 0a 20 20 22 75 72 6c 22 3a
 #> [251] 20 22 68 74 74 70 73 3a 2f 2f 68 74 74 70 62 69 6e 2e 6f 72 67 2f 67 65 74
 #> [276] 22 0a 7d 0a
 #> 
 #> $data
-#> [1] "{\n  \"args\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-641b6d01-4785e01b31a4aa1e2ad39ede\"\n  }, \n  \"origin\": \"131.111.5.14\", \n  \"url\": \"https://httpbin.org/get\"\n}\n"
+#> [1] "{\n  \"args\": {}, \n  \"headers\": {\n    \"Authorization\": \"Bearer APIKEY\", \n    \"Content-Type\": \"application/json\", \n    \"Host\": \"httpbin.org\", \n    \"X-Amzn-Trace-Id\": \"Root=1-641d4d6d-7329a05a6e45813765667874\"\n  }, \n  \"origin\": \"131.111.5.14\", \n  \"url\": \"https://httpbin.org/get\"\n}\n"
 ```
 
 [« Back to ToC](#table-of-contents)

man/cv.Rd

@@ -1477,19 +1477,17 @@ SEXP rnng_cv_until(SEXP cvar, SEXP msec) {
 
 }
 
-SEXP rnng_cv_reset(SEXP cvar, SEXP condition, SEXP flag) {
+SEXP rnng_cv_reset(SEXP cvar) {
 
   if (R_ExternalPtrTag(cvar) != nano_CvSymbol)
     Rf_error("'cv' is not a valid Condition Variable");
 
   nano_cv *ncv = (nano_cv *) R_ExternalPtrAddr(cvar);
   nng_mtx *mtx = ncv->mtx;
-  const int cond = LOGICAL(condition)[0];
-  const int flg = LOGICAL(flag)[0];
 
   nng_mtx_lock(mtx);
-  ncv->flag = flg ? 0 : ncv->flag;
-  ncv->condition = cond ? 0 : ncv->condition;
+  ncv->flag = 0;
+  ncv->condition = 0;
   nng_mtx_unlock(mtx);
 
   return R_NilValue;

src/aio.c

@@ -139,7 +139,7 @@ static const R_CallMethodDef callMethods[] = {
   {"rnng_cv_alloc", (DL_FUNC) &rnng_cv_alloc, 0},
   {"rnng_cv_recv_aio", (DL_FUNC) &rnng_cv_recv_aio, 7},
   {"rnng_cv_request", (DL_FUNC) &rnng_cv_request, 8},
-  {"rnng_cv_reset", (DL_FUNC) &rnng_cv_reset, 3},
+  {"rnng_cv_reset", (DL_FUNC) &rnng_cv_reset, 1},
   {"rnng_cv_until", (DL_FUNC) &rnng_cv_until, 2},
   {"rnng_cv_value", (DL_FUNC) &rnng_cv_value, 1},
   {"rnng_cv_wait", (DL_FUNC) &rnng_cv_wait, 1},

src/init.c

@@ -132,7 +132,7 @@ extern SEXP rnng_ctx_open(SEXP);
 extern SEXP rnng_cv_alloc(void);
 extern SEXP rnng_cv_recv_aio(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
 extern SEXP rnng_cv_request(SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP, SEXP);
-extern SEXP rnng_cv_reset(SEXP, SEXP, SEXP);
+extern SEXP rnng_cv_reset(SEXP);
 extern SEXP rnng_cv_until(SEXP, SEXP);
 extern SEXP rnng_cv_value(SEXP);
 extern SEXP rnng_cv_wait(SEXP);