From bef3deb47d6ee0e9b51a9556d238dcda7fcc0eab Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Mon, 26 Mar 2018 11:18:06 -0600
Subject: [PATCH] Add placements for the new TRES min|tot usage.
---
src/sacct/sacct.c | 8 ++++++++
src/sacct/sacct.h | 12 ++++++++++--
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/sacct/sacct.c b/src/sacct/sacct.c
index 60dd8fb1ecf..7055c1458fc 100644
--- a/src/sacct/sacct.c
+++ b/src/sacct/sacct.c
@@ -129,10 +129,18 @@ print_field_t fields[] = {
{14, "TRESUsageInMax", print_fields_str, PRINT_TRESUIM},
{18, "TRESUsageInMaxNode", print_fields_str, PRINT_TRESUIMN},
{18, "TRESUsageInMaxTask", print_fields_str, PRINT_TRESUIMT},
+ {14, "TRESUsageInMin", print_fields_str, PRINT_TRESUIMI},
+ {18, "TRESUsageInMinNode", print_fields_str, PRINT_TRESUIMIN},
+ {18, "TRESUsageInMinTask", print_fields_str, PRINT_TRESUIMIT},
+ {14, "TRESUsageInTot", print_fields_str, PRINT_TRESUIT},
{15, "TRESUsageOutAve", print_fields_str, PRINT_TRESUOA},
{15, "TRESUsageOutMax", print_fields_str, PRINT_TRESUOM},
{19, "TRESUsageOutMaxNode", print_fields_str, PRINT_TRESUOMN},
{19, "TRESUsageOutMaxTask", print_fields_str, PRINT_TRESUOMT},
+ {15, "TRESUsageOutMin", print_fields_str, PRINT_TRESUOMI},
+ {19, "TRESUsageOutMinNode", print_fields_str, PRINT_TRESUOMIN},
+ {19, "TRESUsageOutMinTask", print_fields_str, PRINT_TRESUOMIT},
+ {15, "TRESUsageOutTot", print_fields_str, PRINT_TRESUOT},
{6, "UID", print_fields_uint, PRINT_UID},
{9, "User", print_fields_str, PRINT_USER},
{10, "UserCPU", print_fields_str, PRINT_USERCPU},
diff --git a/src/sacct/sacct.h b/src/sacct/sacct.h
index d4e7605257c..44739cdd7a6 100644
--- a/src/sacct/sacct.h
+++ b/src/sacct/sacct.h
@@ -66,7 +66,7 @@
#define BRIEF_COMP_FIELDS "jobid,uid,state"
#define DEFAULT_FIELDS "jobid,jobname,partition,account,alloccpus,state,exitcode"
#define DEFAULT_COMP_FIELDS "jobid,uid,jobname,partition,nnodes,nodelist,state,end"
-#define LONG_FIELDS "jobid,jobidraw,jobname,partition,maxvmsize,maxvmsizenode,maxvmsizetask,avevmsize,maxrss,maxrssnode,maxrsstask,averss,maxpages,maxpagesnode,maxpagestask,avepages,mincpu,mincpunode,mincputask,avecpu,ntasks,alloccpus,elapsed,state,exitcode,avecpufreq,reqcpufreqmin,reqcpufreqmax,reqcpufreqgov,reqmem,consumedenergy,maxdiskread,maxdiskreadnode,maxdiskreadtask,avediskread,maxdiskwrite,maxdiskwritenode,maxdiskwritetask,avediskwrite,allocgres,reqgres,reqtres,alloctres,tresusageinmax,tresusageinmaxn,tresusageinmaxt,tresusageoutmax,tresusageoutmaxn,tresusageoutmaxt,tresusageoutave,tresusageinave"
+#define LONG_FIELDS "jobid,jobidraw,jobname,partition,maxvmsize,maxvmsizenode,maxvmsizetask,avevmsize,maxrss,maxrssnode,maxrsstask,averss,maxpages,maxpagesnode,maxpagestask,avepages,mincpu,mincpunode,mincputask,avecpu,ntasks,alloccpus,elapsed,state,exitcode,avecpufreq,reqcpufreqmin,reqcpufreqmax,reqcpufreqgov,reqmem,consumedenergy,maxdiskread,maxdiskreadnode,maxdiskreadtask,avediskread,maxdiskwrite,maxdiskwritenode,maxdiskwritetask,avediskwrite,allocgres,reqgres,reqtres,alloctres,tresusageinave,tresusageinmax,tresusageinmaxn,tresusageinmaxt,tresusageinmin,tresusageinminn,tresusageinmint,tresusageintot,tresusageoutmax,tresusageoutmaxn,tresusageoutmaxt,tresusageoutave,tresusageouttot"
#define LONG_COMP_FIELDS "jobid,uid,jobname,partition,nnodes,nodelist,state,start,end,timelimit"
@@ -167,14 +167,22 @@ typedef enum {
PRINT_SYSTEM_COMMENT,
PRINT_TIMELIMIT,
PRINT_TOTALCPU,
- PRINT_TRESUIM,
PRINT_TRESUIA,
+ PRINT_TRESUIM,
PRINT_TRESUIMN,
PRINT_TRESUIMT,
+ PRINT_TRESUIMI,
+ PRINT_TRESUIMIN,
+ PRINT_TRESUIMIT,
+ PRINT_TRESUIT,
PRINT_TRESUOA,
PRINT_TRESUOM,
PRINT_TRESUOMN,
PRINT_TRESUOMT,
+ PRINT_TRESUOMI,
+ PRINT_TRESUOMIN,
+ PRINT_TRESUOMIT,
+ PRINT_TRESUOT,
PRINT_UID,
PRINT_USER,
PRINT_USERCPU,
--
GitLab