Skip to content
Snippets Groups Projects
Commit 8fa3fe25 authored by Danny Auble's avatar Danny Auble
Browse files

fix for formatted output. Only works with associations though. Add this to the other types later.

parent 4b67fdc5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/sacctmgr/association_functions.c
+ 159
− 92
View file @ 8fa3fe25
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
#include "print.h" #include "print.h"
static int _set_cond(int *start, int argc, char *argv[], static int _set_cond(int *start, int argc, char *argv[],
acct_association_cond_t *association_cond) acct_association_cond_t *association_cond,
List format_list)
{ {
int i, end = 0; int i, end = 0;
int set = 0; int set = 0;
...@@ -68,7 +69,10 @@ static int _set_cond(int *start, int argc, char *argv[], ...@@ -68,7 +69,10 @@ static int _set_cond(int *start, int argc, char *argv[],
addto_char_list(association_cond->cluster_list, addto_char_list(association_cond->cluster_list,
argv[i]+end); argv[i]+end);
set = 1; set = 1;
} else if (strncasecmp (argv[i], "Partitions", 4) == 0) { } else if (strncasecmp (argv[i], "Format", 1) == 0) {
if(format_list)
addto_char_list(format_list, argv[i]+end);
} else if (strncasecmp (argv[i], "Partitions", 4) == 0) {
addto_char_list(association_cond->partition_list, addto_char_list(association_cond->partition_list,
argv[i]+end); argv[i]+end);
set = 1; set = 1;
...@@ -196,122 +200,185 @@ extern int sacctmgr_list_association(int argc, char *argv[]) ...@@ -196,122 +200,185 @@ extern int sacctmgr_list_association(int argc, char *argv[])
acct_association_rec_t *assoc = NULL; acct_association_rec_t *assoc = NULL;
int i=0; int i=0;
ListIterator itr = NULL; ListIterator itr = NULL;
ListIterator itr2 = NULL;
char *object;
print_field_t id_field; print_field_t *field = NULL;
print_field_t parent_field;
print_field_t cluster_field;
print_field_t acct_field;
print_field_t user_field;
print_field_t part_field;
print_field_t fairshare_field;
print_field_t maxjobs_field;
print_field_t maxnodes_field;
print_field_t maxwall_field;
print_field_t maxcpu_field;
List format_list = list_create(slurm_destroy_char);
List print_fields_list; /* types are of print_field_t */ List print_fields_list; /* types are of print_field_t */
enum {
PRINT_ACCOUNT,
PRINT_CLUSTER,
PRINT_FAIRSHARE,
PRINT_ID,
PRINT_MAXC,
PRINT_MAXJ,
PRINT_MAXN,
PRINT_MAXW,
PRINT_PID,
PRINT_PNAME,
PRINT_PART,
PRINT_USER
};
assoc_cond->id_list = list_create(slurm_destroy_char); assoc_cond->id_list = list_create(slurm_destroy_char);
assoc_cond->user_list = list_create(slurm_destroy_char); assoc_cond->user_list = list_create(slurm_destroy_char);
assoc_cond->acct_list = list_create(slurm_destroy_char); assoc_cond->acct_list = list_create(slurm_destroy_char);
assoc_cond->cluster_list = list_create(slurm_destroy_char); assoc_cond->cluster_list = list_create(slurm_destroy_char);
_set_cond(&i, argc, argv, assoc_cond); _set_cond(&i, argc, argv, assoc_cond, format_list);
assoc_list = acct_storage_g_get_associations(db_conn, assoc_cond); assoc_list = acct_storage_g_get_associations(db_conn, assoc_cond);
destroy_acct_association_cond(assoc_cond); destroy_acct_association_cond(assoc_cond);
if(!assoc_list) if(!assoc_list) {
list_destroy(format_list);
return SLURM_ERROR; return SLURM_ERROR;
}
print_fields_list = list_create(destroy_print_field);
print_fields_list = list_create(NULL); if(!list_count(format_list))
addto_char_list(format_list, "C,A,U,F,MaxC,MaxJ,MaxN,MaxW");
id_field.name = "ID";
id_field.len = 6;
id_field.print_routine = print_uint;
list_append(print_fields_list, &id_field);
parent_field.name = "Parent";
parent_field.len = 6;
parent_field.print_routine = print_uint;
list_append(print_fields_list, &parent_field);
cluster_field.name = "Cluster";
cluster_field.len = 10;
cluster_field.print_routine = print_str;
list_append(print_fields_list, &cluster_field);
acct_field.name = "Account";
acct_field.len = 10;
acct_field.print_routine = print_str;
list_append(print_fields_list, &acct_field);
user_field.name = "User";
user_field.len = 10;
user_field.print_routine = print_str;
list_append(print_fields_list, &user_field);
part_field.name = "Partition";
part_field.len = 10;
part_field.print_routine = print_str;
list_append(print_fields_list, &part_field);
fairshare_field.name = "FairShare";
fairshare_field.len = 9;
fairshare_field.print_routine = print_uint;
list_append(print_fields_list, &fairshare_field);
maxjobs_field.name = "MaxJobs";
maxjobs_field.len = 7;
maxjobs_field.print_routine = print_uint;
list_append(print_fields_list, &maxjobs_field);
maxnodes_field.name = "MaxNodes";
maxnodes_field.len = 8;
maxnodes_field.print_routine = print_uint;
list_append(print_fields_list, &maxnodes_field);
maxwall_field.name = "MaxWall"; itr = list_iterator_create(format_list);
maxwall_field.len = 11; while((object = list_next(itr))) {
maxwall_field.print_routine = print_time; field = xmalloc(sizeof(print_field_t));
list_append(print_fields_list, &maxwall_field); if(!strncasecmp("Account", object, 1)) {
field->type = PRINT_ACCOUNT;
maxcpu_field.name = "MaxCPUSecs"; field->name = xstrdup("Account");
maxcpu_field.len = 11; field->len = 10;
maxcpu_field.print_routine = print_uint; field->print_routine = print_str;
list_append(print_fields_list, &maxcpu_field); } else if(!strncasecmp("Cluster", object, 1)) {
field->type = PRINT_CLUSTER;
field->name = xstrdup("Cluster");
field->len = 10;
field->print_routine = print_str;
} else if(!strncasecmp("FairShare", object, 1)) {
field->type = PRINT_FAIRSHARE;
field->name = xstrdup("FairShare");
field->len = 9;
field->print_routine = print_uint;
} else if(!strncasecmp("ID", object, 1)) {
field->type = PRINT_ID;
field->name = xstrdup("ID");
field->len = 6;
field->print_routine = print_uint;
} else if(!strncasecmp("MaxCPUSecs", object, 4)) {
field->type = PRINT_MAXC;
field->name = xstrdup("MaxCPUSecs");
field->len = 11;
field->print_routine = print_uint;
} else if(!strncasecmp("MaxJobs", object, 4)) {
field->type = PRINT_MAXJ;
field->name = xstrdup("MaxJobs");
field->len = 7;
field->print_routine = print_uint;
} else if(!strncasecmp("MaxNodes", object, 4)) {
field->type = PRINT_MAXN;
field->name = xstrdup("MaxNodes");
field->len = 8;
field->print_routine = print_uint;
} else if(!strncasecmp("MaxWall", object, 4)) {
field->type = PRINT_MAXW;
field->name = xstrdup("MaxWall");
field->len = 11;
field->print_routine = print_time;
} else if(!strncasecmp("ParentID", object, 7)) {
field->type = PRINT_PID;
field->name = xstrdup("Par ID");
field->len = 6;
field->print_routine = print_uint;
} else if(!strncasecmp("ParentName", object, 7)) {
field->type = PRINT_PNAME;
field->name = xstrdup("Par Name");
field->len = 10;
field->print_routine = print_str;
} else if(!strncasecmp("Partition", object, 4)) {
field->type = PRINT_PART;
field->name = xstrdup("Partition");
field->len = 10;
field->print_routine = print_str;
} else if(!strncasecmp("User", object, 1)) {
field->type = PRINT_USER;
field->name = xstrdup("User");
field->len = 10;
field->print_routine = print_str;
} else {
printf("Unknown field '%s'", object);
xfree(field);
continue;
}
list_append(print_fields_list, field);
}
list_iterator_destroy(itr);
itr = list_iterator_create(assoc_list); itr = list_iterator_create(assoc_list);
itr2 = list_iterator_create(print_fields_list);
print_header(print_fields_list); print_header(print_fields_list);
while((assoc = list_next(itr))) { while((assoc = list_next(itr))) {
id_field.print_routine(VALUE, &id_field, assoc->id); while((field = list_next(itr2))) {
switch(field->type) {
parent_field.print_routine(VALUE, &parent_field, case PRINT_ACCOUNT:
assoc->parent_id); field->print_routine(VALUE, field, assoc->acct);
break;
cluster_field.print_routine(VALUE, &cluster_field, case PRINT_CLUSTER:
assoc->cluster); field->print_routine(VALUE, field,
acct_field.print_routine(VALUE, &acct_field, assoc->acct); assoc->cluster);
user_field.print_routine(VALUE, &user_field, assoc->user); break;
part_field.print_routine(VALUE, &part_field, assoc->partition); case PRINT_FAIRSHARE:
fairshare_field.print_routine(VALUE, &fairshare_field, field->print_routine(VALUE, field,
assoc->fairshare); assoc->fairshare);
maxjobs_field.print_routine(VALUE, &maxjobs_field, break;
assoc->max_jobs); case PRINT_ID:
maxnodes_field.print_routine(VALUE, &maxnodes_field, field->print_routine(VALUE, field, assoc->id);
assoc->max_nodes_per_job); break;
maxwall_field.print_routine(VALUE, &maxwall_field, case PRINT_MAXC:
assoc->max_wall_duration_per_job); field->print_routine(
maxcpu_field.print_routine(VALUE, &maxcpu_field, VALUE, field,
assoc->max_cpu_secs_per_job); assoc->max_cpu_secs_per_job);
break;
case PRINT_MAXJ:
field->print_routine(VALUE, field,
assoc->max_jobs);
break;
case PRINT_MAXN:
field->print_routine(VALUE, field,
assoc->max_nodes_per_job);
break;
case PRINT_MAXW:
field->print_routine(
VALUE, field,
assoc->max_wall_duration_per_job);
break;
case PRINT_PID:
field->print_routine(VALUE, field,
assoc->parent_id);
break;
case PRINT_PNAME:
field->print_routine(VALUE, field,
assoc->parent_acct);
break;
case PRINT_PART:
field->print_routine(VALUE, field,
assoc->partition);
break;
case PRINT_USER:
field->print_routine(VALUE, field, assoc->user);
break;
default:
break;
}
}
list_iterator_reset(itr2);
printf("\n"); printf("\n");
} }
printf("\n"); printf("\n");
list_iterator_destroy(itr2);
list_iterator_destroy(itr); list_iterator_destroy(itr);
list_destroy(assoc_list); list_destroy(assoc_list);
list_destroy(print_fields_list); list_destroy(print_fields_list);
......
src/sacctmgr/print.c
+ 66
− 24
View file @ 8fa3fe25
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
\*****************************************************************************/ \*****************************************************************************/
#include "print.h" #include "print.h"
#include "src/common/parse_time.h" #include "src/common/parse_time.h"
int parsable_print = 0;
int have_header = 1;
extern void destroy_print_field(void *object) extern void destroy_print_field(void *object)
{ {
...@@ -53,7 +55,7 @@ extern void print_header(List print_fields_list) ...@@ -53,7 +55,7 @@ extern void print_header(List print_fields_list)
ListIterator itr = NULL; ListIterator itr = NULL;
print_field_t *object = NULL; print_field_t *object = NULL;
if(!print_fields_list) if(!print_fields_list || !have_header)
return; return;
itr = list_iterator_create(print_fields_list); itr = list_iterator_create(print_fields_list);
...@@ -62,6 +64,8 @@ extern void print_header(List print_fields_list) ...@@ -62,6 +64,8 @@ extern void print_header(List print_fields_list)
} }
list_iterator_reset(itr); list_iterator_reset(itr);
printf("\n"); printf("\n");
if(parsable_print)
return;
while((object = list_next(itr))) { while((object = list_next(itr))) {
(object->print_routine)(UNDERSCORE, object, 0); (object->print_routine)(UNDERSCORE, object, 0);
} }
...@@ -84,20 +88,34 @@ extern void print_str(type_t type, print_field_t *field, char *value) ...@@ -84,20 +88,34 @@ extern void print_str(type_t type, print_field_t *field, char *value)
switch(type) { switch(type) {
case HEADLINE: case HEADLINE:
printf("%-*.*s ", field->len, field->len, field->name); if(parsable_print)
printf("%s|", field->name);
else
printf("%-*.*s ", field->len, field->len, field->name);
break; break;
case UNDERSCORE: case UNDERSCORE:
printf("%-*.*s ", field->len, field->len, if(!parsable_print)
"---------------------------------------"); printf("%-*.*s ", field->len, field->len,
"---------------------------------------");
break; break;
case VALUE: case VALUE:
if(!print_this) if(!print_this) {
print_this = " "; if(parsable_print)
print_this = "";
printf("%-*.*s ", field->len, field->len, print_this); else
print_this = " ";
}
if(parsable_print)
printf("%s|", print_this);
else
printf("%-*.*s ", field->len, field->len, print_this);
break; break;
default: default:
printf("%-*s ", field->len, "n/a"); if(parsable_print)
printf("%s|", "n/a");
else
printf("%-*s ", field->len, "n/a");
break; break;
} }
} }
...@@ -106,21 +124,35 @@ extern void print_uint(type_t type, print_field_t *field, uint32_t value) ...@@ -106,21 +124,35 @@ extern void print_uint(type_t type, print_field_t *field, uint32_t value)
{ {
switch(type) { switch(type) {
case HEADLINE: case HEADLINE:
printf("%-*.*s ", field->len, field->len, field->name); if(parsable_print)
printf("%s|", field->name);
else
printf("%-*.*s ", field->len, field->len, field->name);
break; break;
case UNDERSCORE: case UNDERSCORE:
printf("%-*.*s ", field->len, field->len, if(!parsable_print)
"---------------------------------------"); printf("%-*.*s ", field->len, field->len,
"---------------------------------------");
break; break;
case VALUE: case VALUE:
/* (value == unset) || (value == cleared) */ /* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) if((value == NO_VAL) || (value == INFINITE)) {
printf("%-*s ", field->len, " "); if(parsable_print)
else printf("|");
printf("%*u ", field->len, value); else
printf("%-*s ", field->len, " ");
} else {
if(parsable_print)
printf("%u|", value);
else
printf("%*u ", field->len, value);
}
break; break;
default: default:
printf("%-*.*s ", field->len, field->len, "n/a"); if(parsable_print)
printf("%s|", "n/a");
else
printf("%-*.*s ", field->len, field->len, "n/a");
break; break;
} }
} }
...@@ -129,21 +161,31 @@ extern void print_time(type_t type, print_field_t *field, uint32_t value) ...@@ -129,21 +161,31 @@ extern void print_time(type_t type, print_field_t *field, uint32_t value)
{ {
switch(type) { switch(type) {
case HEADLINE: case HEADLINE:
printf("%-*.*s ", field->len, field->len, field->name); if(parsable_print)
printf("%s|", field->name);
else
printf("%-*.*s ", field->len, field->len, field->name);
break; break;
case UNDERSCORE: case UNDERSCORE:
printf("%-*.*s ", field->len, field->len, if(!parsable_print)
"---------------------------------------"); printf("%-*.*s ", field->len, field->len,
"---------------------------------------");
break; break;
case VALUE: case VALUE:
/* (value == unset) || (value == cleared) */ /* (value == unset) || (value == cleared) */
if((value == NO_VAL) || (value == INFINITE)) if((value == NO_VAL) || (value == INFINITE)) {
printf("%-*s ", field->len, " "); if(parsable_print)
else { printf("|");
else
printf("%-*s ", field->len, " ");
} else {
char time_buf[32]; char time_buf[32];
mins2time_str((time_t) value, mins2time_str((time_t) value,
time_buf, sizeof(time_buf)); time_buf, sizeof(time_buf));
printf("%*s ", field->len, time_buf); if(parsable_print)
printf("%s|", time_buf);
else
printf("%*s ", field->len, time_buf);
} }
break; break;
default: default:
......
src/sacctmgr/print.h
+ 5
− 1
View file @ 8fa3fe25
...@@ -73,11 +73,15 @@ typedef enum { HEADLINE, ...@@ -73,11 +73,15 @@ typedef enum { HEADLINE,
} type_t; } type_t;
typedef struct { typedef struct {
char *name; /* name to be printed in header */
uint16_t len; /* what is the width of the print */ uint16_t len; /* what is the width of the print */
char *name; /* name to be printed in header */
void (*print_routine) (); /* what is the function to print with */ void (*print_routine) (); /* what is the function to print with */
uint16_t type; /* defined in the local function */
} print_field_t; } print_field_t;
extern int parsable_print;
extern int have_header;
extern void destroy_print_field(void *object); extern void destroy_print_field(void *object);
extern void print_header(List print_fields_list); extern void print_header(List print_fields_list);
extern void print_date(void); extern void print_date(void);
......
src/sacctmgr/sacctmgr.c
+ 25
− 11
View file @ 8fa3fe25
...@@ -107,6 +107,8 @@ main (int argc, char *argv[]) ...@@ -107,6 +107,8 @@ main (int argc, char *argv[])
{"hide", 0, 0, OPT_LONG_HIDE}, {"hide", 0, 0, OPT_LONG_HIDE},
{"immediate",0, 0, 'i'}, {"immediate",0, 0, 'i'},
{"oneliner", 0, 0, 'o'}, {"oneliner", 0, 0, 'o'},
{"no_header", 0, 0, 'n'},
{"parsable", 0, 0, 'p'},
{"quiet", 0, 0, 'q'}, {"quiet", 0, 0, 'q'},
{"usage", 0, 0, 'h'}, {"usage", 0, 0, 'h'},
{"verbose", 0, 0, 'v'}, {"verbose", 0, 0, 'v'},
...@@ -126,7 +128,7 @@ main (int argc, char *argv[]) ...@@ -126,7 +128,7 @@ main (int argc, char *argv[])
if (getenv ("SACCTMGR_ALL")) if (getenv ("SACCTMGR_ALL"))
all_flag= 1; all_flag= 1;
while((opt_char = getopt_long(argc, argv, "ahioqsvV", while((opt_char = getopt_long(argc, argv, "ahionpqsvV",
long_options, &option_index)) != -1) { long_options, &option_index)) != -1) {
switch (opt_char) { switch (opt_char) {
case (int)'?': case (int)'?':
...@@ -149,6 +151,12 @@ main (int argc, char *argv[]) ...@@ -149,6 +151,12 @@ main (int argc, char *argv[])
case (int)'o': case (int)'o':
one_liner = 1; one_liner = 1;
break; break;
case (int)'n':
have_header = 0;
break;
case (int)'p':
parsable_print = 1;
break;
case (int)'q': case (int)'q':
quiet_flag = 1; quiet_flag = 1;
break; break;
...@@ -1361,9 +1369,12 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\ ...@@ -1361,9 +1369,12 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
list <ENTITY> [<SPECS>] display info of identified entity, default \n\ list <ENTITY> [<SPECS>] display info of identified entity, default \n\
is display all. \n\ is display all. \n\
modify <ENTITY> <SPECS> modify entity \n\ modify <ENTITY> <SPECS> modify entity \n\
no_header no header will be added to the beginning of \n\
output. \n\
oneliner report output one record per line. \n\ oneliner report output one record per line. \n\
quiet print no messages other than error messages. \n\ quiet print no messages other than error messages. \n\
quit terminate this command. \n\ quit terminate this command. \n\
parsable output will be | delimited \n\
show same as list \n\ show same as list \n\
verbose enable detailed logging. \n\ verbose enable detailed logging. \n\
version display tool version number. \n\ version display tool version number. \n\
...@@ -1372,15 +1383,7 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\ ...@@ -1372,15 +1383,7 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
<ENTITY> may be \"cluster\", \"account\", or \"user\". \n\ <ENTITY> may be \"cluster\", \"account\", or \"user\". \n\
\n\ \n\
<SPECS> are different for each command entity pair. \n\ <SPECS> are different for each command entity pair. \n\
list cluster - Names= \n\ list account - Clusters=, Descriptions=, Format=, Names=, \n\
add cluster - Fairshare=, MaxCPUSecs=, \n\
MaxJobs=, MaxNodes=, MaxWall=, and Names= \n\
modify cluster - (set options) Fairshare=, MaxCPUSecs=, \n\
MaxJobs=, MaxNodes=, and MaxWall= \n\
(where options) Names= \n\
delete cluster - Names= \n\
\n\
list account - Clusters=, Descriptions=, Names=, \n\
Organizations=, Parents=, and WithAssocs \n\ Organizations=, Parents=, and WithAssocs \n\
add account - Clusters=, Description=, Fairshare=, \n\ add account - Clusters=, Description=, Fairshare=, \n\
MaxCPUSecs=, MaxJobs=, MaxNodes=, MaxWall=, \n\ MaxCPUSecs=, MaxJobs=, MaxNodes=, MaxWall=, \n\
...@@ -1393,7 +1396,18 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\ ...@@ -1393,7 +1396,18 @@ sacctmgr [<OPTION>] [<COMMAND>] \n\
delete account - Clusters=, Descriptions=, Names=, \n\ delete account - Clusters=, Descriptions=, Names=, \n\
Organizations=, and Parents= \n\ Organizations=, and Parents= \n\
\n\ \n\
list user - AdminLevel=, DefaultAccounts=, Names=, \n\ list associations - Accounts=, Clusters=, Format=, ID=, \n\
Partitions=, Parent=, Users= \n\
\n\
list cluster - Names= Format= \n\
add cluster - Fairshare=, MaxCPUSecs=, \n\
MaxJobs=, MaxNodes=, MaxWall=, and Names= \n\
modify cluster - (set options) Fairshare=, MaxCPUSecs=, \n\
MaxJobs=, MaxNodes=, and MaxWall= \n\
(where options) Names= \n\
delete cluster - Names= \n\
\n\
list user - AdminLevel=, DefaultAccounts=, Format=, Names=,\n\
QosLevel=, and WithAssocs \n\ QosLevel=, and WithAssocs \n\
add user - Accounts=, AdminLevel=, Clusters=, \n\ add user - Accounts=, AdminLevel=, Clusters=, \n\
DefaultAccount=, Fairshare=, MaxCPUSecs=, \n\ DefaultAccount=, Fairshare=, MaxCPUSecs=, \n\
......
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
Nutzungsbedingungen | Datenschutzerklärung | Barrierefreiheitserklärung