Skip to content
Snippets Groups Projects
Commit 1f86ded2 authored by Tim Wickberg's avatar Tim Wickberg
Browse files

Remove unused function kill_locked_threads().

And cleanup code further.
parent b6f08418
No related branches found
No related tags found
No related merge requests found
...@@ -50,7 +50,6 @@ static pthread_cond_t locks_cond = PTHREAD_COND_INITIALIZER; ...@@ -50,7 +50,6 @@ static pthread_cond_t locks_cond = PTHREAD_COND_INITIALIZER;
static pthread_mutex_t state_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_mutex_t state_mutex = PTHREAD_MUTEX_INITIALIZER;
static slurmctld_lock_flags_t slurmctld_locks; static slurmctld_lock_flags_t slurmctld_locks;
static int kill_thread = 0;
static void _wr_rdlock(lock_datatype_t datatype); static void _wr_rdlock(lock_datatype_t datatype);
static void _wr_rdunlock(lock_datatype_t datatype); static void _wr_rdunlock(lock_datatype_t datatype);
...@@ -141,8 +140,6 @@ static void _wr_rdlock(lock_datatype_t datatype) ...@@ -141,8 +140,6 @@ static void _wr_rdlock(lock_datatype_t datatype)
break; break;
} else { /* wait for state change and retry */ } else { /* wait for state change and retry */
slurm_cond_wait(&locks_cond, &locks_mutex); slurm_cond_wait(&locks_cond, &locks_mutex);
if (kill_thread)
pthread_exit(NULL);
} }
} }
slurm_mutex_unlock(&locks_mutex); slurm_mutex_unlock(&locks_mutex);
...@@ -172,8 +169,6 @@ static void _wr_wrlock(lock_datatype_t datatype) ...@@ -172,8 +169,6 @@ static void _wr_wrlock(lock_datatype_t datatype)
break; break;
} else { /* wait for state change and retry */ } else { /* wait for state change and retry */
slurm_cond_wait(&locks_cond, &locks_mutex); slurm_cond_wait(&locks_cond, &locks_mutex);
if (kill_thread)
pthread_exit(NULL);
} }
} }
slurm_mutex_unlock(&locks_mutex); slurm_mutex_unlock(&locks_mutex);
...@@ -197,13 +192,6 @@ void get_lock_values(slurmctld_lock_flags_t * lock_flags) ...@@ -197,13 +192,6 @@ void get_lock_values(slurmctld_lock_flags_t * lock_flags)
sizeof(slurmctld_locks)); sizeof(slurmctld_locks));
} }
/* kill_locked_threads - Kill all threads waiting on semaphores */
extern void kill_locked_threads(void)
{
kill_thread = 1;
slurm_cond_broadcast(&locks_cond);
}
/* un/lock semaphore used for saving state of slurmctld */ /* un/lock semaphore used for saving state of slurmctld */
extern void lock_state_files(void) extern void lock_state_files(void)
{ {
......
...@@ -143,9 +143,6 @@ extern void get_lock_values (slurmctld_lock_flags_t *lock_flags); ...@@ -143,9 +143,6 @@ extern void get_lock_values (slurmctld_lock_flags_t *lock_flags);
* control */ * control */
extern void init_locks ( void ); extern void init_locks ( void );
/* kill_locked_threads - Kill all threads waiting on semaphores */
extern void kill_locked_threads ( void );
/* lock_slurmctld - Issue the required lock requests in a well defined order */ /* lock_slurmctld - Issue the required lock requests in a well defined order */
extern void lock_slurmctld (slurmctld_lock_t lock_levels); extern void lock_slurmctld (slurmctld_lock_t lock_levels);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment