From 77b6ba6a7423674000c4b683fb27aa166c40013e Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Mon, 6 Mar 2006 21:08:55 +0000
Subject: [PATCH] svn merge -r7311:7406
https://eris.llnl.gov/svn/slurm/branches/slurm-1.0
---
src/plugins/proctrack/rms/proctrack_rms.c | 4 ++--
src/plugins/switch/elan/qsw.c | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/plugins/proctrack/rms/proctrack_rms.c b/src/plugins/proctrack/rms/proctrack_rms.c
index a19b7085000..9b94cdacb07 100644
--- a/src/plugins/proctrack/rms/proctrack_rms.c
+++ b/src/plugins/proctrack/rms/proctrack_rms.c
@@ -137,10 +137,10 @@ extern int slurm_container_signal (uint32_t id, int signal)
rc = -1;
for (i = nids-2; i >= 0 ; i--) {
- debug3("proctrack/rms(pid %d) Sending signal %d to process %d",
+ debug2("proctrack/rms(pid %d) Sending signal %d to process %d",
getpid(), signal, pids[i]);
rc &= kill(pids[i], signal);
- debug("rc = %d", rc);
+ debug2(" rc = %d", rc);
}
free(pids);
debug3("proctrack/rms signal container returning %d", rc);
diff --git a/src/plugins/switch/elan/qsw.c b/src/plugins/switch/elan/qsw.c
index 119be580dff..316949a29ee 100644
--- a/src/plugins/switch/elan/qsw.c
+++ b/src/plugins/switch/elan/qsw.c
@@ -925,6 +925,7 @@ qsw_prog_fini(qsw_jobinfo_t jobinfo)
if (shmid >= 0) {
debug2("qsw_prog_fini");
shmctl (shmid, IPC_RMID, NULL);
+ debug2("qsw_prog_fini shmctl IPC_RMID complete");
}
/* Do nothing... apparently this will be handled by
* callbacks in the kernel exit handlers ...
--
GitLab