diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c index 71090181569b6ffb644f89519345b9ed8660508f..04fa784f3a338a9732fc8c6ba64d8b4e373c2c17 100644 --- a/src/sacct/sacct.c +++ b/src/sacct/sacct.c @@ -139,7 +139,9 @@ void _print_header(void); * Globals */ sacct_parameters_t params; -fields_t fields[] = {{"cpu", print_cpu}, +fields_t fields[] = {{"blockid", print_blockid}, + {"cpu", print_cpu}, + {"cputime", print_cputime}, {"elapsed", print_elapsed}, {"end", print_end}, {"exitcode", print_exitcode}, @@ -149,9 +151,9 @@ fields_t fields[] = {{"cpu", print_cpu}, {"inblocks", print_inblocks}, {"isrss", print_isrss}, {"ixrss", print_ixrss}, - {"job", print_job}, + {"job", print_job}, + {"jobid", print_jobid} {"jobname", print_name}, - {"jobid", print_jobid}, {"majflt", print_majflt}, {"minflt", print_minflt}, {"msgrcv", print_msgrcv}, @@ -159,25 +161,23 @@ fields_t fields[] = {{"cpu", print_cpu}, {"ncpus", print_ncpus}, {"nivcsw", print_nivcsw}, {"nodes", print_nodes}, - {"nprocs", print_ntasks}, + {"nprocs", print_ntasks}, + {"nsignals", print_nsignals}, + {"nswap", print_nswap} {"ntasks", print_ntasks}, - {"nsignals", print_nsignals}, - {"nswap", print_nswap}, {"nvcsw", print_nvcsw}, - {"outblocks", print_outblocks}, - {"partition", print_partition}, - {"blockid", print_blockid}, - {"rss", print_rss}, + {"outblocks", print_outblocks}, {"pages", print_pages}, + {"partition", print_partition}, + {"rss", print_rss}, + {"start", print_start} {"status", print_status}, {"submit", print_submit}, - {"start", print_start}, {"systemcpu", print_systemcpu}, {"uid", print_uid}, {"user", print_user}, {"usercpu", print_usercpu}, {"vsize", print_vsize}, - {"cputime", print_cputime}, {NULL, NULL}}; long input_error = 0; /* Muddle through bad data, but complain! */