Skip to content

Commit c414346

Browse files
committed
Add startx to rpc_rr_example to allow a virtual X11 for plotting
1 parent a4265e4 commit c414346

19 files changed

+54
-46
lines changed

DESCRIPTION

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: pbdRPC
22
Version: 0.2-0
3-
Date: 2017-01-01
3+
Date: 2017-07-15
44
Title: Programming with Big Data -- Remote Procedure Call
55
Authors@R: c(person("Wei-Chen", "Chen", role = c("aut", "cre"), email =
66
"[email protected]"), person("Drew", "Schmidt", role="ctb"))
@@ -18,6 +18,6 @@ URL: http://r-pbd.org/
1818
BugReports: http://group.r-pbd.org/
1919
MailingList: Please send questions and comments regarding pbdR to
2020
21-
RoxygenNote: 5.0.1
21+
RoxygenNote: 6.0.1
2222
NeedsCompilation: yes
2323
Maintainer: Wei-Chen Chen <[email protected]>

NAMESPACE

+1
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ export(srpc)
2323
export(ssh)
2424
export(start_cs)
2525
export(start_rr)
26+
export(startx_rr)
2627
export(tunnel)
2728
importFrom(tools,pskill)

R/111_control.r

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#'
1414
# #' @param unix,macos,windows
1515
#'
16-
#' @param check,kill,start,preload
16+
#' @param check,kill,start,startx,preload
1717
#' RPC remoter commands used by \code{\link{check_rr}()},
1818
#' \code{\link{kill_rr}()}, or \code{\link{start_rr}()}.
1919
#' RPC pbdCS commands used by \code{\link{check_cs}()},
@@ -106,12 +106,14 @@ RPC.RR <- function(
106106
check = "ps ax|grep '[r]emoter::server'",
107107
kill = "kill -9 $(ps ax|grep '[r]emoter::server'|awk '{print $1}')",
108108
start = "nohup Rscript -e 'remoter::server()' > .rrlog 2>&1 < /dev/null &",
109+
startx = "nohup xvfb-run Rscript -e 'remoter::server()' > .rrlog 2>&1 < /dev/null &",
109110
preload = "source ~/work-my/00_set_devel_R; "
110111
){
111112
list(
112113
check = check,
113114
kill = kill,
114115
start = start,
116+
startx = startx,
115117
preload = preload
116118
)
117119
}

R/rpc_rr_example.r

+16
Original file line numberDiff line numberDiff line change
@@ -116,3 +116,19 @@ start_rr <- function(machine, cmd = .pbd_env$RPC.RR$start,
116116

117117
invisible(ret)
118118
}
119+
120+
121+
#' @rdname rpc_rr_example
122+
#' @export
123+
startx_rr <- function(machine, cmd = .pbd_env$RPC.RR$startx,
124+
preload = .pbd_env$RPC.RR$preload)
125+
{
126+
check.is.machine(machine)
127+
128+
cmd.all <- paste0(preload, cmd)
129+
ret <- suppressWarnings(
130+
rpc(cmd = cmd.all, machine = machine)
131+
)
132+
133+
invisible(ret)
134+
}

man/a0_b_control.Rd

+4-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/a0_c_options.Rd

+4-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/find_plink.Rd

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/machine.Rd

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/pbdRPC-package.Rd

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/print-machine.Rd

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/rpc.Rd

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/rpc_cs_example.Rd

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/rpc_options.Rd

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/rpc_pid.Rd

+2-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/rpc_rr_example.Rd

+5-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/srpc.Rd

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/ssh_plink.Rd

+3-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/tunnel.Rd

+4-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/zz_rpc_control.Rd

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)