From 9883bc7b36d2feaa5d72c87f743a0a0dd94a095e Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 3 Nov 2006 17:31:49 +0000
Subject: [PATCH] Change some log formats from %d to %u as appropriate, no
changes in logic.
---
src/common/slurm_step_layout.c | 15 ++++++++-------
src/srun/msg.c | 4 ++--
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/src/common/slurm_step_layout.c b/src/common/slurm_step_layout.c
index 945d180c5e1..6b951fead91 100644
--- a/src/common/slurm_step_layout.c
+++ b/src/common/slurm_step_layout.c
@@ -491,7 +491,7 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
debug2("list is %s", arbitrary_nodes);
step_alloc_hosts = hostlist_create(arbitrary_nodes);
if(hostlist_count(step_alloc_hosts) != step_layout->task_cnt) {
- error("Asked for %d tasks have %d in the nodelist. "
+ error("Asked for %u tasks have %d in the nodelist."
"Check your nodelist",
step_layout->task_cnt,
hostlist_count(step_alloc_hosts));
@@ -509,7 +509,7 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
if(task_cnt >= step_layout->task_cnt)
break;
}
- debug3("%s got %d tasks\n",
+ debug3("%s got %u tasks\n",
host,
step_layout->tasks[i]);
if(step_layout->tasks[i] == 0)
@@ -541,7 +541,7 @@ static int _task_layout_hostfile(slurm_step_layout_t *step_layout,
hostlist_destroy(job_alloc_hosts);
hostlist_destroy(step_alloc_hosts);
if(task_cnt != step_layout->task_cnt) {
- error("Asked for %d tasks but placed %d. Check your nodelist",
+ error("Asked for %u tasks but placed %d. Check your nodelist",
step_layout->task_cnt, task_cnt);
return SLURM_ERROR;
}
@@ -710,11 +710,11 @@ static int _task_layout_plane(slurm_step_layout_t *step_layout,
step_layout->tasks[i]= temp_tasks[i];
xfree(temp_tasks);
- info("node_cnt %d task_cnt %d plane_size %d",
+ info("node_cnt %u task_cnt %u plane_size %u",
step_layout->node_cnt, step_layout->task_cnt,
step_layout->plane_size);
for(i = 0; i <step_layout->node_cnt; i++) {
- info("tasks[%d]: %d", i, step_layout->tasks[i]);
+ info("tasks[%d]: %u", i, step_layout->tasks[i]);
}
if(step_layout->tasks == NULL)
@@ -735,9 +735,10 @@ static int _task_layout_plane(slurm_step_layout_t *step_layout,
#if(0)
/* debugging only remove */
for (i=0; i < step_layout->node_cnt; i++) {
- info ("Host %d _plane_ # of tasks %d", i, step_layout->tasks[i]);
+ info ("Host %d _plane_ # of tasks %u", i, step_layout->tasks[i]);
for (j=0; j<step_layout->tasks[i]; j++) {
- info ("Host %d _plane_ taskid %d task %d", i, j, step_layout->tids[i][j]);
+ info ("Host %d _plane_ taskid %d task %u",
+ i, j, step_layout->tids[i][j]);
}
}
#endif
diff --git a/src/srun/msg.c b/src/srun/msg.c
index c5294e2b103..d55640dfa37 100644
--- a/src/srun/msg.c
+++ b/src/srun/msg.c
@@ -483,7 +483,7 @@ update_tasks_state(srun_job_t *job, uint32_t nodeid)
int i;
pipe_enum_t pipe_enum = PIPE_TASK_STATE;
slurm_mutex_lock(&job->task_mutex);
- debug2("updating %d tasks state for node %d",
+ debug2("updating %u tasks state for node %u",
job->step_layout->tasks[nodeid], nodeid);
for (i = 0; i < job->step_layout->tasks[nodeid]; i++) {
uint32_t tid = job->step_layout->tids[nodeid][i];
@@ -511,7 +511,7 @@ update_running_tasks(srun_job_t *job, uint32_t nodeid)
{
int i;
pipe_enum_t pipe_enum = PIPE_TASK_STATE;
- debug2("updating %d running tasks for node %d",
+ debug2("updating %u running tasks for node %u",
job->step_layout->tasks[nodeid], nodeid);
slurm_mutex_lock(&job->task_mutex);
for (i = 0; i < job->step_layout->tasks[nodeid]; i++) {
--
GitLab