Commit a48b6125 authored by Shane Snyder's avatar Shane Snyder

Forgotten darshan workload generator changes

parent dc03a9c7
......@@ -173,9 +173,9 @@ static int darshan_io_workload_load(const char *params, int rank)
else
break;
//assert(next_file.counters[CP_POSIX_OPENS] == 0);
//assert(next_file.counters[CP_POSIX_READS] == 0);
//assert(next_file.counters[CP_POSIX_WRITES] == 0);
assert(next_file.counters[CP_POSIX_OPENS] == 0);
assert(next_file.counters[CP_POSIX_READS] == 0);
assert(next_file.counters[CP_POSIX_WRITES] == 0);
}
if (ret < 0)
return -1;
......@@ -522,7 +522,7 @@ void generate_psx_coll_file_events(
int64_t coll_io_ops_this_cycle;
int64_t rank_cnt;
int create_flag = 0;
double cur_time = 0.0;//file->fcounters[CP_F_OPEN_TIMESTAMP];
double cur_time = file->fcounters[CP_F_OPEN_TIMESTAMP];
double total_delay;
double first_io_delay = 0.0;
double close_delay = 0.0;
......@@ -553,7 +553,7 @@ void generate_psx_coll_file_events(
total_coll_opens = file->counters[CP_COLL_OPENS];
total_ind_opens = file->counters[CP_POSIX_OPENS] - total_coll_opens - extra_opens;
total_ind_io_ops = 0;//file->counters[CP_INDEP_READS] + file->counters[CP_INDEP_WRITES];
total_ind_io_ops = file->counters[CP_INDEP_READS] + file->counters[CP_INDEP_WRITES];
total_coll_io_ops = (file->counters[CP_COLL_READS] + file->counters[CP_COLL_WRITES]) / nprocs;
if (file->counters[CP_COLL_OPENS])
......@@ -631,8 +631,8 @@ void generate_psx_coll_file_events(
*/
if (extra_opens && !(i % (open_cycles / extra_opens)))
{
//cur_time = generate_psx_open_event(file, create_flag, meta_op_time, cur_time,
// io_context, (io_context->my_rank == 0));
cur_time = generate_psx_open_event(file, create_flag, meta_op_time, cur_time,
io_context, (io_context->my_rank == 0));
create_flag = 0;
if (!file->counters[CP_COLL_OPENS] && !file->counters[CP_INDEP_OPENS])
......@@ -642,8 +642,8 @@ void generate_psx_coll_file_events(
extra_io_ops--;
}
//cur_time = generate_psx_close_event(file, meta_op_time, cur_time, io_context,
// (io_context->my_rank == 0));
cur_time = generate_psx_close_event(file, meta_op_time, cur_time, io_context,
(io_context->my_rank == 0));
file->counters[CP_POSIX_OPENS]--;
}
......@@ -685,10 +685,10 @@ void generate_psx_coll_file_events(
cur_time = generate_barrier_event(file, 0, cur_time, io_context);
cur_time = generate_psx_open_event(file, /*create_flag */1, meta_op_time,
cur_time = generate_psx_open_event(file, create_flag, meta_op_time,
cur_time, io_context, 1);
//cur_time += first_io_delay;
cur_time += first_io_delay;
if (file->counters[CP_INDEP_OPENS])
ind_io_ops_this_cycle = 0;
......@@ -705,7 +705,7 @@ void generate_psx_coll_file_events(
total_ind_io_ops -= ind_io_ops_this_cycle;
total_coll_io_ops -= coll_io_ops_this_cycle;
//cur_time += close_delay;
cur_time += close_delay;
cur_time = generate_psx_close_event(file, meta_op_time, cur_time, io_context, 1);
......@@ -1048,8 +1048,8 @@ static double generate_psx_coll_io_events(
{
darshan_insert_next_io_op(io_context->io_op_dat, &next_io_op);
cur_time = next_io_op.end_time;
//if (coll_io_ops_this_cycle || (ind_ops_remaining > nprocs))
// cur_time += inter_io_delay;
if (coll_io_ops_this_cycle || (ind_ops_remaining > nprocs))
cur_time += inter_io_delay;
}
ind_ops_remaining--;
......@@ -1148,8 +1148,8 @@ static double generate_psx_coll_io_events(
assert(file->counters[CP_POSIX_WRITES] >= 0);
}
//if (i != (total_io_ops_this_cycle - 1))
// cur_time += inter_io_delay;
if (i != (total_io_ops_this_cycle - 1))
cur_time += inter_io_delay;
}
io_ops_this_rw--;
......
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