From fdf44f2def498df88e459b3ba362d972fc1a65cb Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 31 Jul 2003 19:18:30 +0000
Subject: [PATCH] Change format for sinfo "%A" field from NODES allocated/total
to NODES allocated/idle.
---
doc/man/man1/sinfo.1 | 6 +++---
src/sinfo/opts.c | 2 +-
src/sinfo/print.c | 6 +++---
src/sinfo/print.h | 6 +++---
src/sinfo/sort.c | 8 ++++----
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/doc/man/man1/sinfo.1 b/doc/man/man1/sinfo.1
index 98d59241a9f..ee6c10ca435 100644
--- a/doc/man/man1/sinfo.1
+++ b/doc/man/man1/sinfo.1
@@ -62,7 +62,7 @@ The field specifications available include:
.br
\fB%a\fR State/availability of a partition
.br
-\fB%A\fR Number of nodes by state in the format "allocated/total".
+\fB%A\fR Number of nodes by state in the format "allocated/idle".
Do not use this with a node state option ("%t" or "%T") or
the different node states will be placed on separate lines.
.br
@@ -179,9 +179,9 @@ Names of nodes associated with this configuration/partition.
\fBNODES\fR
Count of nodes with this particular configuration.
.TP
-\fBNODES(A/T)\fR
+\fBNODES(A/I)\fR
Count of nodes with this particular configuration by node
-state in the form "available/total".
+state in the form "available/idle".
.TP
\fBNODES(A/I/O/T)\fR
Count of nodes with this particular configuration by node
diff --git a/src/sinfo/opts.c b/src/sinfo/opts.c
index bd60bcc4a8a..e06c4e38892 100644
--- a/src/sinfo/opts.c
+++ b/src/sinfo/opts.c
@@ -302,7 +302,7 @@ _parse_format( char* format )
right_justify,
suffix );
} else if (field[0] == 'A') {
- format_add_nodes_at( params.format_list,
+ format_add_nodes_ai( params.format_list,
field_size,
right_justify,
suffix );
diff --git a/src/sinfo/print.c b/src/sinfo/print.c
index fb05bced18c..77252de7d90 100644
--- a/src/sinfo/print.c
+++ b/src/sinfo/print.c
@@ -359,16 +359,16 @@ int _print_nodes_t(sinfo_data_t * sinfo_data, int width,
return SLURM_SUCCESS;
}
-int _print_nodes_at(sinfo_data_t * sinfo_data, int width,
+int _print_nodes_ai(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix)
{
char id[FORMAT_STRING_SIZE];
if (sinfo_data) {
snprintf(id, FORMAT_STRING_SIZE, "%u/%u",
- sinfo_data->nodes_alloc, sinfo_data->nodes_tot);
+ sinfo_data->nodes_alloc, sinfo_data->nodes_idle);
_print_str(id, width, right_justify, true);
} else
- _print_str("NODES(A/T)", width, right_justify, true);
+ _print_str("NODES(A/I)", width, right_justify, true);
if (suffix)
printf("%s", suffix);
diff --git a/src/sinfo/print.h b/src/sinfo/print.h
index 8beb8ca39a2..d244ba42eb7 100644
--- a/src/sinfo/print.h
+++ b/src/sinfo/print.h
@@ -73,8 +73,8 @@ int print_sinfo_list(List sinfo_list);
format_add_function(list,wid,right,suffix,_print_nodes_t)
#define format_add_nodes_aiot(list,wid,right,suffix) \
format_add_function(list,wid,right,suffix,_print_nodes_aiot)
-#define format_add_nodes_at(list,wid,right,suffix) \
- format_add_function(list,wid,right,suffix,_print_nodes_at)
+#define format_add_nodes_ai(list,wid,right,suffix) \
+ format_add_function(list,wid,right,suffix,_print_nodes_ai)
#define format_add_partition(list,wid,right,suffix) \
format_add_function(list,wid,right,suffix,_print_partition)
#define format_add_prefix(list,wid,right,suffix) \
@@ -116,7 +116,7 @@ int _print_node_list(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
int _print_nodes_t(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
-int _print_nodes_at(sinfo_data_t * sinfo_data, int width,
+int _print_nodes_ai(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
int _print_nodes_aiot(sinfo_data_t * sinfo_data, int width,
bool right_justify, char *suffix);
diff --git a/src/sinfo/sort.c b/src/sinfo/sort.c
index 218b53d78dd..72ed335128a 100644
--- a/src/sinfo/sort.c
+++ b/src/sinfo/sort.c
@@ -44,7 +44,7 @@ static int _sort_by_job_size(void *void1, void *void2);
static int _sort_by_max_time(void *void1, void *void2);
static int _sort_by_memory(void *void1, void *void2);
static int _sort_by_node_list(void *void1, void *void2);
-static int _sort_by_nodes_at(void *void1, void *void2);
+static int _sort_by_nodes_ai(void *void1, void *void2);
static int _sort_by_nodes(void *void1, void *void2);
static int _sort_by_partition(void *void1, void *void2);
static int _sort_by_reason(void *void1, void *void2);
@@ -77,7 +77,7 @@ void sort_sinfo_list(List sinfo_list)
if (params.sort[i] == 'a')
list_sort(sinfo_list, _sort_by_avail);
else if (params.sort[i] == 'A')
- list_sort(sinfo_list, _sort_by_nodes_at);
+ list_sort(sinfo_list, _sort_by_nodes_ai);
else if (params.sort[i] == 'c')
list_sort(sinfo_list, _sort_by_cpus);
else if (params.sort[i] == 'd')
@@ -87,7 +87,7 @@ void sort_sinfo_list(List sinfo_list)
else if (params.sort[i] == 'f')
list_sort(sinfo_list, _sort_by_features);
else if (params.sort[i] == 'F')
- list_sort(sinfo_list, _sort_by_nodes_at);
+ list_sort(sinfo_list, _sort_by_nodes_ai);
else if (params.sort[i] == 'g')
list_sort(sinfo_list, _sort_by_groups);
else if (params.sort[i] == 'h')
@@ -308,7 +308,7 @@ static int _sort_by_node_list(void *void1, void *void2)
return diff;
}
-static int _sort_by_nodes_at(void *void1, void *void2)
+static int _sort_by_nodes_ai(void *void1, void *void2)
{
int diff;
sinfo_data_t *sinfo1 = (sinfo_data_t *) void1;
--
GitLab