From b5b03c8831d46ea8a9e7e09ab9c77142f05824ee Mon Sep 17 00:00:00 2001 From: Danny Auble <da@llnl.gov> Date: Mon, 13 Jun 2005 21:17:45 +0000 Subject: [PATCH] update documentation for smap. --- NEWS | 2 ++ doc/html/bluegene.html | 5 +++++ doc/man/man1/smap.1 | 5 +++++ src/plugins/select/bluegene/slurm_prolog.c | 8 +++++--- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index b2ed5c67433..81871c79b85 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,8 @@ documents those changes that are of interest to users and admins. * Changes in SLURM 0.5.0-pre10 ============================== -- squeue and sinfo print timestamp in interate mode by default. + -- added scrolling windows in smap + -- introduced new variable to start polling thread in the bluegene plugin. -- Latest accounting patches from Riebs/HP, retry communications. -- Added srun option --kill-on-bad-exit from Holmes/HP. -- Support large (64-bit address) log files where possible. diff --git a/doc/html/bluegene.html b/doc/html/bluegene.html index 0f36411f28b..7539a1097e6 100644 --- a/doc/html/bluegene.html +++ b/doc/html/bluegene.html @@ -192,6 +192,11 @@ In summary, your job may appear in SLURM as RUNNING for 15 minutes before the script actually begins to 5 minutes after it completes. These delays are the result of BGL infrastructure issues and are not due to anything in SLURM.</p> + +<p>When using smap in curses mode you can scroll through the different windows +using the arrow keys. The <b>up</b> and <b>down</b> arrow keys scroll +the window containing the grid, and the <b>left</b> and <b>right</b> arrow +keys scroll the window containing the text information.</p> <p class="footer"><a href="#top">top</a></p> diff --git a/doc/man/man1/smap.1 b/doc/man/man1/smap.1 index 77551532fc2..f2381f4b072 100644 --- a/doc/man/man1/smap.1 +++ b/doc/man/man1/smap.1 @@ -68,6 +68,11 @@ to exit configure mode. .TP \fB\-V\fR , \fB\-\-version\fR Print version information and exit. +.SH "INTERACTIVE OPTIONS" +When using smap in curses mode you can scroll through the different windows +using the arrow keys. The \fBup\fR and \fBdown\fR arrow keys scroll +the window containing the grid, and the \fBleft\fR and \fBright\fR arrow keys +scroll the window containing the text information. .SH "OUTPUT FIELD DESCRIPTIONS" .TP diff --git a/src/plugins/select/bluegene/slurm_prolog.c b/src/plugins/select/bluegene/slurm_prolog.c index 843b49cbeaa..59c892ed55e 100644 --- a/src/plugins/select/bluegene/slurm_prolog.c +++ b/src/plugins/select/bluegene/slurm_prolog.c @@ -50,9 +50,11 @@ /* * Check the bglblock's status every POLL_SLEEP seconds. - * Retry for a period of MIN_DELAY + (INCR_DELAY * base partition count). - * For example if MIN_DELAY=300 and INCR_DELAY=20, wait up to 428 seconds - * for a 16 base partition bglblock to ready (300 + 20 * 16). + * Retry for a period of MIN_DELAY + + * (INCR_DELAY * POLL_SLEEP * base partition count). + * For example if MIN_DELAY=300 and INCR_DELAY=20 and POLL_SLEEP=3, + * wait up to 1260 seconds. + * For a 16 base partition bglblock to be ready (300 + (20 * 3 * 16). */ #define POLL_SLEEP 3 /* retry interval in seconds */ #define MIN_DELAY 300 /* time in seconds */ -- GitLab