use send_eval also on Rcpp level

Author: mschubert

R/pool.r

@@ -90,20 +90,20 @@ Pool = R6::R6Class("Pool",
         send_eval = function(cmd, ...) {
             pcall = quote(substitute(cmd))
             cmd = as.expression(do.call(substitute, list(eval(pcall), env=list(...))))
-            invisible(private$master$send(cmd))
+            invisible(private$master$send_eval(cmd))
         },
         send = function(cmd, ...) {
             .Deprecated("send_eval")
             pcall = quote(substitute(cmd))
             cmd = as.expression(do.call(substitute, list(eval(pcall), env=list(...))))
-            invisible(private$master$send(cmd))
+            invisible(private$master$send_eval(cmd))
         },
         send_shutdown = function() {
             private$master$send_shutdown()
         },
         send_wait = function(wait=50) {
             .Deprecated("send_eval")
-            self$send(Sys.sleep(wait/1000), wait=wait)
+            self$send_eval(Sys.sleep(wait/1000), wait=wait)
         },
 
         recv = function(timeout=-1L) {

src/CMQMaster.cpp

@@ -9,7 +9,7 @@ RCPP_MODULE(cmq_master) {
         .method("listen", &CMQMaster::listen)
         .method("close", &CMQMaster::close)
         .method("recv", &CMQMaster::recv)
-        .method("send", &CMQMaster::send)
+        .method("send_eval", &CMQMaster::send_eval)
         .method("send_shutdown", &CMQMaster::send_shutdown)
         .method("proxy_submit_cmd", &CMQMaster::proxy_submit_cmd)
         .method("add_env", &CMQMaster::add_env)

src/CMQMaster.h

@@ -111,7 +111,7 @@ class CMQMaster {
         return msg2r(std::move(msgs[data_offset]), true);
     }
 
-    int send(SEXP cmd) {
+    int send_eval(SEXP cmd) {
         auto &w = check_current_worker(wlife_t::active);
         auto add_to_worker = set_difference(env_names, w.env);
         auto mp = init_multipart(w, wlife_t::active);

tests/testthat/test-2-worker.r

@@ -29,7 +29,7 @@ test_that("worker evaluation", {
     w$connect(addr, 500L)
 
     m$recv(500L)
-    m$send(expression(5 * 2))
+    m$send_eval(expression(5 * 2))
     status = w$process_one()
     result = m$recv(500L)
 
@@ -49,14 +49,14 @@ test_that("export variable to worker", {
 
     m$add_env("x", 3)
     m$recv(500L)
-    m$send(expression(5 + x))
+    m$send_eval(expression(5 + x))
     status = w$process_one()
     result = m$recv(500L)
     expect_true(status)
     expect_equal(result, 8)
 
     m$add_env("x", 5)
-    m$send(expression(5 + x))
+    m$send_eval(expression(5 + x))
     status = w$process_one()
     result = m$recv(500L)
     expect_true(status)
@@ -76,7 +76,7 @@ test_that("load package on worker", {
     m$add_pkg("parallel")
 
     m$recv(500L)
-    m$send(expression(splitIndices(1, 1)[[1]]))
+    m$send_eval(expression(splitIndices(1, 1)[[1]]))
     status = w$process_one()
     result = m$recv(500L)
 
@@ -97,7 +97,7 @@ test_that("errors are sent back to master", {
     w$connect(addr, 500L)
 
     m$recv(500L)
-    m$send(expression(stop("errmsg")))
+    m$send_eval(expression(stop("errmsg")))
     status = w$process_one()
     result = m$recv(500L)
 
@@ -119,7 +119,7 @@ test_that("worker R API", {
 
     p = parallel::mcparallel(worker(addr))
     expect_null(m$recv(5000L))
-    m$send(expression(5 + 1))
+    m$send_eval(expression(5 + 1))
     res = m$recv(500L)
     expect_equal(res[[1]], 6)
 
@@ -140,9 +140,9 @@ test_that("communication with two workers", {
     w2 = parallel::mcparallel(worker(addr))
 
     expect_null(m$recv(5000L)) # worker 1 up
-    m$send(expression({ Sys.sleep(0.5); 5 + 2 }))
+    m$send_eval(expression({ Sys.sleep(0.5); 5 + 2 }))
     expect_null(m$recv(500L)) # worker 2 up
-    m$send(expression({ Sys.sleep(0.5); 3 + 1 }))
+    m$send_eval(expression({ Sys.sleep(0.5); 3 + 1 }))
     r1 = m$recv(1000L)
     m$send_shutdown()
     r2 = m$recv(1000L)

tests/testthat/test-7-ssh_proxy.r

@@ -17,7 +17,7 @@ test_that("simple forwarding works", {
     w$connect(addr2, 500L)
     expect_true(p$process_one())
     expect_null(m$recv(500L)) # worker up
-    m$send(5 + 2)
+    m$send_eval(5 + 2)
     expect_true(p$process_one())
     expect_true(w$process_one())
     expect_true(p$process_one())
@@ -65,7 +65,7 @@ test_that("using the proxy without pool and forward", {
     m$proxy_submit_cmd(list(n_jobs=1), 10000L)
     m$add_pending_workers(1L)
     expect_null(m$recv(2000L)) # worker 1 up
-    m$send(5 + 2)
+    m$send_eval(5 + 2)
     expect_equal(m$recv(500L), 7) # collect results
 
     m$send_shutdown()
@@ -89,9 +89,9 @@ test_that("using the proxy without pool and forward, 2 workers", {
     m$proxy_submit_cmd(list(n_jobs=2), 10000L)
     m$add_pending_workers(2L)
     expect_null(m$recv(2000L)) # worker 1 up
-    m$send({ Sys.sleep(0.5); 5 + 2 })
+    m$send_eval({ Sys.sleep(0.5); 5 + 2 })
     expect_null(m$recv(500L)) # worker 2 up
-    m$send({ Sys.sleep(0.5); 3 + 1 })
+    m$send_eval({ Sys.sleep(0.5); 3 + 1 })
     r1 = m$recv(1000L)
     m$send_shutdown()
     r2 = m$recv(500L)