Commit ef8494c6 authored by Jonathan Jenkins's avatar Jonathan Jenkins

oops, didn't update test program config interface

parent 87cbb32b
......@@ -139,7 +139,7 @@ int load_workload(char *conf_path, int rank)
/* get the workload type out of PARAMS */
configuration_get_value(&config, "PARAMS", "workload_type",
workload_type, MAX_NAME_LENGTH_WKLD);
NULL, workload_type, MAX_NAME_LENGTH_WKLD);
/* set up the workload parameters and load into the workload API */
if (strcmp(workload_type, "darshan_io_workload") == 0)
......@@ -149,8 +149,8 @@ int load_workload(char *conf_path, int rank)
/* get the darshan params from the config file */
configuration_get_value(&config, "PARAMS", "log_file_path",
d_params.log_file_path, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "aggregator_count", aggregator_count, 10);
NULL, d_params.log_file_path, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "aggregator_count", NULL, aggregator_count, 10);
d_params.aggregator_cnt = atol(aggregator_count);
return codes_workload_load(workload_type, (char *)&d_params, rank);
......@@ -162,10 +162,10 @@ int load_workload(char *conf_path, int rank)
/* get the bgp i/o params from the config file */
configuration_get_value(&config, "PARAMS", "io_kernel_meta_path",
b_params.io_kernel_meta_path, MAX_NAME_LENGTH_WKLD);
NULL, b_params.io_kernel_meta_path, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "bgp_config_file",
b_params.bgp_config_file, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "rank_count", rank_count, 10);
NULL, b_params.bgp_config_file, 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);
......@@ -179,8 +179,8 @@ int load_workload(char *conf_path, int rank)
/* get the recorder params from the config file */
configuration_get_value(&config, "PARAMS", "trace_dir_path",
r_params.trace_dir_path, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "nprocs", nprocs, 10);
NULL, r_params.trace_dir_path, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "nprocs", NULL, nprocs, 10);
r_params.nprocs = atol(nprocs);
return codes_workload_load(workload_type, (char *)&r_params, rank);
......
......@@ -41,17 +41,17 @@ void workload_set_params()
configuration_get_lpgroups(&config, "PARAMS", &paramconf);
configuration_get_value(&config, "PARAMS", "workload_type", workload_type, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "workload_type", NULL, workload_type, MAX_NAME_LENGTH_WKLD);
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", io_kernel_meta_path, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "io_kernel_meta_path", NULL, io_kernel_meta_path, MAX_NAME_LENGTH_WKLD);
strcpy(bgparams.io_kernel_meta_path, io_kernel_meta_path);
configuration_get_value(&config, "PARAMS", "bgp_config_file", bgp_config_file, MAX_NAME_LENGTH_WKLD);
configuration_get_value(&config, "PARAMS", "bgp_config_file", NULL, bgp_config_file, MAX_NAME_LENGTH_WKLD);
strcpy(bgparams.bgp_config_file, bgp_config_file);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment