Skip to main content
summaryrefslogtreecommitdiffstats
path: root/debug
diff options
context:
space:
mode:
authorGreg Watson2008-08-25 12:46:13 +0000
committerGreg Watson2008-08-25 12:46:13 +0000
commit5019a6bd0fa5f7d66b0745f05840a5f11007c69e (patch)
tree847c4eb27546ba87be40e01625bad111ebc2ca93 /debug
parent42f5dd3e7192644341eb6e86840001fcdf1c2eed (diff)
downloadorg.eclipse.ptp-5019a6bd0fa5f7d66b0745f05840a5f11007c69e.tar.gz
org.eclipse.ptp-5019a6bd0fa5f7d66b0745f05840a5f11007c69e.tar.xz
org.eclipse.ptp-5019a6bd0fa5f7d66b0745f05840a5f11007c69e.zip
Change --numnodes to --numprocs. Also numprocs is now the actual number of processes being debugged, not num processes + 1.
Diffstat (limited to 'debug')
-rw-r--r--debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java2
-rw-r--r--debug/org.eclipse.ptp.debug.sdm/src/client/startup.c2
-rw-r--r--debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c11
3 files changed, 8 insertions, 7 deletions
diff --git a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java
index 741984fbc..3bd7c1657 100644
--- a/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java
+++ b/debug/org.eclipse.ptp.debug.sdm.core/src/org/eclipse/ptp/debug/sdm/core/SDMDebugger.java
@@ -186,7 +186,7 @@ public class SDMDebugger implements IPDebugger {
}
int numProcs = attrMgr.getAttribute(JobAttributes.getNumberOfProcessesAttributeDefinition()).getValue();
- dbgArgs.add("--numnodes=" + (numProcs+1)); //$NON-NLS-1$
+ dbgArgs.add("--numprocs=" + numProcs); //$NON-NLS-1$
diff --git a/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c b/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c
index ac704c38c..62d5504c7 100644
--- a/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c
+++ b/debug/org.eclipse.ptp.debug.sdm/src/client/startup.c
@@ -41,7 +41,7 @@ static struct option longopts[] = {
{"port", required_argument, NULL, 'p'},
{"host", required_argument, NULL, 'h'},
{"jobid", required_argument, NULL, 'j'},
- {"numnodes", required_argument, NULL, 'n'},
+ {"numprocs", required_argument, NULL, 'n'},
#ifdef DEBUG
{"debug", optional_argument, NULL, 'd'},
#endif /* DEBUG */
diff --git a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c
index a96751492..03f90cd34 100644
--- a/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c
+++ b/debug/org.eclipse.ptp.debug.sdm/src/impl/sdm.c
@@ -41,12 +41,12 @@ sdm_setup(int argc, char *argv[])
char ** rank;
/*
- * Get the number of nodes
+ * Get the number of processes
*/
size = -1;
for (ch = 0; ch < argc; ch++) {
char * arg = argv[ch];
- if (strncmp(arg, "--numnodes", 10) == 0) {
+ if (strncmp(arg, "--numprocs", 10) == 0) {
size = (int)strtol(arg+11, NULL, 10);
break;
}
@@ -58,11 +58,12 @@ sdm_setup(int argc, char *argv[])
DEBUG_PRINTF(DEBUG_LEVEL_CLIENT, "[%d] size %d\n", sdm_route_get_id(), size);
- sdm_route_set_size(size);
+ sdm_route_set_size(size+1);
+
/*
- * Set the ID of the master to the num of nodes less one
+ * Set the ID of the master to one greater than the last process [0 ... size-1]
*/
- SDM_MASTER = size - 1;
+ SDM_MASTER = size;
/*
* Since the SDM servers will be started by the mpirun, get

Back to the top