From ac4f63fb513ee8a644ba36ce4687d14f3ca71ddb Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Thu, 14 Jul 2005 15:42:46 +0000
Subject: [PATCH] smap resolve operation also prints slurm node name "bgl123"
in addition to "X=1 Y=2 Z=3"
---
src/smap/configure_functions.c | 6 ++++--
src/smap/smap.c | 7 +++----
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/smap/configure_functions.c b/src/smap/configure_functions.c
index 002221696ca..6e2e75133bb 100644
--- a/src/smap/configure_functions.c
+++ b/src/smap/configure_functions.c
@@ -1,5 +1,6 @@
/*****************************************************************************\
* configure_functions.c - Functions related to configure mode of smap.
+ * $Id$
*****************************************************************************
* Copyright (C) 2002 The Regents of the University of California.
* Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -256,8 +257,9 @@ static int _resolve(char *com)
if(coord)
sprintf(error_string,
- "%s resolves to X=%d Y=%d Z=%d\n",
- com+i,coord[X],coord[Y],coord[Z]);
+ "%s resolves to X=%d Y=%d Z=%d or bgl%d%d%d\n",
+ com+i,coord[X],coord[Y],coord[Z],
+ coord[X],coord[Y],coord[Z]);
else
sprintf(error_string, "%s has no resolve.\n",
com+i);
diff --git a/src/smap/smap.c b/src/smap/smap.c
index 51601b34c2c..eb0cfdf35e0 100644
--- a/src/smap/smap.c
+++ b/src/smap/smap.c
@@ -121,11 +121,10 @@ int main(int argc, char *argv[])
} else {
int *coord = find_bp_loc(params.partition);
if(coord)
- printf("%s resolves to X=%d Y=%d Z=%d\n",
+ printf("%s resolves to X=%d Y=%d Z=%d or bgl%d%d%d\n",
params.partition,
- coord[X],
- coord[Y],
- coord[Z]);
+ coord[X], coord[Y], coord[Z],
+ coord[X], coord[Y], coord[Z]);
else
printf("%s has no resolve.\n",
params.partition);
--
GitLab