parse new cluster manager worker arugments

Author: jakebolewski

base/client.jl

@@ -247,7 +247,13 @@ let reqarg = Set(UTF8String["--home",          "-H",
                 exit(0)
             end
             # startup worker
-            if bool(opts.worker)
+            if opts.worker != C_NULL
+                w = bytestring(opts.worker)
+                if w != "custom"
+                    println(STDERR, "julia: unknown worker argument `$w`")
+                    exit(1)
+                end
+            else
                 start_worker() # does not return
             end
             # load file immediately on all processors

base/options.jl

@@ -27,7 +27,7 @@ immutable JLOptions
     depwarn::Int8
     can_inline::Int8
     fast_math::Int8
-    worker::Int8
+    worker::Ptr{Cchar}
     bindto::Ptr{Cchar}
 end
 

examples/clustermanager/simple/UnixDomainCM.jl

@@ -9,7 +9,7 @@ function launch(manager::UnixDomainCM, params::Dict, launched::Array, c::Conditi
     for i in 1:manager.np
         sockname = tempname()
         try
-            cmd = `$(params[:exename]) --worker custom $(@__FILE__) worker $sockname`
+            cmd = `$(params[:exename]) --worker=custom $(@__FILE__) worker $sockname`
             io, pobj = open (cmd, "r")
 
             wconfig = WorkerConfig()

src/init.c

@@ -111,7 +111,7 @@ jl_options_t jl_options = { 0,    // version
                             1,    // depwarn
                             1,    // can_inline
                             JL_OPTIONS_FAST_MATH_DEFAULT,
-                            0,    // worker
+                            NULL, // worker
                             NULL, // bindto
 };
 

src/julia.h

@@ -1425,7 +1425,7 @@ typedef struct {
     int8_t depwarn;
     int8_t can_inline;
     int8_t fast_math;
-    int8_t worker;
+    const char *worker;
     const char *bindto;
 } jl_options_t;
 

ui/repl.c

@@ -133,7 +133,7 @@ void parse_opts(int *argcp, char ***argvp)
         { "math-mode",       required_argument, 0, opt_math_mode },
         // hidden command line options
         { "build",           required_argument, 0, 'b' },
-        { "worker",          no_argument,       0, opt_worker },
+        { "worker",          optional_argument, 0, opt_worker },
         { "bind-to",         required_argument, 0, opt_bind_to },
         { "lisp",            no_argument,       &lisp_prompt, 1 },
         { 0, 0, 0, 0 }
@@ -323,14 +323,17 @@ void parse_opts(int *argcp, char ***argvp)
             else {
                 jl_errorf("julia: invalid argument to --math-mode (%s)\n", optarg);
             }
-	    break;
+            break;
         case 'b': // build
             jl_options.build_path = strdup(optarg);
             if (!imagepathspecified)
                 jl_options.image_file = NULL;
             break;
         case opt_worker:
-            jl_options.worker = 1;
+            if (optarg != NULL)
+                jl_options.worker = strdup(optarg);
+            else
+                jl_options.worker = NULL;
             break;
         case opt_bind_to:
             jl_options.bindto = strdup(optarg);