From 3c135a17c874ef091f7410822b06395276e66f77 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Mon, 18 Oct 2010 23:06:09 +0000
Subject: [PATCH] ok added back the index
---
.../select/bluegene/block_allocator/block_allocator.c | 6 ++++--
.../select/bluegene/block_allocator/block_allocator.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index 3fbf3b8fcda..771d341836e 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -1896,7 +1896,7 @@ extern int set_all_bps_except(char *bps)
*/
extern void init_grid(node_info_msg_t * node_info_ptr)
{
- int i, j, x, y, z;
+ int i = 0, j, x, y, z;
ba_node_t *ba_node = NULL;
char *host;
@@ -1908,6 +1908,7 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
ba_node->color = 7;
ba_node->letter = '.';
ba_node->state = NODE_STATE_IDLE;
+ ba_node->index = i++;
}
}
}
@@ -1933,8 +1934,9 @@ extern void init_grid(node_info_msg_t * node_info_ptr)
if ((x < 0) || (y < 0) || (z < 0))
continue;
+
ba_node = &ba_system_ptr->grid[x][y][z];
- ba_node->color = 7;
+ ba_node->index = j;
if (IS_NODE_DOWN(node_ptr) || IS_NODE_DRAIN(node_ptr)) {
ba_node->color = 0;
ba_node->letter = '#';
diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.h b/src/plugins/select/bluegene/block_allocator/block_allocator.h
index 421da7507e2..ae97ec540cf 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.h
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.h
@@ -225,6 +225,8 @@ typedef struct {
int coord[HIGHEST_DIMENSIONS];
/* color of letter used in smap */
int color;
+ /* midplane index used for easy look up of the miplane */
+ int index;
/* letter used in smap */
char letter;
// int phys_x; // no longer needed
--
GitLab