diff --git a/doc/man/man1/smap.1 b/doc/man/man1/smap.1
index c910330d1e0141e9ebbd0ac10f607b79368677df..5a387c4ab098316b8219a559b9bfab4df39fbfd3 100644
--- a/doc/man/man1/smap.1
+++ b/doc/man/man1/smap.1
@@ -26,6 +26,14 @@ all modes except for 'configure mode' user can type 'quit' to exit just
configure mode. Typing 'exit' will end the configuration mode and exit smap.
Note that unallocated nodes are indicated by a '.' and DOWN or DRAINED
nodes by a '#'.
+\fB\-R <RACK_MIDPLANE_ID/XYZ>\fR, \fB\-\-resolve=<RACK_MIDPLANE_ID/XYZ>\fR
+Returns the XYZ coords for a Rack/Midplane id or vice-versa.
+
+To get the XYZ coord for a Rack/Midplane id input -R R101 where 10 is the rack
+and 1 is the midplane.
+
+To get the Rack/Midplane id from a XYZ coord input -R 101 where X=1 Y=1 Z=1 with
+no leading 'R'.
.RS
.TP 15
.I "j"
@@ -44,6 +52,9 @@ Displays current node states and allows users to configure the system.
\fB\-h\fR, \fB\-\-noheader\fR
Do not print a header on the output.
.TP
+\fB\-c\fR, \fB\-\-commandline\fR
+Print output to the commandline, no curses.
+.TP
\fB\-i <seconds>\fR , \fB\-\-iterate=<seconds>\fR
Print the state on a periodic basis.
Sleep for the indicated number of seconds between reports.
@@ -174,6 +185,17 @@ Mode Type: \fBCOPROCESS\fR or \fBVIRTUAL\fR.
.TP
\fBINPUT COMMANDS\fR
.TP
+.I \fresolce <RACK_MIDPLANE_ID/XYZ>\fR
+Returns the XYZ coords for a Rack/Midplane id or vice-versa.
+
+To get the XYZ coord for a Rack/Midplane id input -R R101 where 10 is the rack
+and 1 is the midplane.
+
+To get the Rack/Midplane id from a XYZ coord input -R 101 where X=1 Y=1 Z=1 with
+no leading 'R'.
+
+.RS
+.TP
.I \fBcreate <size> <options>\fR
Submit request for partition creation. The size may be specified either
as a count of base partitions or specific dimensions in the X, Y and Z
diff --git a/slurm/slurm.h.in b/slurm/slurm.h.in
index d62a2c5c4a9e719c3b2875eee10d2c5c182f2a07..9ef3f0be5bc02ffb08d9c207728b04dcbb2eff9c 100644
--- a/slurm/slurm.h.in
+++ b/slurm/slurm.h.in
@@ -184,7 +184,8 @@ enum select_data_type {
enum select_print_mode {
SELECT_PRINT_HEAD, /* Print just the header */
SELECT_PRINT_DATA, /* Print just the data */
- SELECT_PRINT_MIXED /* Print "field=value" */
+ SELECT_PRINT_MIXED, /* Print "field=value" */
+ SELECT_PRINT_BGL_ID /* Print just the BGL_ID */
};
/* Possible task distributions across the nodes */
diff --git a/src/common/node_select.c b/src/common/node_select.c
index 983a66b715df43e920353a3012793412816f8729..57c4ecc72a4302fed7955e5b3f5a727d8e348ef2 100644
--- a/src/common/node_select.c
+++ b/src/common/node_select.c
@@ -621,35 +621,38 @@ extern char *select_g_sprint_jobinfo(select_jobinfo_t jobinfo,
}
switch (mode) {
- case SELECT_PRINT_HEAD:
- snprintf(buf, size,
- "CONNECT ROTATE NODE_USE GEOMETRY PART_ID");
- break;
- case SELECT_PRINT_DATA:
- snprintf(buf, size,
- "%7.7s %6.6s %8.8s %ux%ux%u %7s",
- _job_conn_type_string(jobinfo->conn_type),
- _job_rotate_string(jobinfo->rotate),
- _job_node_use_string(jobinfo->node_use),
- geometry[0], geometry[1], geometry[2],
- jobinfo->bgl_part_id);
- break;
- case SELECT_PRINT_MIXED:
- snprintf(buf, size,
- "Connection=%s Rotate=%s NodeUse=%s "
- "Geometry=%ux%ux%u Part_ID=%s",
- _job_conn_type_string(jobinfo->conn_type),
- _job_rotate_string(jobinfo->rotate),
- _job_node_use_string(jobinfo->node_use),
- geometry[0], geometry[1], geometry[2],
- jobinfo->bgl_part_id);
- break;
- default:
- error("select_g_sprint_jobinfo: bad mode %d", mode);
- if (size > 0)
- buf[0] = '\0';
+ case SELECT_PRINT_HEAD:
+ snprintf(buf, size,
+ "CONNECT ROTATE NODE_USE GEOMETRY PART_ID");
+ break;
+ case SELECT_PRINT_DATA:
+ snprintf(buf, size,
+ "%7.7s %6.6s %8.8s %ux%ux%u %7s",
+ _job_conn_type_string(jobinfo->conn_type),
+ _job_rotate_string(jobinfo->rotate),
+ _job_node_use_string(jobinfo->node_use),
+ geometry[0], geometry[1], geometry[2],
+ jobinfo->bgl_part_id);
+ break;
+ case SELECT_PRINT_MIXED:
+ snprintf(buf, size,
+ "Connection=%s Rotate=%s NodeUse=%s "
+ "Geometry=%ux%ux%u Part_ID=%s",
+ _job_conn_type_string(jobinfo->conn_type),
+ _job_rotate_string(jobinfo->rotate),
+ _job_node_use_string(jobinfo->node_use),
+ geometry[0], geometry[1], geometry[2],
+ jobinfo->bgl_part_id);
+ break;
+ case SELECT_PRINT_BGL_ID:
+ return jobinfo->bgl_part_id;
+ break;
+ default:
+ error("select_g_sprint_jobinfo: bad mode %d", mode);
+ if (size > 0)
+ buf[0] = '\0';
}
-
+
return buf;
}
diff --git a/src/partition_allocator/partition_allocator.c b/src/partition_allocator/partition_allocator.c
index 1fca02f1d074d070375e824ef6175d64c008d63d..1ddf3c6cf8086cf4cf44970a4b69c8ce24d6590f 100644
--- a/src/partition_allocator/partition_allocator.c
+++ b/src/partition_allocator/partition_allocator.c
@@ -240,7 +240,8 @@ int new_pa_request(pa_request_t* pa_request)
pa_request->geometry[X] = 1;
pa_request->geometry[Y] = geo[X] * geo[Y];
pa_request->geometry[Z] = geo[Z];
- _append_geo(pa_request->geometry, pa_request->elongate_geos, pa_request->rotate);
+ _append_geo(pa_request->geometry, pa_request->elongate_geos, pa_request->rotate);
+
}
if((geo[X]*geo[Z]) <= DIM_SIZE[Y]) {
pa_request->geometry[X] = 1;
@@ -711,6 +712,10 @@ void init_grid(node_info_msg_t * node_info_ptr)
pa_system_ptr->fill_in_value[x].color = z;
z++;
+
+ init_pair(pa_system_ptr->fill_in_value[x].color,
+ pa_system_ptr->fill_in_value[x].color,
+ COLOR_BLACK);
}
return;
}
@@ -724,7 +729,7 @@ int *find_bp_loc(char* bp_id)
while ((bp_map = list_next(itr)) != NULL)
if (!strcmp(bp_map->bp_id, bp_id))
break; /* we found it */
-
+
list_iterator_destroy(itr);
if(bp_map != NULL)
return bp_map->coord;
@@ -732,13 +737,36 @@ int *find_bp_loc(char* bp_id)
return NULL;
}
+char *find_bp_rack_mid(char* xyz)
+{
+ pa_bp_map_t *bp_map;
+ ListIterator itr;
+ int number;
+ int coord[PA_SYSTEM_DIMENSIONS];
+
+ number = atoi(&xyz[X]);
+ coord[X] = number / 100;
+ coord[Y] = (number % 100) / 10;
+ coord[Z] = (number % 10);
+ itr = list_iterator_create(bp_map_list);
+ while ((bp_map = list_next(itr)) != NULL)
+ if (bp_map->coord[X] == coord[X] &&
+ bp_map->coord[Y] == coord[Y] &&
+ bp_map->coord[Z] == coord[Z])
+ break; /* we found it */
+
+ list_iterator_destroy(itr);
+ if(bp_map != NULL)
+ return bp_map->bp_id;
+ else
+ return NULL;
+}
+
static void _bp_map_list_del(void *object)
{
pa_bp_map_t *bp_map = (pa_bp_map_t *)object;
if (bp_map) {
- xfree(bp_map->bp_id);
-
xfree(bp_map);
}
}
@@ -758,7 +786,7 @@ static void _set_bp_map(void)
bp_map_list = list_create(_bp_map_list_del);
if (!getenv("DB2INSTANCE") || !getenv("VWSPATH")) {
- fprintf(stderr, "Missing DB2INSTANCE or VWSPATH env var.\n"
+ error("Missing DB2INSTANCE or VWSPATH env var.\n"
"Execute 'db2profile'\n");
return;
}
@@ -773,7 +801,6 @@ static void _set_bp_map(void)
return;
}
if ((rc = rm_get_data(bgl, RM_BPNum, &bp_num)) != STATUS_OK) {
- //fprintf(stderr, "rm_get_data(RM_BPNum): %s\n", bgl_err_str(rc));
bp_num = 0;
}
@@ -782,41 +809,37 @@ static void _set_bp_map(void)
if (i) {
if ((rc = rm_get_data(bgl, RM_NextBP, &my_bp))
!= STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_NextBP): %s\n", */
-/* bgl_err_str(rc)); */
break;
}
} else {
if ((rc = rm_get_data(bgl, RM_FirstBP, &my_bp))
!= STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_FirstBP): %s\n", */
-/* bgl_err_str(rc)); */
break;
}
}
bp_map = (pa_bp_map_t *) xmalloc(sizeof(pa_bp_map_t));
- list_push(bp_map_list, bp_map);
if ((rc = rm_get_data(my_bp, RM_BPID, &bp_id))
!= STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_BPLoc): %s\n", */
-/* bgl_err_str(rc)); */
continue;
}
- bp_map->bp_id = strdup(bp_id);
if ((rc = rm_get_data(my_bp, RM_BPLoc, &bp_loc))
!= STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_BPLoc): %s\n", */
-/* bgl_err_str(rc)); */
+ xfree(bp_map);
continue;
}
+
+ bp_map->bp_id = strdup(bp_id);
bp_map->coord[X] = bp_loc.X;
bp_map->coord[Y] = bp_loc.Y;
bp_map->coord[Z] = bp_loc.Z;
+
+ list_push(bp_map_list, bp_map);
+
}
-
+ rm_free_BGL(bgl);
#else
return;
#endif
diff --git a/src/partition_allocator/partition_allocator.h b/src/partition_allocator/partition_allocator.h
index ae8a6b6f3fc9ea72434c73c0f54350a8f4f9c713..72a3458c51a6d089b191e2c82709015bdc8560ec 100644
--- a/src/partition_allocator/partition_allocator.h
+++ b/src/partition_allocator/partition_allocator.h
@@ -276,4 +276,9 @@ void init_grid(node_info_msg_t *node_info_ptr);
*/
int *find_bp_loc(char* bp_id);
+/**
+ * find a rack/midplace location
+ */
+char *find_bp_rack_mid(char* xyz);
+
#endif /* _PARTITION_ALLOCATOR_H_ */
diff --git a/src/plugins/select/bluegene/Makefile.am b/src/plugins/select/bluegene/Makefile.am
index 66aa171f998afcbe640d74a2e9274183b3b53c4f..30539cb2b79426a43c87c5928f21e843a52efc8e 100644
--- a/src/plugins/select/bluegene/Makefile.am
+++ b/src/plugins/select/bluegene/Makefile.am
@@ -27,3 +27,5 @@ bin_PROGRAMS = slurm_prolog slurm_epilog
slurm_prolog_SOURCES = slurm_prolog.c
slurm_epilog_SOURCES = slurm_epilog.c
+slurm_prolog_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BGL_LDFLAGS)
+slurm_epilog_LDFLAGS = -export-dynamic $(CMD_LDFLAGS) $(BGL_LDFLAGS)
diff --git a/src/plugins/select/bluegene/bgl_job_run.c b/src/plugins/select/bluegene/bgl_job_run.c
index 5868012caf7dcb0ebc14ba76d25f4d2a7391cabb..f16ad24dfd44ef21b826903722ae951f4bf9d933 100644
--- a/src/plugins/select/bluegene/bgl_job_run.c
+++ b/src/plugins/select/bluegene/bgl_job_run.c
@@ -204,19 +204,26 @@ static int _set_part_owner(pm_partition_id_t bgl_part_id, char *user)
int err_ret = SLURM_SUCCESS;
- /* find the partition */
+/* find the partition */
if ((rc = rm_get_partition(bgl_part_id, &part_elem)) != STATUS_OK) {
error("rm_get_partition(%s): %s", bgl_part_id, bgl_err_str(rc));
return SLURM_ERROR;
}
- /* set its owner */
- if ((rc = rm_set_data(part_elem, RM_PartitionUserName, &user))
- != STATUS_OK) {
- error("rm_set_date(%s, RM_PartitionUserName): %s", bgl_part_id,
+/* /\* set its owner *\/ */
+ if ((rc = rm_set_part_owner(bgl_part_id, user)) != STATUS_OK) {
+ error("rm_set_part_owner(%s,%s): %s", bgl_part_id, user,
bgl_err_str(rc));
- err_ret = SLURM_ERROR;
+ return SLURM_ERROR;
}
+
+
+/* if ((rc = rm_set_data(part_elem, RM_PartitionUserName, &user)) */
+/* != STATUS_OK) { */
+/* error("rm_set_date(%s, RM_PartitionUserName): %s", bgl_part_id, */
+/* bgl_err_str(rc)); */
+/* err_ret = SLURM_ERROR; */
+/* } */
if ((rc = rm_free_partition(part_elem)) != STATUS_OK)
error("rm_free_partition(): %s", bgl_err_str(rc));
diff --git a/src/plugins/select/bluegene/bluegene.c b/src/plugins/select/bluegene/bluegene.c
index 3950440d40afbb11312aeb96e304b5d46d1e6f51..d8c0982990bba6370994854d3c0cc6bff6e7812b 100644
--- a/src/plugins/select/bluegene/bluegene.c
+++ b/src/plugins/select/bluegene/bluegene.c
@@ -421,7 +421,7 @@ extern int create_static_partitions(List part_list)
set_bgl_part(bgl_record->bgl_part_list,
bgl_record->bp_count,
bgl_record->conn_type);
- bgl_record->node_use = SELECT_VIRTUAL_NODE_MODE;
+ bgl_record->node_use = SELECT_COPROCESSOR_MODE;
configure_partition(bgl_record);
print_bgl_record(bgl_record);
@@ -440,7 +440,7 @@ extern int create_static_partitions(List part_list)
found_record->conn_type = bgl_record->conn_type;
found_record->bitmap = bgl_record->bitmap;
- found_record->node_use = SELECT_COPROCESSOR_MODE;
+ found_record->node_use = SELECT_VIRTUAL_NODE_MODE;
configure_partition(found_record);
print_bgl_record(found_record);
diff --git a/src/plugins/select/bluegene/bluegene.h b/src/plugins/select/bluegene/bluegene.h
index 4522d1368e4f8540e8eee10c9882445467db76e4..2f5889627fac109e5b394908e0e60014ad027a8f 100644
--- a/src/plugins/select/bluegene/bluegene.h
+++ b/src/plugins/select/bluegene/bluegene.h
@@ -41,7 +41,6 @@
#include "src/partition_allocator/partition_allocator.h"
#ifdef HAVE_BGL_FILES
-# include "src/partition_allocator/tv.h"
# include "rm_api.h"
#else
diff --git a/src/plugins/select/bluegene/partition_sys.c b/src/plugins/select/bluegene/partition_sys.c
index bda80de77dba1f2d63bfb5704ab3d5397cd9bb9b..0867f99b705d1cac726a2acc88881ddf1f17c55e 100755
--- a/src/plugins/select/bluegene/partition_sys.c
+++ b/src/plugins/select/bluegene/partition_sys.c
@@ -183,7 +183,9 @@ int read_bgl_partitions()
rm_partition_t *part_ptr;
char node_name_tmp[7], *owner_name;
bgl_record_t *bgl_record;
-#if USE_BGL_FILE
+#ifndef USE_BGL_FILE
+ int *coord;
+ char *bp_id;
int part_number, lowest_part=300;
char part_name[7];
#endif
@@ -192,7 +194,11 @@ int read_bgl_partitions()
system to return correct location information
*/
return 1;
-#if USE_BGL_FILES
+#ifndef USE_BGL_FILES
+ if ((rc = rm_set_serial(BGL_SERIAL)) != STATUS_OK) {
+ error("rm_set_serial(): %d\n", rc);
+ return SLURM_ERROR;
+ }
for(part_number=101; part_number<lowest_part; part_number++) {
memset(part_name,0,7);
sprintf(part_name, "RMP%d", part_number);
@@ -242,18 +248,11 @@ int read_bgl_partitions()
}
debug("bp_id is %s\n",part_id);
-
- if ((rm_rc = rm_get_data(bp_ptr, RM_BPLoc, &bp_loc))
- != STATUS_OK) {
- error("rm_get_data(RM_BPLoc): %s",
- bgl_err_str(rm_rc));
- rc = SLURM_ERROR;
- break;
- }
+ coord = find_bp_loc(bp_id);
sprintf(node_name_tmp, "bgl%d%d%d",
- bp_loc.X, bp_loc.Y, bp_loc.Z);
-
+ coord[X], coord[Y], coord[Z]);
+
debug("adding %s to partition %s\n",node_name_tmp,part_name);
hostlist_push(bgl_record->hostlist, node_name_tmp);
diff --git a/src/smap/configure_functions.c b/src/smap/configure_functions.c
index dac59fa7c5699d4d66005e7e44f0f52ca7593b5c..90a0a8e74c3be92c48a6c47c36d2db94736abefd 100644
--- a/src/smap/configure_functions.c
+++ b/src/smap/configure_functions.c
@@ -38,6 +38,7 @@ typedef struct {
static void _delete_allocated_parts(List allocated_partitions);
static allocated_part_t *_make_request(pa_request_t *request);
static int _create_allocation(char *com, List allocated_partitions);
+static int _resolve(char *com);
static int _remove_allocation(char *com, List allocated_partitions);
static int _alter_allocation(char *com, List allocated_partitions);
static int _copy_allocation(char *com, List allocated_partitions);
@@ -202,6 +203,40 @@ static int _create_allocation(char *com, List allocated_partitions)
return 1;
}
+static int _resolve(char *com)
+{
+ int i=0;
+ while(com[i-1] != ' ' && com[i] != '\0')
+ i++;
+ if(com[i] == 'r')
+ com[0] = 'R';
+
+ memset(error_string,0,255);
+ if(com[i] != 'R') {
+ char *rack_mid = find_bp_rack_mid(com+i);
+ if(rack_mid)
+ sprintf(error_string, "X=%c Y=%c Z=%c resolves to %s\n",
+ com[X+i],com[Y+i],com[Z+i], rack_mid);
+ else
+ sprintf(error_string, "X=%c Y=%c Z=%c has no resolve\n",
+ params.partition[X],
+ params.partition[Y],
+ params.partition[Z]);
+
+ } else {
+ int *coord = find_bp_loc(com+i);
+ if(coord)
+ sprintf(error_string, "%s resolves to X=%d Y=%d Z=%d\n",
+ com+i,coord[X],coord[Y],coord[Z]);
+ else
+ sprintf(error_string, "%s has no resolve.\n",
+ params.partition);
+ }
+ wnoutrefresh(pa_system_ptr->text_win);
+ doupdate();
+ return 1;
+}
+
static int _remove_allocation(char *com, List allocated_partitions)
{
ListIterator results_i;
@@ -556,6 +591,11 @@ void get_command(void)
List allocated_partitions;
ListIterator results_i;
+ if(params.commandline) {
+ printf("Configure won't work with commandline mode.\n");
+ printf("Please remove the -c from the commandline.\n");
+ exit(0);
+ }
allocated_partitions = list_create(NULL);
text_width = pa_system_ptr->text_win->_maxx; // - pa_system_ptr->text_win->_begx;
@@ -596,8 +636,9 @@ void get_command(void)
}
list_iterator_destroy(results_i);
- wrefresh(pa_system_ptr->text_win);
- wrefresh(pa_system_ptr->grid_win);
+ wnoutrefresh(pa_system_ptr->text_win);
+ wnoutrefresh(pa_system_ptr->grid_win);
+ doupdate();
wclear(command_win);
box(command_win, 0, 0);
mvwprintw(command_win, 0, 3,
@@ -610,6 +651,9 @@ void get_command(void)
_delete_allocated_parts(allocated_partitions);
pa_fini();
exit(0);
+ } else if (!strncasecmp(com, "resolve", 7) ||
+ !strncasecmp(com, "r ", 2)) {
+ _resolve(com);
} else if (!strncasecmp(com, "resume", 6)) {
mvwprintw(pa_system_ptr->text_win,
pa_system_ptr->ycord,
diff --git a/src/smap/grid_functions.c b/src/smap/grid_functions.c
index 59c95000039d4af9d1c882508ecbda445ed8a0c2..289df9b0a7c33e3fccca85f11e40562dab393a47 100644
--- a/src/smap/grid_functions.c
+++ b/src/smap/grid_functions.c
@@ -55,7 +55,7 @@ extern int set_grid(int start, int end, int count)
return 1;
}
-extern int set_grid_bgl(int *start, int *end, int count)
+extern int set_grid_bgl(int *start, int *end, int count, int set)
{
int x, y, z;
int i = 0;
@@ -67,16 +67,20 @@ extern int set_grid_bgl(int *start, int *end, int count)
assert(start[Z] >= 0);
assert(count < pa_system_ptr->num_of_proc);
assert(count >= 0);
+ assert(set >= 0);
+ assert(set <= 2);
for (x = start[X]; x <= end[X]; x++) {
for (y = start[Y]; y <= end[Y]; y++) {
for (z = start[Z]; z <= end[Z]; z++) {
- pa_system_ptr->grid[x][y][z].letter =
- pa_system_ptr->
- fill_in_value[count].letter;
- pa_system_ptr->grid[x][y][z].color =
- pa_system_ptr->
- fill_in_value[count].color;
+ if(!set) {
+ pa_system_ptr->grid[x][y][z].letter =
+ pa_system_ptr->
+ fill_in_value[count].letter;
+ pa_system_ptr->grid[x][y][z].color =
+ pa_system_ptr->
+ fill_in_value[count].color;
+ }
i++;
}
}
diff --git a/src/smap/job_functions.c b/src/smap/job_functions.c
index af38f931a6cf22f5b3c6918c926f85f7b6d2b32e..2e7f845fa96cb71630b195e0da0407e02f267168 100644
--- a/src/smap/job_functions.c
+++ b/src/smap/job_functions.c
@@ -26,6 +26,7 @@
\*****************************************************************************/
#include "src/common/uid.h"
+#include "src/common/node_select.h"
#include "src/smap/smap.h"
static void _print_header_job(void);
@@ -67,12 +68,12 @@ extern void get_job(void)
recs = new_job_ptr->record_count;
else
recs = 0;
-
+
for (i = 0; i < recs; i++) {
job = new_job_ptr->job_array[i];
-
- if ((job.job_state >= JOB_COMPLETE)
- || (job.job_state < JOB_END))
+
+ if ((job.job_state == JOB_COMPLETE)
+ || (job.job_state == JOB_END))
continue; /* job has completed */
if (job.node_inx[0] != -1) {
@@ -99,9 +100,6 @@ extern void get_job(void)
count++;
} else if((job.job_state == JOB_PENDING)) {
//count--;
- init_pair(pa_system_ptr->fill_in_value[count].color,
- pa_system_ptr->fill_in_value[count].color,
- COLOR_BLACK);
job.nodes = "waiting...";
job.num_procs = (int) pa_system_ptr->fill_in_value[count].
letter;
@@ -123,35 +121,50 @@ extern void get_job(void)
static void _print_header_job(void)
{
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "ID");
- pa_system_ptr->xcord += 3;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, " JOBID");
- pa_system_ptr->xcord += 7;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "PARTITION");
- pa_system_ptr->xcord += 10;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "USER");
- pa_system_ptr->xcord += 9;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "NAME");
- pa_system_ptr->xcord += 10;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "ST");
- pa_system_ptr->xcord += 3;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, " TIME");
- pa_system_ptr->xcord += 11;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "NODES");
- pa_system_ptr->xcord += 6;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "NODELIST");
- pa_system_ptr->xcord = 1;
- pa_system_ptr->ycord++;
-
+ if(!params.commandline) {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "ID");
+ pa_system_ptr->xcord += 3;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "JOBID");
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "PARTITION");
+ pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "BGL_BLOCK");
+ pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "USER");
+ pa_system_ptr->xcord += 9;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "NAME");
+ pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "ST");
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "TIME");
+ pa_system_ptr->xcord += 5;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "NODES");
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "NODELIST");
+ pa_system_ptr->xcord = 1;
+ pa_system_ptr->ycord++;
+ } else {
+ printf("ID\t");
+ printf("JOBID\t");
+ printf("PARTITION\t");
+ printf("BGL_BLOCK\t");
+ printf("USER\t");
+ printf("NAME\t");
+ printf("ST\t");
+ printf("TIME\t");
+ printf("NODES\t");
+ printf("NODELIST\n");
+ }
}
static int _print_text_job(job_info_t * job_ptr)
@@ -164,61 +177,93 @@ static int _print_text_job(job_info_t * job_ptr)
int width = 0;
char time_buf[20];
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%c", job_ptr->num_procs);
- pa_system_ptr->xcord += 3;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%6d", job_ptr->job_id);
- pa_system_ptr->xcord += 7;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.10s", job_ptr->partition);
- pa_system_ptr->xcord += 10;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.8s", uid_to_string((uid_t) job_ptr->user_id));
- pa_system_ptr->xcord += 9;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.9s", job_ptr->name);
- pa_system_ptr->xcord += 10;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.2s",
- job_state_string_compact(job_ptr->job_state));
- pa_system_ptr->xcord += 3;
- if(!strcasecmp(job_ptr->nodes,"waiting...")) {
- sprintf(time_buf,"0:00:00");
- } else {
- time = pa_system_ptr->now_time - job_ptr->start_time;
- snprint_time(time_buf, sizeof(time_buf), time);
- }
- width = strlen(time_buf);
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord + (10 - width), "%s",
- time_buf);
- pa_system_ptr->xcord += 11;
+ if(!params.commandline) {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%c", job_ptr->num_procs);
+ pa_system_ptr->xcord += 3;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%d", job_ptr->job_id);
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.10s", job_ptr->partition);
+ pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.10s",
+ select_g_sprint_jobinfo(job_ptr->select_jobinfo,
+ time_buf,
+ sizeof(time_buf),
+ SELECT_PRINT_BGL_ID));
+ pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.8s", uid_to_string((uid_t) job_ptr->user_id));
+ pa_system_ptr->xcord += 9;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.9s", job_ptr->name);
+ pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.2s",
+ job_state_string_compact(job_ptr->job_state));
+ pa_system_ptr->xcord += 0;
+ if(!strcasecmp(job_ptr->nodes,"waiting...")) {
+ sprintf(time_buf,"0:00:00");
+ } else {
+ time = pa_system_ptr->now_time - job_ptr->start_time;
+ snprint_time(time_buf, sizeof(time_buf), time);
+ }
+ width = strlen(time_buf);
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord + (10 - width), "%s",
+ time_buf);
+ pa_system_ptr->xcord += 11;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%5d", job_ptr->num_nodes);
- pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%5d", job_ptr->num_nodes);
+ pa_system_ptr->xcord += 6;
- tempxcord = pa_system_ptr->xcord;
- //width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
+ tempxcord = pa_system_ptr->xcord;
+ //width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
- while (job_ptr->nodes[i] != '\0') {
- if ((printed = mvwaddch(pa_system_ptr->text_win,
- pa_system_ptr->ycord, pa_system_ptr->xcord,
- job_ptr->nodes[i])) < 0)
- return printed;
- pa_system_ptr->xcord++;
- width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
- if (job_ptr->nodes[i] == '[')
- prefixlen = i + 1;
- else if (job_ptr->nodes[i] == ',' && (width - 9) <= 0) {
- pa_system_ptr->ycord++;
- pa_system_ptr->xcord = tempxcord + prefixlen;
+ while (job_ptr->nodes[i] != '\0') {
+ if ((printed = mvwaddch(pa_system_ptr->text_win,
+ pa_system_ptr->ycord, pa_system_ptr->xcord,
+ job_ptr->nodes[i])) < 0)
+ return printed;
+ pa_system_ptr->xcord++;
+ width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
+ if (job_ptr->nodes[i] == '[')
+ prefixlen = i + 1;
+ else if (job_ptr->nodes[i] == ',' && (width - 9) <= 0) {
+ pa_system_ptr->ycord++;
+ pa_system_ptr->xcord = tempxcord + prefixlen;
+ }
+ i++;
}
- i++;
- }
- pa_system_ptr->xcord = 1;
- pa_system_ptr->ycord++;
+ pa_system_ptr->xcord = 1;
+ pa_system_ptr->ycord++;
+ } else {
+ printf("%c\t", job_ptr->num_procs);
+ printf("%d\t", job_ptr->job_id);
+ printf("%s\t", job_ptr->partition);
+ printf("%s\t",
+ select_g_sprint_jobinfo(job_ptr->select_jobinfo,
+ time_buf,
+ sizeof(time_buf),
+ SELECT_PRINT_BGL_ID));
+ printf("%s\t", uid_to_string((uid_t) job_ptr->user_id));
+ printf("%s\t", job_ptr->name);
+ printf("%s\t",
+ job_state_string_compact(job_ptr->job_state));
+ if(!strcasecmp(job_ptr->nodes,"waiting...")) {
+ sprintf(time_buf,"0:00:00");
+ } else {
+ time = pa_system_ptr->now_time - job_ptr->start_time;
+ snprint_time(time_buf, sizeof(time_buf), time);
+ }
+
+ printf("%s\t", time_buf);
+ printf("%d\t", job_ptr->num_nodes);
+ printf("%s\n", job_ptr->nodes);
+ }
return printed;
}
diff --git a/src/smap/opts.c b/src/smap/opts.c
index 8f04e97840ec65b514c118efb9c29647745d1eb1..cd67c8c32c2922e745e6010b864d86ffafb9d160 100644
--- a/src/smap/opts.c
+++ b/src/smap/opts.c
@@ -44,6 +44,8 @@ void parse_command_line(int argc, char *argv[])
{"noheader", no_argument, 0, 'h'},
{"iterate", required_argument, 0, 'i'},
{"version", no_argument, 0, 'V'},
+ {"commandline", no_argument, 0, 'c'},
+ {"resolve", required_argument, 0, 'R'},
{"help", no_argument, 0, OPT_LONG_HELP},
{"usage", no_argument, 0, OPT_LONG_USAGE},
{"hide", no_argument, 0, OPT_LONG_HIDE},
@@ -51,7 +53,7 @@ void parse_command_line(int argc, char *argv[])
};
while ((opt_char =
- getopt_long(argc, argv, "D:hi:V",
+ getopt_long(argc, argv, "D:hi:VcR:",
long_options, &option_index)) != -1) {
switch (opt_char) {
case (int) '?':
@@ -84,6 +86,13 @@ void parse_command_line(int argc, char *argv[])
case (int) 'V':
_print_version();
exit(0);
+ case (int) 'c':
+ params.commandline = TRUE;
+ break;
+ case (int) 'R':
+ params.commandline = TRUE;
+ params.partition = strdup(optarg);
+ break;
case (int) OPT_LONG_HELP:
_help();
exit(0);
@@ -155,6 +164,9 @@ Usage: smap [OPTIONS]\n\
-h, --noheader no headers on output\n\
-i, --iterate=seconds specify an interation period\n\
-V, --version output version information and exit\n\
+ -c, --commandline output written with straight to the commandline.\n\
+ -R, --resolve resolve an XYZ coord from a Rack/Midplane id or vice versa.\n\
+ (i.e. -R R101 for R/M input -R 101 for XYZ).\n\
\nHelp options:\n\
--help show this help message\n\
--usage display brief usage message\n");
diff --git a/src/smap/partition_functions.c b/src/smap/partition_functions.c
index 05280805868f01b4ad870b0f0a0742fe714ea31b..17456f158d8bf3801612a72f84cfadf5a9c31c1d 100644
--- a/src/smap/partition_functions.c
+++ b/src/smap/partition_functions.c
@@ -26,12 +26,6 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
\*****************************************************************************/
-#include <stdlib.h>
-
-#include "config.h"
-#include "src/common/hostlist.h"
-#include "src/common/list.h"
-#include "src/common/xmalloc.h"
#include "src/smap/smap.h"
#define _DEBUG 0
@@ -46,6 +40,9 @@ typedef struct {
enum node_use_type bgl_node_use;
rm_partition_state_t state;
hostlist_t hostlist;
+ int letter_num;
+ int start[PA_SYSTEM_DIMENSIONS];
+ int end[PA_SYSTEM_DIMENSIONS];
bool printed;
} db2_block_info_t;
@@ -56,11 +53,12 @@ static char* _convert_conn_type(enum connection_type conn_type);
static char* _convert_node_use(enum node_use_type node_use);
static void _print_header_part(void);
static char *_part_state_str(rm_partition_state_t state);
-static int _print_text_part(partition_info_t * part_ptr,
+static int _print_text_part(partition_info_t *part_ptr,
db2_block_info_t *db2_info_ptr);
static void _read_part_db2(void);
-static int _in_slurm_partition(char *nodes, int *first, int *last);
-static int _print_rest(void *object, void *arg);
+static int _set_start_finish(db2_block_info_t *db2_info_ptr);
+static int _in_slurm_partition(db2_block_info_t *db2_info_ptr, int *first, int *last);
+static int _print_rest(db2_block_info_t *block_ptr, int *count);
void get_slurm_part(void)
{
@@ -83,11 +81,16 @@ void get_slurm_part(void)
}
if (error_code) {
if (quiet_flag != 1) {
- mvwprintw(pa_system_ptr->text_win,
- pa_system_ptr->ycord, 1,
- "slurm_load_partitions: %s",
- slurm_strerror(slurm_get_errno()));
- pa_system_ptr->ycord++;
+ if(!params.commandline) {
+ mvwprintw(pa_system_ptr->text_win,
+ pa_system_ptr->ycord, 1,
+ "slurm_load_partitions: %s",
+ slurm_strerror(slurm_get_errno()));
+ pa_system_ptr->ycord++;
+ } else {
+ printf("slurm_load_partitions: %s",
+ slurm_strerror(slurm_get_errno()));
+ }
}
}
@@ -137,10 +140,7 @@ void get_bgl_part(void)
int error_code, i, j, recs=0, count = 0;
static partition_info_msg_t *part_info_ptr = NULL, *new_part_ptr;
partition_info_t part;
- //char node_entry[13];
int number, start[PA_SYSTEM_DIMENSIONS], end[PA_SYSTEM_DIMENSIONS];
- //db2_block_info_t *block_ptr;
- //bool lower;
db2_block_info_t *db2_info_ptr;
ListIterator itr;
@@ -160,11 +160,16 @@ void get_bgl_part(void)
if (error_code) {
if (quiet_flag != 1) {
- mvwprintw(pa_system_ptr->text_win,
- pa_system_ptr->ycord, 1,
- "slurm_load_partitions: %s",
- slurm_strerror(slurm_get_errno()));
- pa_system_ptr->ycord++;
+ if(!params.commandline) {
+ mvwprintw(pa_system_ptr->text_win,
+ pa_system_ptr->ycord, 1,
+ "slurm_load_partitions: %s",
+ slurm_strerror(slurm_get_errno()));
+ pa_system_ptr->ycord++;
+ } else {
+ printf("slurm_load_partitions: %s",
+ slurm_strerror(slurm_get_errno()));
+ }
}
}
@@ -208,16 +213,20 @@ void get_bgl_part(void)
if (block_list) {
itr = list_iterator_create(block_list);
- while ((db2_info_ptr = (db2_block_info_t*) list_next(itr)) != NULL)
- if(_in_slurm_partition(db2_info_ptr->nodes, start, end))
+ while ((db2_info_ptr = (db2_block_info_t*) list_next(itr)) != NULL) {
+ if(_in_slurm_partition(db2_info_ptr, start, end))
db2_info_ptr->slurm_part_name = xstrdup(part.name);
+ }
list_iterator_destroy(itr);
}
}
/* Report any BGL Blocks not in a SLURM partition */
if (block_list) {
- list_for_each(block_list, _print_rest, &count);
+ itr = list_iterator_create(block_list);
+ while ((db2_info_ptr = (db2_block_info_t*) list_next(itr)) != NULL)
+ _print_rest(db2_info_ptr, &count);
+ list_iterator_destroy(itr);
}
part_info_ptr = new_part_ptr;
@@ -226,45 +235,63 @@ void get_bgl_part(void)
static void _print_header_part(void)
{
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "ID");
- pa_system_ptr->xcord += 4;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "PARTITION");
- pa_system_ptr->xcord += 10;
+ if(!params.commandline) {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "ID");
+ pa_system_ptr->xcord += 4;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "PARTITION");
+ pa_system_ptr->xcord += 10;
- if (params.display != BGLPART) {
+ if (params.display != BGLPART) {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "AVAIL");
+ pa_system_ptr->xcord += 7;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "TIMELIMIT");
+ pa_system_ptr->xcord += 11;
+ } else {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "BGL_BLOCK");
+ pa_system_ptr->xcord += 12;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "STATE");
+ pa_system_ptr->xcord += 8;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "USER");
+ pa_system_ptr->xcord += 12;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "CONN");
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "NODE_USE");
+ pa_system_ptr->xcord += 10;
+ }
+
mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "AVAIL");
+ pa_system_ptr->xcord, "NODES");
pa_system_ptr->xcord += 7;
mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "TIMELIMIT");
- pa_system_ptr->xcord += 11;
+ pa_system_ptr->xcord, "NODELIST");
+ pa_system_ptr->xcord = 1;
+ pa_system_ptr->ycord++;
} else {
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "BGL_BLOCK");
- pa_system_ptr->xcord += 12;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "STATE");
- pa_system_ptr->xcord += 8;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "USER");
- pa_system_ptr->xcord += 12;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "CONN");
- pa_system_ptr->xcord += 6;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "NODE_USE");
- pa_system_ptr->xcord += 10;
- }
+ printf("\nID\t");
+ printf("PARTITION\t");
+ if (params.display != BGLPART) {
+ printf("AVAIL\t");
+ printf("TIMELIMIT\t");
+ } else {
+ printf("BGL_BLOCK\t");
+ printf("STATE\t");
+ printf("USER\t");
+ printf("CONN\t");
+ printf("NODE_USE\t");
+ }
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "NODES");
- pa_system_ptr->xcord += 7;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "NODELIST");
- pa_system_ptr->xcord = 1;
- pa_system_ptr->ycord++;
+ printf("NODES\t");
+ printf("NODELIST\n");
+ }
}
static char *_part_state_str(rm_partition_state_t state)
@@ -304,129 +331,185 @@ static int _print_text_part(partition_info_t * part_ptr,
int width = 0;
char *nodes, time_buf[20];
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%c", part_ptr->root_only);
- pa_system_ptr->xcord += 4;
-
- if (part_ptr->name) {
+ if(!params.commandline) {
mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.9s", part_ptr->name);
- pa_system_ptr->xcord += 10;
- if (params.display != BGLPART) {
- if (part_ptr->state_up)
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "UP");
- else
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "DOWN");
- pa_system_ptr->xcord += 7;
+ pa_system_ptr->xcord, "%c", part_ptr->root_only);
+ pa_system_ptr->xcord += 4;
+
+ if (part_ptr->name) {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.9s", part_ptr->name);
+ pa_system_ptr->xcord += 10;
+ if (params.display != BGLPART) {
+ if (part_ptr->state_up)
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "UP");
+ else
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "DOWN");
+ pa_system_ptr->xcord += 7;
- if (part_ptr->max_time == INFINITE)
- snprintf(time_buf, sizeof(time_buf), "UNLIMITED");
- else {
- snprint_time(time_buf, sizeof(time_buf),
- (part_ptr->max_time * 60));
- }
+ if (part_ptr->max_time == INFINITE)
+ snprintf(time_buf, sizeof(time_buf), "UNLIMITED");
+ else {
+ snprint_time(time_buf, sizeof(time_buf),
+ (part_ptr->max_time * 60));
+ }
- width = strlen(time_buf);
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord + (9 - width), "%s",
- time_buf);
- pa_system_ptr->xcord += 11;
- }
- } else
- pa_system_ptr->xcord += 10;
+ width = strlen(time_buf);
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord + (9 - width), "%s",
+ time_buf);
+ pa_system_ptr->xcord += 11;
+ }
+ } else
+ pa_system_ptr->xcord += 10;
- if (params.display == BGLPART) {
- if (db2_info_ptr) {
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.11s",
- db2_info_ptr->bgl_block_name);
- pa_system_ptr->xcord += 12;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, _part_state_str(db2_info_ptr->state));
+ if (params.display == BGLPART) {
+ if (db2_info_ptr) {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.11s",
+ db2_info_ptr->bgl_block_name);
+ pa_system_ptr->xcord += 12;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, _part_state_str(db2_info_ptr->state));
pa_system_ptr->xcord += 8;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.11s",
- db2_info_ptr->bgl_user_name);
- pa_system_ptr->xcord += 12;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.11s",
+ db2_info_ptr->bgl_user_name);
+ pa_system_ptr->xcord += 12;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.5s",
- _convert_conn_type(
- db2_info_ptr->bgl_conn_type));
- pa_system_ptr->xcord += 6;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%.9s",
- _convert_node_use(
- db2_info_ptr->bgl_node_use));
- pa_system_ptr->xcord += 10;
- } else {
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "?");
- pa_system_ptr->xcord += 12;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "?");
- pa_system_ptr->xcord += 8;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "?");
- pa_system_ptr->xcord += 12;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "?");
- pa_system_ptr->xcord += 6;
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "?");
- pa_system_ptr->xcord += 10;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.5s",
+ _convert_conn_type(
+ db2_info_ptr->bgl_conn_type));
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%.9s",
+ _convert_node_use(
+ db2_info_ptr->bgl_node_use));
+ pa_system_ptr->xcord += 10;
+ } else {
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "?");
+ pa_system_ptr->xcord += 12;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "?");
+ pa_system_ptr->xcord += 8;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "?");
+ pa_system_ptr->xcord += 12;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "?");
+ pa_system_ptr->xcord += 6;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "?");
+ pa_system_ptr->xcord += 10;
+ }
}
- }
- mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
- pa_system_ptr->xcord, "%5d", part_ptr->total_nodes);
- pa_system_ptr->xcord += 7;
+ mvwprintw(pa_system_ptr->text_win, pa_system_ptr->ycord,
+ pa_system_ptr->xcord, "%5d", part_ptr->total_nodes);
+ pa_system_ptr->xcord += 7;
- tempxcord = pa_system_ptr->xcord;
- //width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
- if (params.display == BGLPART)
- nodes = part_ptr->allow_groups;
- else
- nodes = part_ptr->nodes;
- prefixlen = i;
- while (nodes[i] != '\0') {
- width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
-
- if (!prefixlen && nodes[i] == '[' && nodes[i - 1] == ',')
- prefixlen = i + 1;
-
- if (nodes[i - 1] == ',' && (width - 12) <= 0) {
- pa_system_ptr->ycord++;
- pa_system_ptr->xcord = tempxcord + prefixlen;
- } else if (pa_system_ptr->xcord >
- pa_system_ptr->text_win->_maxx) {
- pa_system_ptr->ycord++;
- pa_system_ptr->xcord = tempxcord + prefixlen;
- }
+ tempxcord = pa_system_ptr->xcord;
+ //width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
+ if (params.display == BGLPART)
+ nodes = part_ptr->allow_groups;
+ else
+ nodes = part_ptr->nodes;
+ prefixlen = i;
+ while (nodes[i] != '\0') {
+ width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
+
+ if (!prefixlen && nodes[i] == '[' && nodes[i - 1] == ',')
+ prefixlen = i + 1;
+
+ if (nodes[i - 1] == ',' && (width - 12) <= 0) {
+ pa_system_ptr->ycord++;
+ pa_system_ptr->xcord = tempxcord + prefixlen;
+ } else if (pa_system_ptr->xcord >
+ pa_system_ptr->text_win->_maxx) {
+ pa_system_ptr->ycord++;
+ pa_system_ptr->xcord = tempxcord + prefixlen;
+ }
- if ((printed = mvwaddch(pa_system_ptr->text_win,
- pa_system_ptr->ycord, pa_system_ptr->xcord,
- nodes[i])) < 0)
- return printed;
- pa_system_ptr->xcord++;
+ if ((printed = mvwaddch(pa_system_ptr->text_win,
+ pa_system_ptr->ycord, pa_system_ptr->xcord,
+ nodes[i])) < 0)
+ return printed;
+ pa_system_ptr->xcord++;
- i++;
- }
+ i++;
+ }
+
+ pa_system_ptr->xcord = 1;
+ pa_system_ptr->ycord++;
+ } else {
+ printf("%c\t", part_ptr->root_only);
+
+ if (part_ptr->name) {
+ printf("%s\t", part_ptr->name);
+ pa_system_ptr->xcord += 10;
+ if (params.display != BGLPART) {
+ if (part_ptr->state_up)
+ printf("UP\t");
+ else
+ printf("DOWN\t");
+
+ if (part_ptr->max_time == INFINITE)
+ snprintf(time_buf, sizeof(time_buf), "UNLIMITED");
+ else {
+ snprint_time(time_buf, sizeof(time_buf),
+ (part_ptr->max_time * 60));
+ }
+
+ width = strlen(time_buf);
+ printf("%s\t", time_buf);
+
+ }
+ } else
+ pa_system_ptr->xcord += 10;
- pa_system_ptr->xcord = 1;
- pa_system_ptr->ycord++;
+ if (params.display == BGLPART) {
+ if (db2_info_ptr) {
+ printf("%s\t", db2_info_ptr->bgl_block_name);
+ printf("%s\t", _part_state_str(db2_info_ptr->state));
+
+ printf("%s\t", db2_info_ptr->bgl_user_name);
+
+ printf("%s\t", _convert_conn_type(
+ db2_info_ptr->bgl_conn_type));
+ printf("%s\t", _convert_node_use(
+ db2_info_ptr->bgl_node_use));
+ } else {
+ printf("?\t");
+ printf("?\t");
+ printf("?\t");
+ printf("?\t");
+ printf("?\t");
+ }
+ }
+ printf("%d\t", part_ptr->total_nodes);
+
+ tempxcord = pa_system_ptr->xcord;
+ //width = pa_system_ptr->text_win->_maxx - pa_system_ptr->xcord;
+ if (params.display == BGLPART)
+ nodes = part_ptr->allow_groups;
+ else
+ nodes = part_ptr->nodes;
+ printf("%s\n",nodes);
+ }
return printed;
}
#ifdef HAVE_BGL_FILES
static void _block_list_del(void *object)
{
- db2_block_info_t *block_ptr;
+ db2_block_info_t *block_ptr = (db2_block_info_t *)object;
if (block_ptr) {
xfree(block_ptr->bgl_user_name);
@@ -476,144 +559,139 @@ char *bgl_err_str(status_t inx)
return "?";
}
-static int _part_list_find(void *object, void *key)
-{
- db2_block_info_t *block_ptr = (db2_block_info_t *) object;
- char *block_name = (char *) key;
-
- if (!block_ptr || (block_ptr->bgl_block_name == NULL)) {
- fprintf(stderr, "_part_list_find: block_ptr == NULL\n");
- return -1;
- }
- if (!block_name) {
- fprintf(stderr, "_part_list_find: key == NULL\n");
- return -1;
- }
- if (strcmp(block_ptr->bgl_block_name, block_name) == 0)
- return 1;
- return 0;
-}
static int _list_match_all(void *object, void *key)
{
+
return 1;
}
-static int _clear_printed_flag(void *object, void *arg)
-{
- db2_block_info_t *block_ptr = (db2_block_info_t *) object;
- block_ptr->printed = false;
- return SLURM_SUCCESS;
-}
#endif
-static int _in_slurm_partition(char *nodes, int *first, int *last)
+static int _set_start_finish(db2_block_info_t *db2_info_ptr)
{
int number;
- int start[PA_SYSTEM_DIMENSIONS], end[PA_SYSTEM_DIMENSIONS];
int j=0;
- while (nodes[j] != '\0') {
- if ((nodes[j] == '[')
- && (nodes[j+8] == ']')
- && ((nodes[j+4] == 'x')
- || (nodes[j+4] == '-'))) {
+ while (db2_info_ptr->nodes[j] != '\0') {
+ if ((db2_info_ptr->nodes[j] == '[')
+ && (db2_info_ptr->nodes[j+8] == ']')
+ && ((db2_info_ptr->nodes[j+4] == 'x')
+ || (db2_info_ptr->nodes[j+4] == '-'))) {
j++;
- number = atoi(nodes + j);
- start[X] = number / 100;
- start[Y] = (number % 100) / 10;
- start[Z] = (number % 10);
+ number = atoi(db2_info_ptr->nodes + j);
+ db2_info_ptr->start[X] = number / 100;
+ db2_info_ptr->start[Y] = (number % 100) / 10;
+ db2_info_ptr->start[Z] = (number % 10);
j += 4;
- number = atoi(nodes + j);
- end[X] = number / 100;
- end[Y] = (number % 100) / 10;
- end[Z] = (number % 10);
+ number = atoi(db2_info_ptr->nodes + j);
+ db2_info_ptr->end[X] = number / 100;
+ db2_info_ptr->end[Y] = (number % 100) / 10;
+ db2_info_ptr->end[Z] = (number % 10);
j += 5;
- if(nodes[j] != ',')
+ if(db2_info_ptr->nodes[j] != ',')
break;
- } else if((nodes[j] < 58 && nodes[j] > 47)
- && nodes[j-1] != '[') {
- number = atoi(nodes + j);
- start[X] = end[X] = number / 100;
- start[Y] = end[Y] = (number % 100) / 10;
- start[Z] = end[Z] = (number % 10);
+ } else if((db2_info_ptr->nodes[j] < 58 && db2_info_ptr->nodes[j] > 47)
+ && db2_info_ptr->nodes[j-1] != '[') {
+ number = atoi(db2_info_ptr->nodes + j);
+ db2_info_ptr->start[X] = db2_info_ptr->end[X] = number / 100;
+ db2_info_ptr->start[Y] = db2_info_ptr->end[Y] = (number % 100) / 10;
+ db2_info_ptr->start[Z] = db2_info_ptr->end[Z] = (number % 10);
j+=3;
- if(nodes[j] != ',')
+ if(db2_info_ptr->nodes[j] != ',')
break;
}
j++;
}
- if((start[X]>=first[X])
- && (start[Y]>=first[Y])
- && (start[Z]>=first[Z])
- && (end[X]<=last[X])
- && (end[Y]<=last[Y])
- && (end[Z]<=last[Z]))
+ /* printf("setting %s start = %d%d%d end = %d%d%d\n", db2_info_ptr->nodes, */
+/* db2_info_ptr->start[X],db2_info_ptr->start[Y],db2_info_ptr->start[Z], */
+/* db2_info_ptr->end[X],db2_info_ptr->end[Y],db2_info_ptr->end[Z]); */
+ return 1;
+}
+
+static int _in_slurm_partition(db2_block_info_t *db2_info_ptr, int *first, int *last)
+{
+ if((db2_info_ptr->start[X]>=first[X])
+ && (db2_info_ptr->start[Y]>=first[Y])
+ && (db2_info_ptr->start[Z]>=first[Z])
+ && (db2_info_ptr->end[X]<=last[X])
+ && (db2_info_ptr->end[Y]<=last[Y])
+ && (db2_info_ptr->end[Z]<=last[Z]))
return 1;
else
return 0;
}
-static int _print_rest(void *object, void *arg)
+static int _print_rest(db2_block_info_t *block_ptr, int *count)
{
- db2_block_info_t *block_ptr = (db2_block_info_t *) object;
- int *count = (int *) arg;
- int number;
- int start[PA_SYSTEM_DIMENSIONS], end[PA_SYSTEM_DIMENSIONS];
+ //static rm_BGL_t *bgl = NULL;
partition_info_t part;
-
+ db2_block_info_t *db2_info_ptr;
+ ListIterator itr;
+ int set = 0;
if (block_ptr->printed)
return SLURM_SUCCESS;
-
- part.total_nodes = 0;
- if (block_ptr->nodes[11] == ']') { /* "bgl[###x###]" */
- number = atoi(block_ptr->nodes + 4);
- start[X] = number / 100;
- start[Y] = (number % 100) / 10;
- start[Z] = (number % 10);
-
- number = atoi(block_ptr->nodes + 8);
- end[X] = number / 100;
- end[Y] = (number % 100) / 10;
- end[Z] = (number % 10);
-
- part.total_nodes += set_grid_bgl(start, end, *count);
- } else { /* any other format */
- hostlist_t hostlist;
- hostlist_iterator_t host_iter;
- char *host_name;
-
- hostlist = hostlist_create(block_ptr->nodes);
- host_iter = hostlist_iterator_create(hostlist);
- while ((host_name = hostlist_next(host_iter))) {
- number = atoi(host_name + 3);
- start[X] = number / 100;
- start[Y] = (number % 100) / 10;
- start[Z] = (number % 10);
-
- part.total_nodes += set_grid_bgl(start, start, *count);
- free(host_name);
+ part.total_nodes = 0;
+
+ if (block_list) {
+ itr = list_iterator_create(block_list);
+ while ((db2_info_ptr = (db2_block_info_t*) list_next(itr)) != NULL) {
+ //printf("looking at %s %s\n", block_ptr->bgl_block_name, db2_info_ptr->bgl_block_name);
+ if(!strcmp(block_ptr->bgl_block_name, db2_info_ptr->bgl_block_name)) {
+ if(set == 2)
+ break;
+ set = 0;
+ break;
+ }
+ if((block_ptr->start[X]==db2_info_ptr->start[X] &&
+ block_ptr->start[Y]==db2_info_ptr->start[Y] &&
+ block_ptr->start[Z]==db2_info_ptr->start[Z]) &&
+ (block_ptr->end[X]==db2_info_ptr->end[X] &&
+ block_ptr->end[Y]==db2_info_ptr->end[Y] &&
+ block_ptr->end[Z]==db2_info_ptr->end[Z])) {
+ set = 1;
+ break;
+ }
+
+ if((block_ptr->start[X]<=db2_info_ptr->start[X] &&
+ block_ptr->start[Y]<=db2_info_ptr->start[Y] &&
+ block_ptr->start[Z]<=db2_info_ptr->start[Z]) &&
+ (block_ptr->end[X]>=db2_info_ptr->end[X] &&
+ block_ptr->end[Y]>=db2_info_ptr->end[Y] &&
+ block_ptr->end[Z]>=db2_info_ptr->end[Z])) {
+ set = 2;
+ continue;
+ }
}
- hostlist_iterator_destroy(host_iter);
- hostlist_destroy(hostlist);
+ list_iterator_destroy(itr);
}
+
+ if (set == 1) {
+ block_ptr->letter_num=db2_info_ptr->letter_num;
+ part.total_nodes += set_grid_bgl(block_ptr->start, block_ptr->end, block_ptr->letter_num, set);
+ } else {
+ block_ptr->letter_num=*count;
+ part.total_nodes += set_grid_bgl(block_ptr->start, block_ptr->end, block_ptr->letter_num, set);
+ (*count)++;
+ }
if(block_ptr->slurm_part_name)
part.name = block_ptr->slurm_part_name;
else
part.name = "no part";
+
part.allow_groups = block_ptr->nodes;
- part.root_only = (int) pa_system_ptr->fill_in_value[*count].letter;
+ part.root_only = (int) pa_system_ptr->fill_in_value[block_ptr->letter_num].letter;
+
wattron(pa_system_ptr->text_win,
- COLOR_PAIR(pa_system_ptr->fill_in_value[*count].color));
+ COLOR_PAIR(pa_system_ptr->fill_in_value[block_ptr->letter_num].color));
_print_text_part(&part, block_ptr);
wattroff(pa_system_ptr->text_win,
- COLOR_PAIR(pa_system_ptr->fill_in_value[*count].color));
- (*count)++;
+ COLOR_PAIR(pa_system_ptr->fill_in_value[block_ptr->letter_num].color));
return SLURM_SUCCESS;
}
@@ -622,14 +700,15 @@ static int _post_block_read(void *object, void *arg)
{
db2_block_info_t *block_ptr = (db2_block_info_t *) object;
int len = 1024;
-
+
block_ptr->nodes = xmalloc(len);
while (hostlist_ranged_string(block_ptr->hostlist, len,
block_ptr->nodes) < 0) {
len *= 2;
xrealloc(block_ptr->nodes, len);
}
-
+ _set_start_finish(block_ptr);
+
return SLURM_SUCCESS;
}
#endif
@@ -638,46 +717,28 @@ static void _read_part_db2(void)
{
#ifdef HAVE_BGL_FILES
status_t rc;
- static rm_BGL_t *bgl = NULL;
- rm_BP_t *my_bp;
+/* static rm_BGL_t *bgl = NULL; */
int bp_num, i;
- rm_location_t bp_loc;
- pm_partition_id_t part_id;
+ char *bp_id;
rm_partition_t *part_ptr;
- char bgl_node[16];
db2_block_info_t *block_ptr;
//block_t *block_ptr;
char *user_name;
+ int part_number;
+ char part_name[7];
+ char node_name_tmp[7];
+ rm_element_t *bp_ptr;
+ int *coord;
+ rm_connection_type_t conn_type;
+ rm_partition_mode_t node_use;
+
+ if ((rc = rm_set_serial(BGL_SERIAL)) != STATUS_OK) {
+ error("rm_set_serial(): %d\n", rc);
+ return;
+ }
- /* if (bgl) { */
-/* /\* if we have a single base partition, we can't */
-/* * run rm_bgl_free, so just read the data once */
-/* * and never free it. There is also no sense in */
-/* * processing it again either. *\/ */
-/* printf("suck again\n"); */
-/* list_for_each(block_list, _clear_printed_flag, NULL); */
-/* return; */
-/* } else { */
- if (!getenv("DB2INSTANCE") || !getenv("VWSPATH")) {
- fprintf(stderr, "Missing DB2INSTANCE or VWSPATH env var.\n"
- "Execute 'db2profile'\n");
- return;
- }
-
- if ((rc = rm_set_serial(BGL_SERIAL)) != STATUS_OK) {
- error("rm_set_serial(): %s\n", bgl_err_str(rc));
- return;
- }
-
- if ((rc = rm_get_BGL(&bgl)) != STATUS_OK) {
- error("rm_get_BGL(): %s\n", bgl_err_str(rc));
- return;
- }
- //}
-
if (block_list) {
/* clear the old list */
-
list_delete_all(block_list, _list_match_all, NULL);
} else {
block_list = list_create(_block_list_del);
@@ -685,123 +746,89 @@ static void _read_part_db2(void)
fprintf(stderr, "malloc error\n");
return;
}
- }
-
- if ((rc = rm_get_data(bgl, RM_BPNum, &bp_num)) != STATUS_OK) {
- //fprintf(stderr, "rm_get_data(RM_BPNum): %s\n", bgl_err_str(rc));
- bp_num = 0;
- }
+ }
- for (i=0; i<bp_num; i++) {
- if (i) {
- if ((rc = rm_get_data(bgl, RM_NextBP, &my_bp))
+ for(part_number=101; part_number<300; part_number++) {
+ memset(part_name,0,7);
+ sprintf(part_name, "RMP%d", part_number);
+ //printf("Checking if Partition %s is free",part_name);
+ if ((rc = rm_get_partition(part_name, &part_ptr))
+ != STATUS_OK) {
+ break;
+ }
+
+ if ((rc = rm_get_data(part_ptr, RM_PartitionBPNum, &bp_num)) != STATUS_OK) {
+ error("rm_get_data(RM_BPNum): %s", bgl_err_str(rc));
+ bp_num = 0;
+ }
+ if(bp_num==0)
+ continue;
+ if ((rc = rm_get_data(part_ptr, RM_PartitionFirstBP, &bp_ptr))
+ != STATUS_OK) {
+ error("rm_get_data(RM_FirstBP): %s",
+ bgl_err_str(rc));
+ rc = SLURM_ERROR;
+ return;
+ }
+ block_ptr = xmalloc(sizeof(db2_block_info_t));
+ list_append(block_list, block_ptr);
+ block_ptr->bgl_block_name = xstrdup(part_name);
+
+ block_ptr->hostlist = hostlist_create(NULL);
+
+ for (i=0; i<bp_num; i++) {
+ if ((rc = rm_get_data(bp_ptr, RM_BPID, &bp_id))
!= STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_NextBP): %s\n", */
-/* bgl_err_str(rc)); */
+ error("rm_get_data(RM_BPLoc): %s",
+ bgl_err_str(rc));
+ rc = SLURM_ERROR;
break;
}
- } else {
- if ((rc = rm_get_data(bgl, RM_FirstBP, &my_bp))
+ coord = find_bp_loc(bp_id);
+
+ sprintf(node_name_tmp, "bgl%d%d%d",
+ coord[X], coord[Y], coord[Z]);
+
+ hostlist_push(block_ptr->hostlist, node_name_tmp);
+ if ((rc = rm_get_data(part_ptr, RM_PartitionNextBP, &bp_ptr))
!= STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_FirstBP): %s\n", */
-/* bgl_err_str(rc)); */
+ error("rm_get_data(RM_NextBP): %s",
+ bgl_err_str(rc));
+ rc = SLURM_ERROR;
break;
}
+ }
+ if ((rc = rm_get_data(part_ptr,
+ RM_PartitionState,
+ &block_ptr->state)) != STATUS_OK) {
}
- if ((rc = rm_get_data(my_bp, RM_BPLoc, &bp_loc))
- != STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_BPLoc): %s\n", */
-/* bgl_err_str(rc)); */
- continue;
- }
- snprintf(bgl_node, sizeof(bgl_node), "bgl%d%d%d",
- bp_loc.X, bp_loc.Y, bp_loc.Z);
-
- if ((rc = rm_get_data(my_bp, RM_BPPartID, &part_id))
- != STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(RM_BPPartId): %s\n", */
-/* bgl_err_str(rc)); */
- continue;
- }
- if (!part_id || (part_id[0] == '\0')) {
-#if 1
- /* this is a problem on the 128 c-node system */
- part_id = "LLNL_128_16";
-#else
- fprintf(stderr, "BPPartId=NULL\n");
- continue;
-#endif
- }
- //if(!strncmp("RMP",part_id,3)) {
- block_ptr = list_find_first(block_list,
- _part_list_find, part_id);
- if (!block_ptr) {
- /* New BGL partition record */
- rm_connection_type_t conn_type;
- rm_partition_mode_t node_use;
- if ((rc = rm_get_partition(part_id, &part_ptr))
- != STATUS_OK) {
- /*fprintf(stderr, "rm_get_partition(%s): %s\n",
- part_id, bgl_err_str(rc));*/
- continue;
- }
+ if ((rc = rm_get_data(part_ptr,
+ RM_PartitionUserName,
+ &user_name)) != STATUS_OK) {
+ } else
+ block_ptr->bgl_user_name = xstrdup(user_name);
- block_ptr = xmalloc(sizeof(db2_block_info_t));
- list_push(block_list, block_ptr);
- block_ptr->bgl_block_name = xstrdup(part_id);
-
- if ((rc = rm_get_data(part_ptr,
- RM_PartitionState,
- &block_ptr->state)) != STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(" */
-/* "RM_PartitionState): %s\n", */
-/* bgl_err_str(rc)); */
- }
-
- if ((rc = rm_get_data(part_ptr,
- RM_PartitionUserName,
- &user_name)) != STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(" */
-/* "RM_PartitionUserName): %s\n", */
-/* bgl_err_str(rc)); */
- } else
- block_ptr->bgl_user_name = xstrdup(user_name);
-
- if ((rc = rm_get_data(part_ptr,
- RM_PartitionConnection,
- &conn_type)) != STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(" */
-/* "RM_PartitionConnection): %s\n", */
-/* bgl_err_str(rc)); */
- block_ptr->bgl_conn_type = SELECT_NAV;
- } else
- block_ptr->bgl_conn_type = conn_type;
- if ((rc = rm_get_data(part_ptr, RM_PartitionMode,
- &node_use))
- != STATUS_OK) {
- /* fprintf(stderr, "rm_get_data(" */
-/* "RM_PartitionMode): %s\n", */
-/* bgl_err_str(rc)); */
- block_ptr->bgl_node_use = SELECT_NAV_MODE;
- } else
- block_ptr->bgl_node_use = node_use;
- if ((rc = rm_free_partition(part_ptr)) != STATUS_OK) {
- /* fprintf(stderr, "rm_free_partition(): %s\n", */
-/* bgl_err_str(rc)); */
- }
- block_ptr->hostlist = hostlist_create(bgl_node);
- } else {
- /* Add node name to existing BGL partition record */
- hostlist_push(block_ptr->hostlist, bgl_node);
- }
- // }
+ if ((rc = rm_get_data(part_ptr,
+ RM_PartitionConnection,
+ &conn_type)) != STATUS_OK) {
+ block_ptr->bgl_conn_type = SELECT_NAV;
+ } else
+ block_ptr->bgl_conn_type = conn_type;
+ if ((rc = rm_get_data(part_ptr, RM_PartitionMode,
+ &node_use))
+ != STATUS_OK) {
+ block_ptr->bgl_node_use = SELECT_NAV_MODE;
+ } else
+ block_ptr->bgl_node_use = node_use;
+
+ if ((rc = rm_free_partition(part_ptr)) != STATUS_OK) {
+ }
}
/* perform post-processing for each bluegene partition */
list_for_each(block_list, _post_block_read, NULL);
- rm_free_BGL(bgl);
#endif
}
diff --git a/src/smap/smap.c b/src/smap/smap.c
index ec9bdcbbca3df6fa229755ff8d65f8fbd6bcc4a4..32ae8ea8a01fe0d500290675bc58f70a1d15e4a3 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -62,24 +62,22 @@ int main(int argc, char *argv[])
parse_command_line(argc, argv);
#ifdef HAVE_BGL
error_code = slurm_load_node((time_t) NULL, &node_info_ptr, 0);
+
if (error_code) {
#ifdef HAVE_BGL_FILES
int rc;
rm_BGL_t *bgl;
rm_size3D_t bp_size;
if ((rc = rm_set_serial(BGL_SERIAL)) != STATUS_OK) {
- fatal("init_bgl: rm_set_serial(): %s", bgl_err_str(rc));
- return SLURM_ERROR;
+ exit(-1);
}
if ((rc = rm_get_BGL(&bgl)) != STATUS_OK) {
- fatal("init_bgl: rm_get_BGL(): %s", bgl_err_str(rc));
- return SLURM_ERROR;
+ exit(-1);
}
if ((rc = rm_get_data(bgl, RM_Msize, &bp_size)) != STATUS_OK) {
- fatal("init_bgl: rm_get_data(): %s", bgl_err_str(rc));
- return SLURM_ERROR;
+ exit(-1);
}
verbose("BlueGene configured with %d x %d x %d base partitions",
bp_size.X, bp_size.Y, bp_size.Z);
@@ -88,60 +86,92 @@ int main(int argc, char *argv[])
DIM_SIZE[Z]=bp_size.Z;
rm_free_BGL(bgl);
#else
- slurm_perror("slurm_load_node");
+ slurm_perror("slurm_load_node");
exit(0);
#endif
pa_init(NULL);
} else {
pa_init(node_info_ptr);
- }
+ }
+
#else
- error("This will only run on a BGL system right now.\n");
- exit(0);
+ error("This will only run on a BGL system right now.\n");
+ exit(0);
#endif
-
- height = DIM_SIZE[Y] * DIM_SIZE[Z] + DIM_SIZE[Y] + 3;
- width = DIM_SIZE[X] + DIM_SIZE[Z] + 3;
-
- signal(SIGWINCH, (sighandler_t) _resize_handler);
-
- initscr();
- if (COLS < (75 + width) || LINES < height) {
- endwin();
- error("Screen is too small make sure the screen is at least %dx%d\n"
- "Right now it is %dx%d\n", 75 + width, height, COLS, LINES);
+ if(params.partition) {
+ if(params.partition[0] == 'r')
+ params.partition[0] = 'R';
+ if(params.partition[0] != 'R') {
+ char *rack_mid = find_bp_rack_mid(params.partition);
+ if(rack_mid)
+ printf("X=%c Y=%c Z=%c resolves to %s\n",
+ params.partition[X],
+ params.partition[Y],
+ params.partition[Z],
+ rack_mid);
+ else
+ printf("X=%c Y=%c Z=%c has no resolve\n",
+ params.partition[X],
+ params.partition[Y],
+ params.partition[Z]);
+
+ } else {
+ int *coord = find_bp_loc(params.partition);
+ if(coord)
+ printf("%s resolves to X=%d Y=%d Z=%d\n",
+ params.partition,
+ coord[X],
+ coord[Y],
+ coord[Z]);
+ else
+ printf("%s has no resolve.\n", params.partition);
+ }
exit(0);
}
- raw();
- keypad(stdscr, TRUE);
- noecho();
- cbreak();
- curs_set(1);
- nodelay(stdscr, TRUE);
- start_color();
-
- pa_system_ptr->grid_win = newwin(height, width, starty, startx);
- box(pa_system_ptr->grid_win, 0, 0);
-
- startx = width;
- COLS -= 2;
- width = COLS - width;
- height = LINES;
- pa_system_ptr->text_win = newwin(height, width, starty, startx);
- box(pa_system_ptr->text_win, 0, 0);
- wrefresh(pa_system_ptr->text_win);
- wrefresh(pa_system_ptr->grid_win);
-
+ if(!params.commandline) {
+ height = DIM_SIZE[Y] * DIM_SIZE[Z] + DIM_SIZE[Y] + 3;
+ width = DIM_SIZE[X] + DIM_SIZE[Z] + 3;
+
+ signal(SIGWINCH, (sighandler_t) _resize_handler);
+
+ initscr();
+ if (COLS < (75 + width) || LINES < height) {
+ endwin();
+ error("Screen is too small make sure the screen is at least %dx%d\n"
+ "Right now it is %dx%d\n", 75 + width, height, COLS, LINES);
+ exit(0);
+ }
+
+ raw();
+ keypad(stdscr, TRUE);
+ noecho();
+ cbreak();
+ curs_set(1);
+ nodelay(stdscr, TRUE);
+ start_color();
+
+ pa_system_ptr->grid_win = newwin(height, width, starty, startx);
+ box(pa_system_ptr->grid_win, 0, 0);
+
+ startx = width;
+ COLS -= 2;
+ width = COLS - width;
+ height = LINES;
+ pa_system_ptr->text_win = newwin(height, width, starty, startx);
+ box(pa_system_ptr->text_win, 0, 0);
+ }
while (!end) {
- _get_option();
- redraw:
-
- init_grid(node_info_ptr);
- wclear(pa_system_ptr->text_win);
- wclear(pa_system_ptr->grid_win);
- pa_system_ptr->xcord = 1;
- pa_system_ptr->ycord = 1;
-
+ if(!params.commandline) {
+ _get_option();
+ redraw:
+
+ init_grid(node_info_ptr);
+ wclear(pa_system_ptr->text_win);
+ wclear(pa_system_ptr->grid_win);
+
+ pa_system_ptr->xcord = 1;
+ pa_system_ptr->ycord = 1;
+ }
print_date();
switch (params.display) {
case JOBS:
@@ -157,22 +187,27 @@ int main(int argc, char *argv[])
get_slurm_part();
break;
}
-
- print_grid();
- box(pa_system_ptr->text_win, 0, 0);
- box(pa_system_ptr->grid_win, 0, 0);
- wrefresh(pa_system_ptr->text_win);
- wrefresh(pa_system_ptr->grid_win);
-
+
+ if(!params.commandline) {
+ print_grid();
+ move(0,0);
+ box(pa_system_ptr->text_win, 0, 0);
+ box(pa_system_ptr->grid_win, 0, 0);
+ wnoutrefresh(pa_system_ptr->text_win);
+ wnoutrefresh(pa_system_ptr->grid_win);
+ doupdate();
+ }
if (params.iterate) {
for (i = 0; i < params.iterate; i++) {
sleep(1);
- if (_get_option())
- goto redraw;
- else if (pa_system_ptr->resize_screen) {
- pa_system_ptr->resize_screen = 0;
- goto redraw;
+ if(!params.commandline) {
+ if (_get_option())
+ goto redraw;
+ else if (pa_system_ptr->resize_screen) {
+ pa_system_ptr->resize_screen = 0;
+ goto redraw;
+ }
}
}
} else
@@ -181,7 +216,8 @@ int main(int argc, char *argv[])
nodelay(stdscr, FALSE);
getch();
- endwin();
+ if (params.iterate)
+ endwin();
pa_fini();
exit(0);
@@ -234,7 +270,7 @@ void *_resize_handler(int sig)
if (COLS < (75 + width) || LINES < height) {
endwin();
error("Screen is too small make sure the screen is at least %dx%d\n"
- "Right now it is %dx%d\n", 75 + width, height, COLS, LINES);
+ "Right now it is %dx%d\n", 75 + width, height, COLS, LINES);
exit(0);
}
@@ -262,8 +298,9 @@ void *_resize_handler(int sig)
print_grid();
box(pa_system_ptr->text_win, 0, 0);
box(pa_system_ptr->grid_win, 0, 0);
- wrefresh(pa_system_ptr->text_win);
- wrefresh(pa_system_ptr->grid_win);
+ wnoutrefresh(pa_system_ptr->text_win);
+ wnoutrefresh(pa_system_ptr->grid_win);
+ doupdate();
pa_system_ptr->resize_screen = 1;
return NULL;
}
diff --git a/src/smap/smap.h b/src/smap/smap.h
index a0353e6ff838b13165f808fd562e6bf65bc3e4b7..4393df456138ab3f6d6e2217dbddd8ff91b5c311 100644
--- a/src/smap/smap.h
+++ b/src/smap/smap.h
@@ -35,13 +35,6 @@
# include "config.h"
#endif
-#include <pwd.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
#if HAVE_INTTYPES_H
# include <inttypes.h>
#else /* !HAVE_INTTYPES_H */
@@ -56,14 +49,20 @@
# include "src/common/getopt.h"
#endif
-
-#include "src/common/macros.h"
-#include <slurm/slurm.h>
+#include <stdlib.h>
+#include <pwd.h>
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
-#include "src/common/slurm_protocol_api.h"
#include "src/common/bitstring.h"
-#include "src/slurmctld/slurmctld.h"
+#include "src/common/hostlist.h"
+#include "src/common/list.h"
+#include "src/common/macros.h"
+//#include "src/slurmctld/slurmctld.h"
#include "src/partition_allocator/partition_allocator.h"
+#include "src/common/slurm_protocol_api.h"
#ifdef HAVE_BGL_FILES
# include "rm_api.h"
@@ -104,10 +103,11 @@ typedef struct {
int display;
bool long_output;
+ bool commandline;
char *nodes;
char *partition;
-
+
int node_field_size;
} smap_parameters_t;
@@ -123,7 +123,7 @@ extern int quiet_flag;
void init_grid(node_info_msg_t *node_info_ptr);
extern int set_grid(int start, int end, int count);
-extern int set_grid_bgl(int *start, int *end, int count);
+extern int set_grid_bgl(int *start, int *end, int count, int set);
extern void print_grid(void);
void parse_command_line(int argc, char *argv[]);