From 4d7b84448b064fe5d89be48d2cde7549968b7f61 Mon Sep 17 00:00:00 2001 From: shikokuchuo <53399081+shikokuchuo@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:57:04 +0000 Subject: [PATCH] use latest nanonext interface --- DESCRIPTION | 4 ++-- NEWS.md | 4 ++-- R/daemon.R | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c675f84a..a568bb54 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: mirai Type: Package Title: Minimalist Async Evaluation Framework for R -Version: 1.3.1.9012 +Version: 1.3.1.9013 Description: Designed for simplicity, a 'mirai' evaluates an R expression asynchronously in a parallel process, locally or distributed over the network, with the result automatically available upon completion. Modern @@ -33,7 +33,7 @@ Encoding: UTF-8 Depends: R (>= 3.6) Imports: - nanonext (>= 1.3.2.9012) + nanonext (>= 1.3.2.9013) Enhances: parallel, promises diff --git a/NEWS.md b/NEWS.md index da4e6a30..718ed7d4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# mirai 1.3.1.9012 (development) +# mirai 1.3.1.9013 (development) #### New Features @@ -10,7 +10,7 @@ * Experimental threaded dispatcher `daemons(dispatcher = "thread")` has been retired (as this was based on the old dispatcher architecture and future development will focus on the current design). Specifying 'dispatcher = thread' is defunct, but will point to 'dispatcher = process' for the time being. * `daemon()` '...' argument had been moved up to prevent partial matching on any of the optional arguments. -* Requires `nanonext` >= [1.3.2.9012]. +* Requires `nanonext` >= [1.3.2.9013]. # mirai 1.3.1 diff --git a/R/daemon.R b/R/daemon.R index 057332e3..31b7c940 100644 --- a/R/daemon.R +++ b/R/daemon.R @@ -137,7 +137,7 @@ daemon <- function(url, ..., dispatcher = FALSE, asyncdial = FALSE, autoexit = T aio <- recv_aio(sock, mode = 1L, cv = cv) wait(cv) || break m <- collect_aio(aio) - cancel <- recv_aio(sock, mode = 8L) + cancel <- recv_aio(sock, mode = 8L, cv = NA) data <- eval_mirai(m) stop_aio(cancel) send(sock, data, mode = 1L, block = TRUE)