summaryrefslogtreecommitdiffstats
path: root/hl/tools/h5watch
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2017-04-03 18:56:52 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2017-04-03 18:56:52 (GMT)
commit1e4b2588b671a2172827bb422aee9ba96c0320b6 (patch)
tree55da506d3b441b34223c9cca14f7ff606a57e1c7 /hl/tools/h5watch
parent2412158ed8326a3f3d62fbd947e470667d0b5951 (diff)
downloadhdf5-1e4b2588b671a2172827bb422aee9ba96c0320b6.zip
hdf5-1e4b2588b671a2172827bb422aee9ba96c0320b6.tar.gz
hdf5-1e4b2588b671a2172827bb422aee9ba96c0320b6.tar.bz2
Switch to using flag in signal handler, to trigger dropping out of main loop
and shutdown cleanly, instead of calling leave() from the signal handler.
Diffstat (limited to 'hl/tools/h5watch')
-rw-r--r--hl/tools/h5watch/h5watch.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/hl/tools/h5watch/h5watch.c b/hl/tools/h5watch/h5watch.c
index 97dca7a..f37b2b4 100644
--- a/hl/tools/h5watch/h5watch.c
+++ b/hl/tools/h5watch/h5watch.c
@@ -43,6 +43,7 @@ static int g_display_width = 80; /* output width in characters */
static hbool_t g_simple_output = FALSE; /* make output more machine-readable */
static unsigned g_retry = DEFAULT_RETRY; /* # of times to try opening the file if somehow file is unstable */
static hbool_t g_display_hex = FALSE; /* display data in hexadecimal format : LATER */
+static hbool_t g_user_interrupt = FALSE; /* Flag to indicate that user interrupted execution */
static herr_t doprint(hid_t did, hsize_t *start, hsize_t *block, int rank);
static herr_t slicendump(hid_t did, hsize_t *prev_dims, hsize_t *cur_dims,
@@ -337,7 +338,8 @@ monitor_dataset(hid_t fid, char *dsetname)
goto done;
}
- while(1) {
+ /* Loop until an error occurs or the user interrupts execution */
+ while(!g_user_interrupt) {
/* Refreshes the dataset */
if(H5Drefresh(did) < 0) {
@@ -798,9 +800,8 @@ parse_command_line(int argc, const char *argv[])
*/
static void catch_signal(int H5_ATTR_UNUSED signo)
{
- /* Exit from h5watch */
- leave(EXIT_SUCCESS);
-
+ /* Set the flag to get out of the main loop */
+ g_user_interrupt = TRUE;
} /* catch_signal() */