vitalif
/
mdtest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #108 from hpc/fix-106 

Fix 106
master
Julian Kunkel 2018-10-19 11:06:05 +01:00 committed by GitHub
parent 43259d4fd6 ea3aeea964
commit 52182afed6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/mdtest.c
View File

@ -123,6 +123,7 @@ static uint64_t num_dirs_in_tree;
*/
static uint64_t items;
static uint64_t items_per_dir;
static uint64_t num_dirs_in_tree_calc; /* this is a workaround until the overal code is refactored */
static int directory_loops;
static int print_time;
static int random_seed;
@ -1260,6 +1261,10 @@ void file_test(const int iteration, const int ntasks, const char *path, rank_pro
offset_timers(t, 4);
}
if(num_dirs_in_tree_calc){ /* this is temporary fix needed when using -n and -i together */
items *= num_dirs_in_tree_calc;
}
/* calculate times */
if (create_only) {
summary_table[iteration].rate[4] = items*size/(t[1] - t[0]);
@ -2135,6 +2140,7 @@ void mdtest_init_args(){
unique_dir_per_task = 0;
time_unique_dir_overhead = 0;
items = 0;
num_dirs_in_tree_calc = 0;
collective_creates = 0;
write_bytes = 0;
stone_wall_timer_seconds = 0;
@ -2332,13 +2338,14 @@ mdtest_results_t * mdtest_run(int argc, char **argv, MPI_Comm world_com, FILE *
} else if (branch_factor == 1) {
num_dirs_in_tree = depth + 1;
} else {
num_dirs_in_tree =
(1 - pow(branch_factor, depth+1)) / (1 - branch_factor);
num_dirs_in_tree = (pow(branch_factor, depth+1) - 1) / (branch_factor - 1);
}
}
if (items_per_dir > 0) {
if(unique_dir_per_task){
if(items == 0){
items = items_per_dir * num_dirs_in_tree;
}else{
num_dirs_in_tree_calc = num_dirs_in_tree;
}
} else {
if (leaf_only) {
@ -2482,17 +2489,21 @@ mdtest_results_t * mdtest_run(int argc, char **argv, MPI_Comm world_com, FILE *
MPI_Group_range_incl(worldgroup, 1, (void *)&range, &testgroup);
MPI_Comm_create(testComm, testgroup, &testComm);
if (rank == 0) {
uint64_t items_all = i * items;
if(num_dirs_in_tree_calc){
items_all *= num_dirs_in_tree_calc;
}
if (files_only && dirs_only) {
fprintf(out_logfile, "\n%d tasks, "LLU" files/directories\n", i, i * items);
fprintf(out_logfile, "\n%d tasks, "LLU" files/directories\n", i, items_all);
} else if (files_only) {
if (!shared_file) {
fprintf(out_logfile, "\n%d tasks, "LLU" files\n", i, i * items);
fprintf(out_logfile, "\n%d tasks, "LLU" files\n", i, items_all);
}
else {
fprintf(out_logfile, "\n%d tasks, 1 file\n", i);
}
} else if (dirs_only) {
fprintf(out_logfile, "\n%d tasks, "LLU" directories\n", i, i * items);
fprintf(out_logfile, "\n%d tasks, "LLU" directories\n", i, items_all);
}
}
if (rank == 0 && verbose >= 1) {