From 5bbe61692c27eb962bfd9ad23f65b3ff493bb072 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Fri, 26 Sep 2014 10:19:06 -0700
Subject: [PATCH] BLUEGENE - Make function return error if something bad
happened.
---
src/plugins/select/bluegene/ba_bgq/block_allocator.c | 9 +++++----
src/plugins/select/bluegene/ba_common.c | 11 ++++++-----
src/plugins/select/bluegene/ba_common.h | 6 +++---
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/plugins/select/bluegene/ba_bgq/block_allocator.c b/src/plugins/select/bluegene/ba_bgq/block_allocator.c
index 12278b46980..662e3380fc3 100644
--- a/src/plugins/select/bluegene/ba_bgq/block_allocator.c
+++ b/src/plugins/select/bluegene/ba_bgq/block_allocator.c
@@ -1489,10 +1489,11 @@ extern bitstr_t *ba_create_ba_mp_cnode_bitmap(bg_record_t *bg_record)
nc_start = ionode_num * (int)bg_conf->nc_ratio;
nc_end = nc_start + (int)bg_conf->nc_ratio;
for (nc_num = nc_start; nc_num < nc_end; nc_num++)
- ba_node_map_set_range(cnode_bitmap,
- g_nc_coords[nc_num].start,
- g_nc_coords[nc_num].end,
- ba_mp_geo_system);
+ /* this should always be true */
+ (void)ba_node_map_set_range(cnode_bitmap,
+ g_nc_coords[nc_num].start,
+ g_nc_coords[nc_num].end,
+ ba_mp_geo_system);
}
if (ba_debug_flags & DEBUG_FLAG_BG_ALGO_DEEP)
diff --git a/src/plugins/select/bluegene/ba_common.c b/src/plugins/select/bluegene/ba_common.c
index e35ce04bfb7..a7fa8e7259f 100644
--- a/src/plugins/select/bluegene/ba_common.c
+++ b/src/plugins/select/bluegene/ba_common.c
@@ -1278,14 +1278,15 @@ extern void ba_node_map_set(bitstr_t *node_bitmap, uint16_t *full_offset,
* IN end_offset - N-dimension zero-origin offset to start setting at
* IN my_geo_system - system geometry specification
*/
-extern void ba_node_map_set_range(bitstr_t *node_bitmap,
- int *start_offset, int *end_offset,
- ba_geo_system_t *my_geo_system)
+extern int ba_node_map_set_range(bitstr_t *node_bitmap,
+ int *start_offset, int *end_offset,
+ ba_geo_system_t *my_geo_system)
{
uint16_t coords[HIGHEST_DIMENSIONS] = {};
- _ba_node_map_set_range_internal(0, coords, start_offset, end_offset,
- node_bitmap, my_geo_system);
+ return _ba_node_map_set_range_internal(
+ 0, coords, start_offset, end_offset,
+ node_bitmap, my_geo_system);
}
/*
diff --git a/src/plugins/select/bluegene/ba_common.h b/src/plugins/select/bluegene/ba_common.h
index 669dda52b0d..0fd382a803a 100644
--- a/src/plugins/select/bluegene/ba_common.h
+++ b/src/plugins/select/bluegene/ba_common.h
@@ -308,9 +308,9 @@ extern void ba_node_map_set(bitstr_t *node_bitmap, uint16_t *full_offset,
* IN end_offset - N-dimension zero-origin offset to start setting at
* IN my_geo_system - system geometry specification
*/
-extern void ba_node_map_set_range(bitstr_t *node_bitmap,
- int *start_offset, int *end_offset,
- ba_geo_system_t *my_geo_system);
+extern int ba_node_map_set_range(bitstr_t *node_bitmap,
+ int *start_offset, int *end_offset,
+ ba_geo_system_t *my_geo_system);
/*
* Return the contents of the specified position in the bitmap
--
GitLab