begone, unused bgp parameters

codes/codes-workload.h

@@ -32,8 +32,8 @@ struct bgp_params
     /* flag - use path to find kernel files relative to the metafile */
     int use_relpath;
     char io_kernel_meta_path[MAX_NAME_LENGTH_WKLD];
+    /* set by config in the metadata path */
     char io_kernel_path[MAX_NAME_LENGTH_WKLD];
-    char io_kernel_def_path[MAX_NAME_LENGTH_WKLD];
 };
 
 struct darshan_params

src/iokernellang/CodesKernelHelpers.c

@@ -110,8 +110,9 @@ static int convertKLInstToEvent(int inst)
     return CL_UNKNOWN;
 }
 
-static void codes_kernel_helper_parse_cf(char * io_kernel_path, char *
-        io_kernel_def_path, char * io_kernel_meta_path, int task_rank, int max_ranks_default, codes_workload_info * task_info, int use_relpath)
+static void codes_kernel_helper_parse_cf(char * io_kernel_path,
+        char * io_kernel_meta_path, int task_rank, int max_ranks_default,
+        codes_workload_info * task_info, int use_relpath)
 {
        int foundit = 0;
        char line[CK_LINE_LIMIT];
@@ -193,18 +194,12 @@ static void codes_kernel_helper_parse_cf(char * io_kernel_path, char *
        fclose(ikmp);
 
        /* if we did not find the config file, set it to the default */
-       if(foundit == 0)
-       {
-               /* default kernel */
-               strcpy(io_kernel_path, io_kernel_def_path);
-
-               /* default gid and task attrs */
-               /* TODO can we detect the gaps instead of -1 */
-               task_info->group_id = CL_DEFAULT_GID;
-               task_info->min_rank = -1;
-               task_info->max_rank = -1;
-               task_info->local_rank = -1;
-               task_info->num_lrank = -1;
+       if(foundit == 0) {
+           fprintf(stderr,
+                   "ERROR: Unable to find iolang workload file "
+                   "from given metadata file %s... exiting\n",
+                   io_kernel_meta_path);
+           exit(1);
        }
 
        return;
@@ -301,11 +296,10 @@ int codes_kernel_helper_parse_input(CodesIOKernel_pstate * ps, CodesIOKernelCont
     return codes_inst;
 }
 
-int codes_kernel_helper_bootstrap(char * io_kernel_path, char *
-        io_kernel_def_path, char * io_kernel_meta_path,
-        int rank, int num_ranks, int use_relpath, CodesIOKernelContext * c,
-        CodesIOKernel_pstate ** ps, codes_workload_info * task_info,
-        codeslang_inst * next_event)
+int codes_kernel_helper_bootstrap(char * io_kernel_path,
+        char * io_kernel_meta_path, int rank, int num_ranks, int use_relpath,
+        CodesIOKernelContext * c, CodesIOKernel_pstate ** ps,
+        codes_workload_info * task_info, codeslang_inst * next_event)
 {
     int t = CL_NOOP;
     int ret = 0;
@@ -316,7 +310,7 @@ int codes_kernel_helper_bootstrap(char * io_kernel_path, char *
 
     temp_group_rank = rank;
     /* get the kernel from the file */
-    codes_kernel_helper_parse_cf(io_kernel_path, io_kernel_def_path,
+    codes_kernel_helper_parse_cf(io_kernel_path,
             io_kernel_meta_path, rank, num_ranks, task_info, use_relpath);
     temp_group_size = task_info->num_lrank;
     /* stat the kernel file */

src/iokernellang/CodesKernelHelpers.h

@@ -61,7 +61,7 @@ typedef struct codeslang_inst
 int codes_kernel_helper_parse_input(CodesIOKernel_pstate * ps,
         CodesIOKernelContext * c, codeslang_inst * inst);
 
-int codes_kernel_helper_bootstrap(char * io_kernel_path, char * def_io_kernel_path,
+int codes_kernel_helper_bootstrap(char * io_kernel_path,
         char * io_kernel_meta_path, int rank, int num_ranks, int use_relpath, CodesIOKernelContext * c,
         CodesIOKernel_pstate ** ps, codes_workload_info * task_info,
         codeslang_inst * next_event);

src/workload/codes-workload-dump.c

@@ -12,7 +12,7 @@
 
 static char type[128] = {'\0'};
 static darshan_params d_params = {"", 0}; 
-static bgp_params b_params = {0, 0, "", "", ""};
+static bgp_params b_params = {0, 0, "", ""};
 static recorder_params r_params = {"", 0};
 static int n = -1;
 

src/workload/methods/codes-bgp-io-wrkld.c

@@ -82,7 +82,6 @@ int bgp_io_workload_load(const char* params, int rank)
     wrkld_per_rank->codes_pstate = CodesIOKernel_pstate_new();
     wrkld_per_rank->rank = rank;
     t = codes_kernel_helper_bootstrap(b_param->io_kernel_path, 
-				      b_param->io_kernel_def_path, 
 				      b_param->io_kernel_meta_path,
         			      rank, 
                           num_ranks,

tests/workload/codes-workload-mpi-replay.c

@@ -161,7 +161,6 @@ int load_workload(char *conf_path, int rank)
                                 NULL, b_params.io_kernel_meta_path, MAX_NAME_LENGTH_WKLD);
         configuration_get_value(&config, "PARAMS", "rank_count", NULL, rank_count, 10);
         strcpy(b_params.io_kernel_path, "");
-        strcpy(b_params.io_kernel_def_path, "");
         b_params.num_cns = atoi(rank_count);
         b_params.use_relpath = 1;
 

tests/workload/codes-workload-test.c

@@ -41,7 +41,6 @@ void workload_set_params()
     if(strcmp(workload_type,"bgp_io_workload") == 0)
     {
         strcpy(bgparams.io_kernel_path,"");
-        strcpy(bgparams.io_kernel_def_path, "");
 	    bgparams.num_cns = NUM_CLIENTS;
 
         configuration_get_value(&config, "PARAMS", "io_kernel_meta_path", NULL, io_kernel_meta_path, MAX_NAME_LENGTH_WKLD);