Skip to content
Snippets Groups Projects
Commit 847cb89a authored by Mark Grondona's avatar Mark Grondona
Browse files

o minor code cleanup 

 o also show node state when -l is used with -R
 o Don't let environment var override command line (SINFO_FORMAT)
parent 98600170
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 85 additions and 85 deletions
src/sinfo/opts.c
+ 85
− 85
View file @ 847cb89a
...@@ -94,105 +94,105 @@ extern void parse_command_line(int argc, char *argv[]) ...@@ -94,105 +94,105 @@ extern void parse_command_line(int argc, char *argv[])
while((opt_char = getopt_long(argc, argv, "dehi:ln:No:p:rRsS:t:vV", while((opt_char = getopt_long(argc, argv, "dehi:ln:No:p:rRsS:t:vV",
long_options, &option_index)) != -1) { long_options, &option_index)) != -1) {
switch (opt_char) { switch (opt_char) {
case (int)'?': case (int)'?':
fprintf(stderr, "Try \"sinfo --help\" for more information\n"); fprintf(stderr, "Try \"sinfo --help\" for more information\n");
exit(1);
break;
case (int)'d':
params.dead_nodes = true;
break;
case (int)'e':
params.exact_match = true;
break;
case (int)'h':
params.no_header = true;
break;
case (int) 'i':
params.iterate= atoi(optarg);
if (params.iterate <= 0) {
error ("Error: --iterate=%s");
exit(1); exit(1);
break; }
case (int)'d': break;
params.dead_nodes = true; case (int) 'l':
break; params.long_output = true;
case (int)'e': break;
params.exact_match = true; case (int) 'n':
break; params.nodes= xstrdup(optarg);
case (int)'h': break;
params.no_header = true; case (int) 'N':
break; params.node_flag = true;
case (int) 'i': break;
params.iterate= atoi(optarg); case (int) 'o':
if (params.iterate <= 0) { params.format = xstrdup(optarg);
fprintf(stderr, break;
"Error: --iterate=%s", case (int) 'p':
optarg); params.partition = xstrdup(optarg);
exit(1); break;
} case (int) 'r':
break; params.responding_nodes = true;
case (int) 'l': break;
params.long_output = true; case (int) 'R':
break; params.list_reasons = true;
case (int) 'n': break;
params.nodes= xstrdup(optarg); case (int) 's':
break; params.summarize = true;
case (int) 'N': break;
params.node_flag = true; case (int) 'S':
break; params.sort = xstrdup(optarg);
case (int) 'o': break;
params.format = xstrdup(optarg); case (int) 't':
break; params.states = xstrdup(optarg);
case (int) 'p': params.state_list =
params.partition = xstrdup(optarg); _build_state_list(params.states);
break; break;
case (int) 'r': case (int) 'v':
params.responding_nodes = true; params.verbose++;
break; break;
case (int) 'R': case (int) 'V':
params.list_reasons = true; _print_version();
params.format = "%35R %N"; exit(0);
break; case (int) OPT_LONG_HELP:
case (int) 's': _help();
params.summarize = true; exit(0);
break; case (int) OPT_LONG_USAGE:
case (int) 'S': _usage();
params.sort = xstrdup(optarg); exit(0);
break;
case (int) 't':
params.states = xstrdup(optarg);
params.state_list =
_build_state_list(params.states);
break;
case (int) 'v':
params.verbose++;
break;
case (int) 'V':
_print_version();
exit(0);
case (int) OPT_LONG_HELP:
_help();
exit(0);
case (int) OPT_LONG_USAGE:
_usage();
exit(0);
} }
} }
if ( ( params.format == NULL ) &&
( env_val = getenv("SINFO_FORMAT") ) )
params.format = xstrdup(env_val);
if ( ( params.partition == NULL ) && if ( ( params.partition == NULL ) &&
( env_val = getenv("SINFO_PARTITION") ) ) ( env_val = getenv("SINFO_PARTITION") ) )
params.partition = xstrdup(env_val); params.partition = xstrdup(env_val);
if ( ( params.partition == NULL ) && if ( ( params.partition == NULL ) &&
( env_val = getenv("SINFO_SORT") ) ) ( env_val = getenv("SINFO_SORT") ) )
params.sort = xstrdup(env_val); params.sort = xstrdup(env_val);
if ( params.format == NULL ) { if ( params.format == NULL ) {
if ( params.summarize ) if ( params.summarize ) {
params.format = "%9P %.5a %.9l %.15F %N"; params.format = "%9P %.5a %.9l %.15F %N";
else if ( params.node_flag ) {
} else if ( params.node_flag ) {
params.node_field_flag = true; /* compute size later */ params.node_field_flag = true; /* compute size later */
if ( params.long_output ) { params.format = params.long_output ?
params.format = "%N %.5D %.9P %.11T %.4c " "%N %.5D %.9P %.11T %.4c %.6m %.8d %.6w %.8f %20R" :
"%.6m %.8d %.6w %.8f %20R"; "%N %.5D %.9P %6t";
} else {
params.format = "%N %.5D %.9P %6t"; } else if (params.list_reasons) {
} params.format = params.long_output ?
"%35R %6t %N" :
"%35R %N";
} else if ((env_val = getenv ("SINFO_FORMAT"))) {
params.format = xstrdup(env_val);
} else { } else {
if ( params.long_output )
params.format = "%9P %.5a %.9l %.8s %.4r %.5h " params.format = params.long_output ?
"%.10g %.5D %.11T %N"; "%9P %.5a %.9l %.8s %.4r %.5h %.10g %.5D %.11T %N" :
else "%9P %.5a %.9l %.5D %.6t %N";
params.format = "%9P %.5a %.9l %.5D %.6t %N";
} }
} }
_parse_format( params.format ); _parse_format( params.format );
...@@ -203,7 +203,7 @@ extern void parse_command_line(int argc, char *argv[]) ...@@ -203,7 +203,7 @@ extern void parse_command_line(int argc, char *argv[])
} }
if (params.dead_nodes || params.nodes || params.partition || if (params.dead_nodes || params.nodes || params.partition ||
params.responding_nodes ||params.state_list) params.responding_nodes ||params.state_list)
params.filtering = true; params.filtering = true;
if (params.verbose) if (params.verbose)
......
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