ncd: modules: don't use NCDModuleProcess_Init(); use _InitValue() or _InitId() instead, to pass through ID-strings

ncd/modules/call.c

@@ -64,12 +64,12 @@
  */
 
 #include <stdlib.h>
-#include <string.h>
 
 #include <misc/string_begins_with.h>
 #include <misc/offset.h>
 #include <structure/LinkedList0.h>
 #include <ncd/NCDModule.h>
+#include <ncd/value_utils.h>
 
 #include <generated/blog_channel_ncd_call.h>
 
@@ -194,14 +194,13 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         ModuleLog(o->i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(template_name_arg) || !NCDVal_IsList(args_arg)) {
+    if (!NCDVal_IsString(template_name_arg) || !NCDVal_IsList(args_arg)) {
         ModuleLog(o->i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
-    const char *template_name = NCDVal_StringValue(template_name_arg);
     
     // calling none?
-    if (!strcmp(template_name, "<none>")) {
+    if (ncd_is_none(template_name_arg)) {
         // signal up
         NCDModuleInst_Backend_Up(o->i);
         
@@ -220,7 +219,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         }
         
         // create process
-        if (!NCDModuleProcess_Init(&o->process, o->i, template_name, args, o, (NCDModuleProcess_handler_event)process_handler_event)) {
+        if (!NCDModuleProcess_InitValue(&o->process, o->i, template_name_arg, args, o, (NCDModuleProcess_handler_event)process_handler_event)) {
             ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
             NCDValMem_Free(&o->args_mem);
             goto fail0;

ncd/modules/foreach.c

@@ -94,7 +94,7 @@ struct element;
 
 struct instance {
     NCDModuleInst *i;
-    const char *template_name;
+    NCDValRef template_name;
     NCDValRef args;
     NCD_string_id_t name1;
     NCD_string_id_t name2;
@@ -271,7 +271,7 @@ static void advance (struct instance *o)
     struct element *e = &o->elems[o->gp];
     
     // init process
-    if (!NCDModuleProcess_Init(&e->process, o->i, o->template_name, o->args, e, (NCDModuleProcess_handler_event)element_process_handler_event)) {
+    if (!NCDModuleProcess_InitValue(&e->process, o->i, o->template_name, o->args, e, (NCDModuleProcess_handler_event)element_process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail;
     }
@@ -483,10 +483,10 @@ static int element_map_val_object_func_getvar (struct element *e, NCD_string_id_
     return 1;
 }
 
-static void func_new_common (void *vo, NCDModuleInst *i, NCDValRef collection, const char *template_name, NCDValRef args, NCD_string_id_t name1, NCD_string_id_t name2)
+static void func_new_common (void *vo, NCDModuleInst *i, NCDValRef collection, NCDValRef template_name, NCDValRef args, NCD_string_id_t name1, NCD_string_id_t name2)
 {
     ASSERT(!NCDVal_IsInvalid(collection))
-    ASSERT(template_name)
+    ASSERT(NCDVal_IsString(template_name))
     ASSERT(NCDVal_IsInvalid(args) || NCDVal_IsList(args))
     ASSERT(name1 >= 0)
     
@@ -581,12 +581,11 @@ static void func_new_foreach (void *vo, NCDModuleInst *i, const struct NCDModule
         ModuleLog(i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(arg_template) || !NCDVal_IsList(arg_args)) {
+    if (!NCDVal_IsString(arg_template) || !NCDVal_IsList(arg_args)) {
         ModuleLog(i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
     
-    const char *template_name = NCDVal_StringValue(arg_template);
     NCD_string_id_t name1;
     NCD_string_id_t name2;
     
@@ -604,7 +603,7 @@ static void func_new_foreach (void *vo, NCDModuleInst *i, const struct NCDModule
             goto fail0;
     }
     
-    func_new_common(vo, i, arg_collection, template_name, arg_args, name1, name2);
+    func_new_common(vo, i, arg_collection, arg_template, arg_args, name1, name2);
     return;
     
 fail0:
@@ -623,12 +622,11 @@ static void func_new_foreach_emb (void *vo, NCDModuleInst *i, const struct NCDMo
         ModuleLog(i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(arg_template) || !NCDVal_IsStringNoNulls(arg_name1) || (!NCDVal_IsInvalid(arg_name2) && !NCDVal_IsStringNoNulls(arg_name2))) {
+    if (!NCDVal_IsString(arg_template) || !NCDVal_IsStringNoNulls(arg_name1) || (!NCDVal_IsInvalid(arg_name2) && !NCDVal_IsStringNoNulls(arg_name2))) {
         ModuleLog(i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
     
-    const char *template_name = NCDVal_StringValue(arg_template);
     const char *name1_str = NCDVal_StringValue(arg_name1);
     const char *name2_str = (NCDVal_IsInvalid(arg_name2) ? NULL : NCDVal_StringValue(arg_name2));
     
@@ -644,7 +642,7 @@ static void func_new_foreach_emb (void *vo, NCDModuleInst *i, const struct NCDMo
         goto fail0;
     }
     
-    func_new_common(vo, i, arg_collection, template_name, NCDVal_NewInvalid(), name1, name2);
+    func_new_common(vo, i, arg_collection, arg_template, NCDVal_NewInvalid(), name1, name2);
     return;
     
 fail0:

ncd/modules/imperative.c

@@ -68,7 +68,7 @@
 
 struct instance {
     NCDModuleInst *i;
-    const char *deinit_template;
+    NCDValRef deinit_template;
     NCDValRef deinit_args;
     BTimer deinit_timer;
     NCDModuleProcess process;
@@ -76,7 +76,7 @@ struct instance {
     int dying;
 };
 
-static int start_process (struct instance *o, const char *templ, NCDValRef args, NCDModuleProcess_handler_event handler);
+static int start_process (struct instance *o, NCDValRef template_name, NCDValRef args, NCDModuleProcess_handler_event handler);
 static void go_deinit (struct instance *o);
 static void init_process_handler_event (struct instance *o, int event);
 static void deinit_process_handler_event (struct instance *o, int event);
@@ -91,12 +91,13 @@ static struct NCD_string_request strings[] = {
     {"_caller"}, {NULL}
 };
 
-static int start_process (struct instance *o, const char *templ, NCDValRef args, NCDModuleProcess_handler_event handler)
+static int start_process (struct instance *o, NCDValRef template_name, NCDValRef args, NCDModuleProcess_handler_event handler)
 {
+    ASSERT(NCDVal_IsString(template_name))
     ASSERT(NCDVal_IsList(args))
     
     // create process
-    if (!NCDModuleProcess_Init(&o->process, o->i, templ, args, o, handler)) {
+    if (!NCDModuleProcess_InitValue(&o->process, o->i, template_name, args, o, handler)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         return 0;
     }
@@ -111,7 +112,7 @@ static void go_deinit (struct instance *o)
     ASSERT(o->dying)
     
     // deinit is no-op?
-    if (!strcmp(o->deinit_template, "<none>")) {
+    if (ncd_is_none(o->deinit_template)) {
         instance_free(o);
         return;
     }
@@ -244,14 +245,14 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         ModuleLog(i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(init_template_arg) || !NCDVal_IsList(init_args)  ||
-        !NCDVal_IsStringNoNulls(deinit_template_arg) || !NCDVal_IsList(o->deinit_args) ||
+    if (!NCDVal_IsString(init_template_arg) || !NCDVal_IsList(init_args)  ||
+        !NCDVal_IsString(deinit_template_arg) || !NCDVal_IsList(o->deinit_args) ||
         !NCDVal_IsString(deinit_timeout_arg)) {
         ModuleLog(i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
-    const char *init_template = NCDVal_StringValue(init_template_arg);
-    o->deinit_template = NCDVal_StringValue(deinit_template_arg);
+    
+    o->deinit_template = deinit_template_arg;
     
     // read timeout
     uintmax_t timeout;
@@ -263,7 +264,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
     // init timer
     BTimer_Init(&o->deinit_timer, timeout, (BTimer_handler)deinit_timer_handler, o);
     
-    if (!strcmp(init_template, "<none>")) {
+    if (ncd_is_none(init_template_arg)) {
         // signal up
         NCDModuleInst_Backend_Up(i);
         
@@ -271,7 +272,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         o->state = STATE_UP;
     } else {
         // start init process
-        if (!start_process(o, init_template, init_args, (NCDModuleProcess_handler_event)init_process_handler_event)) {
+        if (!start_process(o, init_template_arg, init_args, (NCDModuleProcess_handler_event)init_process_handler_event)) {
             goto fail0;
         }
         

ncd/modules/ondemand.c

@@ -66,7 +66,7 @@
 
 struct ondemand {
     NCDModuleInst *i;
-    const char *template_name;
+    NCDValRef template_name;
     NCDValRef args;
     LinkedList1 demands_list;
     int dying;
@@ -94,7 +94,7 @@ static int ondemand_start_process (struct ondemand *o)
     ASSERT(!o->have_process)
     
     // start process
-    if (!NCDModuleProcess_Init(&o->process, o->i, o->template_name, o->args, o, (NCDModuleProcess_handler_event)ondemand_process_handler)) {
+    if (!NCDModuleProcess_InitValue(&o->process, o->i, o->template_name, o->args, o, (NCDModuleProcess_handler_event)ondemand_process_handler)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail0;
     }
@@ -220,11 +220,11 @@ static void ondemand_func_new (void *vo, NCDModuleInst *i, const struct NCDModul
         ModuleLog(i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(arg_template_name) || !NCDVal_IsList(arg_args)) {
+    if (!NCDVal_IsString(arg_template_name) || !NCDVal_IsList(arg_args)) {
         ModuleLog(i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
-    o->template_name = NCDVal_StringValue(arg_template_name);
+    o->template_name = arg_template_name;
     o->args = arg_args;
     
     // init demands list

ncd/modules/process_manager.c

@@ -77,7 +77,7 @@ struct process {
     BTimer retry_timer;
     LinkedList1Node processes_list_node;
     int have_params;
-    char *params_template_name;
+    NCD_string_id_t params_template_name;
     NCDValMem params_mem;
     NCDValRef params_args;
     int have_module_process;
@@ -88,16 +88,16 @@ struct process {
 };
 
 static struct process * find_process (struct instance *o, const char *name);
-static int process_new (struct instance *o, const char *name, const char *template_name, NCDValRef args);
+static int process_new (struct instance *o, const char *name, NCDValRef template_name, NCDValRef args);
 static void process_free (struct process *p);
 static void process_retry_timer_handler (struct process *p);
 static void process_module_process_handler_event (struct process *p, int event);
 static int process_module_process_func_getspecialobj (struct process *p, NCD_string_id_t name, NCDObject *out_object);
 static int process_module_process_caller_obj_func_getobj (struct process *p, NCD_string_id_t name, NCDObject *out_object);
 static void process_stop (struct process *p);
-static int process_restart (struct process *p, const char *template_name, NCDValRef args);
+static int process_restart (struct process *p, NCDValRef template_name, NCDValRef args);
 static void process_try (struct process *p);
-static int process_set_params (struct process *p, const char *template_name, NCDValMem mem, NCDValSafeRef args);
+static int process_set_params (struct process *p, NCDValRef template_name, NCDValMem mem, NCDValSafeRef args);
 static void instance_free (struct instance *o);
 
 enum {STRING_CALLER};
@@ -120,10 +120,11 @@ struct process * find_process (struct instance *o, const char *name)
     return NULL;
 }
 
-int process_new (struct instance *o, const char *name, const char *template_name, NCDValRef args)
+int process_new (struct instance *o, const char *name, NCDValRef template_name, NCDValRef args)
 {
     ASSERT(!o->dying)
     ASSERT(!find_process(o, name))
+    ASSERT(NCDVal_IsString(template_name))
     ASSERT(NCDVal_IsList(args))
     
     // allocate structure
@@ -191,7 +192,6 @@ void process_free (struct process *p)
     // free params
     if (p->have_params) {
         NCDValMem_Free(&p->params_mem);
-        free(p->params_template_name);
     }
     
     // remove from processes list
@@ -314,7 +314,6 @@ void process_stop (struct process *p)
             
             // free params
             NCDValMem_Free(&p->params_mem);
-            free(p->params_template_name);
             p->have_params = 0;
             
             // set state
@@ -329,12 +328,13 @@ void process_stop (struct process *p)
     }
 }
 
-int process_restart (struct process *p, const char *template_name, NCDValRef args)
+int process_restart (struct process *p, NCDValRef template_name, NCDValRef args)
 {
     struct instance *o = p->manager;
     ASSERT(!o->dying)
     ASSERT(p->state == PROCESS_STATE_STOPPING)
     ASSERT(!p->have_params)
+    ASSERT(NCDVal_IsString(template_name))
     ASSERT(NCDVal_IsList(args))
     
     // copy arguments
@@ -375,7 +375,7 @@ void process_try (struct process *p)
     p->process_args = NCDVal_Moved(&p->process_mem, p->params_args);
     
     // init module process
-    if (!NCDModuleProcess_Init(&p->module_process, o->i, p->params_template_name, p->process_args, p, (NCDModuleProcess_handler_event)process_module_process_handler_event)) {
+    if (!NCDModuleProcess_InitId(&p->module_process, o->i, p->params_template_name, p->process_args, p, (NCDModuleProcess_handler_event)process_module_process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         
         // set timer
@@ -390,7 +390,6 @@ void process_try (struct process *p)
     NCDModuleProcess_SetSpecialFuncs(&p->module_process, (NCDModuleProcess_func_getspecialobj)process_module_process_func_getspecialobj);
     
     // free params
-    free(p->params_template_name);
     p->have_params = 0;
     
     // set have module process
@@ -400,14 +399,16 @@ void process_try (struct process *p)
     p->state = PROCESS_STATE_RUNNING;
 }
 
-int process_set_params (struct process *p, const char *template_name, NCDValMem mem, NCDValSafeRef args)
+int process_set_params (struct process *p, NCDValRef template_name, NCDValMem mem, NCDValSafeRef args)
 {
     ASSERT(!p->have_params)
+    ASSERT(NCDVal_IsString(template_name))
     ASSERT(NCDVal_IsList(NCDVal_FromSafe(&mem, args)))
     
-    // copy template name
-    if (!(p->params_template_name = strdup(template_name))) {
-        ModuleLog(p->manager->i, BLOG_ERROR, "strdup failed");
+    // get string ID for template name
+    p->params_template_name = NCDStringIndex_GetBin(p->manager->i->params->iparams->string_index, NCDVal_StringValue(template_name), NCDVal_StringLength(template_name));
+    if (p->params_template_name < 0) {
+        ModuleLog(p->manager->i, BLOG_ERROR, "NCDStringIndex_GetBin failed");
         return 0;
     }
     
@@ -488,13 +489,12 @@ static void start_func_new (void *unused, NCDModuleInst *i, const struct NCDModu
         ModuleLog(i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(name_arg) || !NCDVal_IsStringNoNulls(template_name_arg) ||
+    if (!NCDVal_IsStringNoNulls(name_arg) || !NCDVal_IsString(template_name_arg) ||
         !NCDVal_IsList(args_arg)) {
         ModuleLog(i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
     const char *name = NCDVal_StringValue(name_arg);
-    const char *template_name = NCDVal_StringValue(template_name_arg);
     
     // signal up.
     // Do it before creating the process so that the process starts initializing before our own process continues.
@@ -511,12 +511,12 @@ static void start_func_new (void *unused, NCDModuleInst *i, const struct NCDModu
             ModuleLog(i, BLOG_INFO, "process %s already started", name);
         } else {
             if (p) {
-                if (!process_restart(p, template_name, args_arg)) {
+                if (!process_restart(p, template_name_arg, args_arg)) {
                     ModuleLog(i, BLOG_ERROR, "failed to restart process %s", name);
                     goto fail0;
                 }
             } else {
-                if (!process_new(mo, name, template_name, args_arg)) {
+                if (!process_new(mo, name, template_name_arg, args_arg)) {
                     ModuleLog(i, BLOG_ERROR, "failed to create process %s", name);
                     goto fail0;
                 }

ncd/modules/spawn.c

@@ -220,7 +220,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         ModuleLog(o->i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(template_name_arg) || !NCDVal_IsList(args_arg)) {
+    if (!NCDVal_IsString(template_name_arg) || !NCDVal_IsList(args_arg)) {
         ModuleLog(o->i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
@@ -230,7 +230,7 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
     NCDModuleInst_Backend_Up(o->i);
     
     // create process
-    if (!NCDModuleProcess_Init(&o->process, o->i, NCDVal_StringValue(template_name_arg), args_arg, o, (NCDModuleProcess_handler_event)process_handler_event)) {
+    if (!NCDModuleProcess_InitValue(&o->process, o->i, template_name_arg, args_arg, o, (NCDModuleProcess_handler_event)process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail0;
     }

ncd/modules/sys_request_client.c

@@ -122,8 +122,8 @@ struct instance {
 
 struct request_instance {
     NCDModuleInst *i;
-    const char *reply_handler;
-    const char *finished_handler;
+    NCDValRef reply_handler;
+    NCDValRef finished_handler;
     NCDValRef args;
     struct instance *client;
     NCDRequestClientRequest request;
@@ -430,7 +430,7 @@ static int request_init_reply_process (struct request_instance *o, NCDValMem rep
     o->process_reply_data = NCDVal_FromSafe(&o->process_reply_mem, reply_data);
     
     // init process
-    if (!NCDModuleProcess_Init(&o->process, o->i, o->reply_handler, o->args, o, (NCDModuleProcess_handler_event)request_process_handler_event)) {
+    if (!NCDModuleProcess_InitValue(&o->process, o->i, o->reply_handler, o->args, o, (NCDModuleProcess_handler_event)request_process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail0;
     }
@@ -454,7 +454,7 @@ static int request_init_finished_process (struct request_instance *o)
     o->process_is_finished = 1;
     
     // init process
-    if (!NCDModuleProcess_Init(&o->process, o->i, o->finished_handler, o->args, o, (NCDModuleProcess_handler_event)request_process_handler_event)) {
+    if (!NCDModuleProcess_InitValue(&o->process, o->i, o->finished_handler, o->args, o, (NCDModuleProcess_handler_event)request_process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail0;
     }
@@ -612,14 +612,14 @@ static void request_func_new (void *vo, NCDModuleInst *i, const struct NCDModule
         ModuleLog(o->i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(reply_handler_arg) || !NCDVal_IsStringNoNulls(finished_handler_arg) ||
+    if (!NCDVal_IsString(reply_handler_arg) || !NCDVal_IsString(finished_handler_arg) ||
         !NCDVal_IsList(args_arg)
     ) {
         ModuleLog(o->i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
-    o->reply_handler = NCDVal_StringValue(reply_handler_arg);
-    o->finished_handler = NCDVal_StringValue(finished_handler_arg);
+    o->reply_handler = reply_handler_arg;
+    o->finished_handler = finished_handler_arg;
     o->args = args_arg;
     
     // get client

ncd/modules/sys_request_server.c

@@ -104,7 +104,7 @@
 struct instance {
     NCDModuleInst *i;
     const char *unix_socket_path;
-    const char *request_handler_template;
+    NCDValRef request_handler_template;
     NCDValRef args;
     BListener listener;
     LinkedList0 connections_list;
@@ -394,7 +394,7 @@ static int request_init (struct connection *c, uint32_t request_id, const uint8_
         goto fail1;
     }
     
-    if (!NCDModuleProcess_Init(&r->process, o->i, o->request_handler_template, o->args, r, (NCDModuleProcess_handler_event)request_process_handler_event)) {
+    if (!NCDModuleProcess_InitValue(&r->process, o->i, o->request_handler_template, o->args, r, (NCDModuleProcess_handler_event)request_process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail3;
     }
@@ -746,11 +746,11 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         ModuleLog(o->i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(request_handler_template_arg) || !NCDVal_IsList(args_arg)) {
+    if (!NCDVal_IsString(request_handler_template_arg) || !NCDVal_IsList(args_arg)) {
         ModuleLog(o->i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
-    o->request_handler_template = NCDVal_StringValue(request_handler_template_arg);
+    o->request_handler_template = request_handler_template_arg;
     o->args = args_arg;
     
     // init listener

ncd/modules/try.c

@@ -174,14 +174,13 @@ static void func_new (void *vo, NCDModuleInst *i, const struct NCDModuleInst_new
         ModuleLog(o->i, BLOG_ERROR, "wrong arity");
         goto fail0;
     }
-    if (!NCDVal_IsStringNoNulls(template_name_arg) || !NCDVal_IsList(args_arg)) {
+    if (!NCDVal_IsString(template_name_arg) || !NCDVal_IsList(args_arg)) {
         ModuleLog(o->i, BLOG_ERROR, "wrong type");
         goto fail0;
     }
-    const char *template_name = NCDVal_StringValue(template_name_arg);
     
     // start process
-    if (!NCDModuleProcess_Init(&o->process, i, template_name, args_arg, o, (NCDModuleProcess_handler_event)process_handler_event)) {
+    if (!NCDModuleProcess_InitValue(&o->process, i, template_name_arg, args_arg, o, (NCDModuleProcess_handler_event)process_handler_event)) {
         ModuleLog(o->i, BLOG_ERROR, "NCDModuleProcess_Init failed");
         goto fail0;
     }