BUG FIX: Use correct future registry name

Author: HenrikBengtsson

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.2-9959
+Version: 0.12.2-9961
 Depends:
     R (>= 3.2.0),
     parallelly,

R/BatchtoolsFutureBackend-class.R

@@ -1066,8 +1066,7 @@ stopWorkers.BatchtoolsFutureBackend <- function(backend, ...) {
     on.exit(mdebugf_pop())
   }
 
-  reg <- backend[["reg"]]
-  futures <- FutureRegistry(reg, action = "list", earlySignal = FALSE)
+  futures <- FutureRegistry(backend[["reg"]], action = "list", earlySignal = FALSE)
 
   ## Nothing to do?
   if (length(futures) == 0L) return(backend)
@@ -1082,7 +1081,7 @@ stopWorkers.BatchtoolsFutureBackend <- function(backend, ...) {
   futures <- lapply(futures, FUN = cancel, interrupt = TRUE)
 
   ## Erase registry
-  futures <- FutureRegistry(reg, action = "reset")
+  futures <- FutureRegistry(backend[["reg"]], action = "reset")
 
   backend
 }

R/nbrOfWorkers.R

@@ -112,8 +112,7 @@ nbrOfFreeWorkers.BatchtoolsMultiprocessFutureBackend <- function(evaluator, back
   ## Special case: Infinite number of workers
   if (is.infinite(workers)) return(workers)
 
-  reg <- backend[["reg"]]
-  usedWorkers <- length(FutureRegistry(reg, action = "list"))
+  usedWorkers <- length(FutureRegistry(backend[["reg"]], action = "list"))
 
   workers <- workers - usedWorkers
   stop_if_not(length(workers) == 1L, !is.na(workers), workers >= 0L)

R/waitForWorker.R

@@ -34,15 +34,15 @@ unregisterFuture.BatchtoolsUniprocessFuture <- function(future, ...) NULL
 
 #' @export
 registerFuture.BatchtoolsFuture <- function(future, ...) {
-  freg <- sprintf("workers-%s", class(future)[1])
-  FutureRegistry(freg, action = "add", future = future, earlySignal = FALSE, ...)
+  backend <- future[["backend"]]
+  FutureRegistry(backend[["reg"]], action = "add", future = future, earlySignal = FALSE, ...)
 }
 
 
 #' @export
 unregisterFuture.BatchtoolsFuture <- function(future, ...) {
-  freg <- sprintf("workers-%s", class(future)[1])
-  FutureRegistry(freg, action = "remove", future = future, ...)
+  backend <- future[["backend"]]
+  try(FutureRegistry(backend[["reg"]], action = "remove", future = future, ...), silent = TRUE)
 }
 
 
@@ -73,16 +73,16 @@ waitForWorker.BatchtoolsFuture <- function(future,
   stop_if_not(length(timeout) == 1, is.finite(timeout), timeout >= 0)
   stop_if_not(length(alpha) == 1, is.finite(alpha), alpha > 0)
 
-  freg <- sprintf("workers-%s", class(future)[1])
+  backend <- future[["backend"]]
 
   ## Use a default await() function?
   if (is.null(await)) {
-    await <- function() FutureRegistry(freg, action = "collect-first")
+    await <- function() FutureRegistry(backend[["reg"]], action = "collect-first")
   }  
 
   ## Number of occupied workers
   usedWorkers <- function() {
-    length(FutureRegistry(freg, action = "list", earlySignal = FALSE))
+    length(FutureRegistry(backend[["reg"]], action = "list", earlySignal = FALSE))
   }
 
   t0 <- Sys.time()