From a0e00a87b6d475bada68f22ca2e9e9635609fab6 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Wed, 28 Jan 2009 23:47:25 +0000
Subject: [PATCH] fix for no header and -P option
---
src/sstat/options.c | 1 +
src/sstat/sstat.c | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/sstat/options.c b/src/sstat/options.c
index af21b21a056..48a62408f04 100644
--- a/src/sstat/options.c
+++ b/src/sstat/options.c
@@ -407,6 +407,7 @@ void parse_command_line(int argc, char **argv)
list_append(print_fields_list, &fields[i]);
start = end + 1;
}
+ field_count = list_count(print_fields_list);
if (optind < argc) {
debug2("Error: Unknown arguments:");
diff --git a/src/sstat/sstat.c b/src/sstat/sstat.c
index 3e61910b405..2447324f872 100644
--- a/src/sstat/sstat.c
+++ b/src/sstat/sstat.c
@@ -53,7 +53,7 @@ print_field_t fields[] = {
{10, "AveCPU", print_fields_str, PRINT_AVECPU},
{10, "AvePages", print_fields_str, PRINT_AVEPAGES},
{10, "AveRSS", print_fields_str, PRINT_AVERSS},
- {10, "AveVMSize", print_fields_str, PRINT_AVEVMSIZE},
+ {10, "AveVMSize", print_fields_str, PRINT_AVEVSIZE},
{10, "JobID", print_fields_str, PRINT_JOBID},
{8, "MaxPages", print_fields_str, PRINT_MAXPAGES},
{12, "MaxPagesNode", print_fields_str, PRINT_MAXPAGESNODE},
@@ -61,9 +61,9 @@ print_field_t fields[] = {
{10, "MaxRSS", print_fields_str, PRINT_MAXRSS},
{10, "MaxRSSNode", print_fields_str, PRINT_MAXRSSNODE},
{10, "MaxRSSTask", print_fields_int, PRINT_MAXRSSTASK},
- {8, "MaxVMSize", print_fields_str, PRINT_MAXVMSIZE},
- {12, "MaxVMSizeNode", print_fields_str, PRINT_MAXVMSIZENODE},
- {12, "MaxVMSizeTask", print_fields_int, PRINT_MAXVMSIZETASK},
+ {8, "MaxVMSize", print_fields_str, PRINT_MAXVSIZE},
+ {12, "MaxVMSizeNode", print_fields_str, PRINT_MAXVSIZENODE},
+ {12, "MaxVMSizeTask", print_fields_int, PRINT_MAXVSIZETASK},
{10, "MinCPU", print_fields_str, PRINT_MINCPU},
{10, "MinCPUNode", print_fields_str, PRINT_MINCPUNODE},
{10, "MinCPUTask", print_fields_int, PRINT_MINCPUTASK},
@@ -237,6 +237,7 @@ int main(int argc, char **argv)
return 1;
}
+ print_fields_header(print_fields_list);
itr = list_iterator_create(params.opt_job_list);
while((selected_step = list_next(itr))) {
if(selected_step->stepid != NO_VAL)
--
GitLab