From 5521917cedc9b898cc2bae4ea80086fed9d2ff8d Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Tue, 23 Sep 2014 15:43:44 -0700
Subject: [PATCH] Fix clang errors
---
src/plugins/priority/multifactor/priority_multifactor.c | 3 ---
src/plugins/task/affinity/numa.c | 7 ++-----
src/slurmd/slurmstepd/slurmstepd_job.h | 4 ++++
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/plugins/priority/multifactor/priority_multifactor.c b/src/plugins/priority/multifactor/priority_multifactor.c
index 7441eabdc37..cf8789166c1 100644
--- a/src/plugins/priority/multifactor/priority_multifactor.c
+++ b/src/plugins/priority/multifactor/priority_multifactor.c
@@ -814,7 +814,6 @@ static void _init_grp_used_cpu_run_secs(time_t last_ran)
debug2("job: %u", job_ptr->job_id);
qos = NULL;
assoc = NULL;
- delta = 0;
if (!IS_JOB_RUNNING(job_ptr))
continue;
@@ -1195,8 +1194,6 @@ static void *_decay_thread(void *no_data)
while (1) {
now = start_time;
- run_delta = 0.0;
- real_decay = 0.0;
slurm_mutex_lock(&decay_lock);
running_decay = 1;
diff --git a/src/plugins/task/affinity/numa.c b/src/plugins/task/affinity/numa.c
index fcae3956b13..7515ebc5871 100644
--- a/src/plugins/task/affinity/numa.c
+++ b/src/plugins/task/affinity/numa.c
@@ -151,7 +151,7 @@ void slurm_chk_memset(nodemask_t *mask, stepd_step_rec_t *job)
int get_memset(nodemask_t *mask, stepd_step_rec_t *job)
{
- int nummasks, maskid, i, threads;
+ int nummasks, i, threads;
char *curstr, *selstr;
char mstr[1 + NUMA_NUM_NODES / 4];
int local_id = job->envtp->localid;
@@ -177,7 +177,6 @@ int get_memset(nodemask_t *mask, stepd_step_rec_t *job)
return false;
nummasks = 1;
- maskid = 0;
selstr = NULL;
/* get number of strings present in mem_bind */
@@ -185,7 +184,6 @@ int get_memset(nodemask_t *mask, stepd_step_rec_t *job)
while (*curstr) {
if (nummasks == local_id+1) {
selstr = curstr;
- maskid = local_id;
break;
}
if (*curstr == ',')
@@ -196,8 +194,7 @@ int get_memset(nodemask_t *mask, stepd_step_rec_t *job)
/* if we didn't already find the mask... */
if (!selstr) {
/* ...select mask string by wrapping task ID into list */
- maskid = local_id % nummasks;
- i = maskid;
+ i = local_id % nummasks;
curstr = job->mem_bind;
while (*curstr && i) {
if (*curstr == ',')
diff --git a/src/slurmd/slurmstepd/slurmstepd_job.h b/src/slurmd/slurmstepd/slurmstepd_job.h
index 78ea976e31c..aa659d3869d 100644
--- a/src/slurmd/slurmstepd/slurmstepd_job.h
+++ b/src/slurmd/slurmstepd/slurmstepd_job.h
@@ -258,6 +258,10 @@ static inline stepd_step_task_info_t *
job_task_info_by_pid (stepd_step_rec_t *job, pid_t pid)
{
uint32_t i;
+
+ if (!job)
+ return NULL;
+
for (i = 0; i < job->node_tasks; i++) {
if (job->task[i]->pid == pid)
return (job->task[i]);
--
GitLab