Commit d37d59ab authored by Jonathan Jenkins's avatar Jonathan Jenkins

refactor iolang-specfic stuff out of codes-workload.h

parent 40a3950d
......@@ -18,7 +18,6 @@
typedef struct iolang_params iolang_params;
typedef struct darshan_params darshan_params;
typedef struct recorder_params recorder_params;
typedef struct codes_workload_info codes_workload_info;
/* struct to hold the actual data from a single MPI event*/
typedef struct scala_trace_params scala_trace_params;
......@@ -49,15 +48,6 @@ struct recorder_params
};
struct codes_workload_info
{
int group_id; /* group id */
int min_rank; /* minimum rank in the collective operation */
int max_rank; /* maximum rank in the collective operation */
int local_rank; /* local rank? never being used in the bg/p model */
int num_lrank; /* number of ranks participating in the collective operation*/
};
struct scala_trace_params {
char offset_file_name[MAX_NAME_LENGTH_WKLD];
char nw_wrkld_file_name[MAX_NAME_LENGTH_WKLD];
......
......@@ -112,7 +112,7 @@ static int convertKLInstToEvent(int inst)
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)
iolang_workload_info * task_info, int use_relpath)
{
int foundit = 0;
char line[CK_LINE_LIMIT];
......@@ -299,7 +299,7 @@ int codes_kernel_helper_parse_input(CodesIOKernel_pstate * ps, CodesIOKernelCont
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)
iolang_workload_info * task_info, codeslang_inst * next_event)
{
int t = CL_NOOP;
int ret = 0;
......
......@@ -24,6 +24,17 @@
#define CL_INST_MAX_ARGS 10
struct iolang_workload_info
{
int group_id; /* group id */
int min_rank; /* minimum rank in the collective operation */
int max_rank; /* maximum rank in the collective operation */
int local_rank; /* local rank? never being used in the bg/p model */
int num_lrank; /* number of ranks participating in the collective operation*/
};
typedef struct iolang_workload_info iolang_workload_info;
enum cl_event_t
{
CL_GETSIZE=1,
......@@ -63,7 +74,7 @@ int codes_kernel_helper_parse_input(CodesIOKernel_pstate * ps,
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,
CodesIOKernel_pstate ** ps, iolang_workload_info * task_info,
codeslang_inst * next_event);
char * code_kernel_helpers_cleventToStr(int inst);
......
......@@ -51,7 +51,7 @@ struct codes_iolang_wrkld_state_per_rank
CodesIOKernel_pstate * codes_pstate;
codeslang_inst next_event;
struct qhash_head hash_link;
codes_workload_info task_info;
iolang_workload_info task_info;
};
/* loads the workload file for each simulated MPI rank/ compute node LP */
......
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