From a0df7bc0cab2117bb1c2d2da88ef12f0fac740bc Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 15 Jun 2010 21:32:32 +0000
Subject: [PATCH] purely cosmetic changes
---
src/slurmctld/gang.c | 12 +++++++-----
src/slurmctld/node_mgr.c | 2 +-
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/slurmctld/gang.c b/src/slurmctld/gang.c
index 765c7d2f650..86925752fa0 100644
--- a/src/slurmctld/gang.c
+++ b/src/slurmctld/gang.c
@@ -302,9 +302,8 @@ static void _destroy_parts(void)
ptr = ptr->next;
xfree(tmp->part_name);
- for (i = 0; i < tmp->num_jobs; i++) {
+ for (i = 0; i < tmp->num_jobs; i++)
xfree(tmp->job_list[i]);
- }
xfree(tmp->shadow);
FREE_NULL_BITMAP(tmp->active_resmap);
xfree(tmp->active_cpus);
@@ -1268,7 +1267,8 @@ extern int gs_reconfig(void)
return SLURM_SUCCESS;
}
- debug3("gang: entering gs_reconfig");
+ if (gs_debug_flags & DEBUG_FLAG_GANG)
+ info("gang: entering gs_reconfig");
pthread_mutex_lock(&data_mutex);
old_part_list = gs_part_list;
@@ -1478,6 +1478,10 @@ static void *_timeslicer_thread(void *arg)
debug3("gang: starting timeslicer loop");
while (!thread_shutdown) {
+ _slice_sleep();
+ if (thread_shutdown)
+ break;
+
lock_slurmctld(job_write_lock);
pthread_mutex_lock(&data_mutex);
_sort_partitions();
@@ -1498,8 +1502,6 @@ static void *_timeslicer_thread(void *arg)
/* Preempt jobs that were formerly only suspended */
_preempt_job_dequeue(); /* MUST BE OUTSIDE data_mutex lock */
unlock_slurmctld(job_write_lock);
-
- _slice_sleep();
}
timeslicer_thread_id = (pthread_t) 0;
diff --git a/src/slurmctld/node_mgr.c b/src/slurmctld/node_mgr.c
index ef2c9d72534..e81b615e973 100644
--- a/src/slurmctld/node_mgr.c
+++ b/src/slurmctld/node_mgr.c
@@ -1726,7 +1726,7 @@ extern int validate_nodes_via_front_end(
}
/* First validate the job info */
- node_ptr = &node_record_table_ptr[0]; /* All msg send to node zero,
+ node_ptr = node_record_table_ptr; /* All msg send to node zero,
* the front-end for the wholel cluster */
for (i = 0; i < reg_msg->job_count; i++) {
if ( (reg_msg->job_id[i] >= MIN_NOALLOC_JOBID) &&
--
GitLab