From 0ea210e1787f82730d8cdf7d11b80a8bcd765d71 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@llnl.gov>
Date: Tue, 21 Apr 2009 21:48:57 +0000
Subject: [PATCH] removed vestigal HAVE_BG's from bluegene plugin
---
.../select/bluegene/plugin/bg_job_place.c | 8 -------
.../bluegene/plugin/bg_record_functions.c | 8 -------
.../select/bluegene/plugin/select_bluegene.c | 23 +++----------------
3 files changed, 3 insertions(+), 36 deletions(-)
diff --git a/src/plugins/select/bluegene/plugin/bg_job_place.c b/src/plugins/select/bluegene/plugin/bg_job_place.c
index 242c367a21a..b482ff798fb 100644
--- a/src/plugins/select/bluegene/plugin/bg_job_place.c
+++ b/src/plugins/select/bluegene/plugin/bg_job_place.c
@@ -46,8 +46,6 @@
#include "bluegene.h"
#include "dynamic_block.h"
-#ifdef HAVE_BG
-
#define _DEBUG 0
#define MAX_GROUPS 128
@@ -1327,8 +1325,6 @@ static void _build_select_struct(struct job_record *job_ptr, bitstr_t *bitmap)
}
}
-#endif /* ifdef HAVE_BG */
-
/*
* Try to find resources for a given job request
* IN job_ptr - pointer to job record in slurmctld
@@ -1346,7 +1342,6 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
uint32_t req_nodes, int mode)
{
int rc = SLURM_SUCCESS;
-#ifdef HAVE_BG
bg_record_t* bg_record = NULL;
char buf[100];
uint16_t conn_type = (uint16_t)NO_VAL;
@@ -1528,14 +1523,12 @@ extern int submit_job(struct job_record *job_ptr, bitstr_t *slurm_block_bitmap,
}
list_destroy(block_list);
-#endif
return rc;
}
extern int test_job_list(List req_list)
{
int rc = SLURM_SUCCESS;
-#ifdef HAVE_BG
bg_record_t* bg_record = NULL;
bg_record_t* new_record = NULL;
char buf[100];
@@ -1780,6 +1773,5 @@ extern int test_job_list(List req_list)
list_destroy(job_block_test_list);
slurm_mutex_unlock(&job_list_test_mutex);
-#endif
return rc;
}
diff --git a/src/plugins/select/bluegene/plugin/bg_record_functions.c b/src/plugins/select/bluegene/plugin/bg_record_functions.c
index e01ec88e66b..3c4b1a9ec03 100644
--- a/src/plugins/select/bluegene/plugin/bg_record_functions.c
+++ b/src/plugins/select/bluegene/plugin/bg_record_functions.c
@@ -45,10 +45,8 @@
#include "src/slurmctld/locks.h"
/* some local functions */
-#ifdef HAVE_BG
static int _addto_node_list(bg_record_t *bg_record, int *start, int *end);
static int _ba_node_cmpf_inc(ba_node_t *node_a, ba_node_t *node_b);
-#endif
extern void print_bg_record(bg_record_t* bg_record)
{
@@ -164,7 +162,6 @@ extern int block_ptr_exist_in_list(List my_list, bg_record_t *bg_record)
extern void process_nodes(bg_record_t *bg_record, bool startup)
{
-#ifdef HAVE_BG
int j=0, number;
int diff=0;
int largest_diff=-1;
@@ -342,7 +339,6 @@ extern void process_nodes(bg_record_t *bg_record, bool startup)
fatal("1 Unable to convert nodes %s to bitmap",
bg_record->nodes);
}
-#endif
return;
}
@@ -1399,7 +1395,6 @@ extern int resume_block(bg_record_t *bg_record)
/************************* local functions ***************************/
-#ifdef HAVE_BG
static int _addto_node_list(bg_record_t *bg_record, int *start, int *end)
{
int node_count=0;
@@ -1474,6 +1469,3 @@ static int _ba_node_cmpf_inc(ba_node_t *node_a, ba_node_t *node_b)
}
-#endif //HAVE_BG
-
-
diff --git a/src/plugins/select/bluegene/plugin/select_bluegene.c b/src/plugins/select/bluegene/plugin/select_bluegene.c
index 6b394eb06f3..aefaa36fbe3 100644
--- a/src/plugins/select/bluegene/plugin/select_bluegene.c
+++ b/src/plugins/select/bluegene/plugin/select_bluegene.c
@@ -39,10 +39,6 @@
#include "bluegene.h"
-#ifndef HAVE_BG
-#include "defined_block.h"
-#endif
-
//#include "src/common/uid.h"
#include "src/slurmctld/trigger_mgr.h"
#include <fcntl.h>
@@ -98,9 +94,7 @@ extern int select_p_alter_node_cnt(enum select_node_cnt type, void *data);
*/
extern int init ( void )
{
-#ifndef HAVE_BG
- fatal("Plugin select/bluegene is illegal on non-BlueGene computers");
-#endif
+
#if (SYSTEM_DIMENSIONS != 3)
fatal("SYSTEM_DIMENSIONS value (%d) invalid for Blue Gene",
SYSTEM_DIMENSIONS);
@@ -161,14 +155,12 @@ static char *_block_state_str(int state)
{
static char tmp[16];
-#ifdef HAVE_BG
switch (state) {
case 0:
return "ERROR";
case 1:
return "FREE";
}
-#endif
snprintf(tmp, sizeof(tmp), "%d", state);
return tmp;
@@ -765,9 +757,7 @@ extern int select_p_get_info_from_plugin (enum select_data_info info,
extern int select_p_update_node_state (int index, uint16_t state)
{
- int x;
-#ifdef HAVE_BG
- int y, z;
+ int x, y, z;
for (y = DIM_SIZE[Y] - 1; y >= 0; y--) {
for (z = 0; z < DIM_SIZE[Z]; z++) {
@@ -782,14 +772,7 @@ extern int select_p_update_node_state (int index, uint16_t state)
}
}
}
-#else
- for (x = 0; x < DIM_SIZE[X]; x++) {
- if (ba_system_ptr->grid[x].index == index) {
- ba_update_node_state(&ba_system_ptr->grid[x], state);
- return SLURM_SUCCESS;
- }
- }
-#endif
+
return SLURM_ERROR;
}
--
GitLab