aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2019-03-14 11:49:09 +0100
committerThomas White <taw@physics.org>2019-03-14 11:55:04 +0100
commit1449feb1f5507e79c4259ab7e122451b07d147c8 (patch)
treeb232cbaa157be003bda64c7d9549340f8223e3ce /src
parentb8aa97a5bba26509652c5429e1a023a61682c664 (diff)
Process ZMQ data inside main loop
Diffstat (limited to 'src')
-rw-r--r--src/im-sandbox.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c
index 85183c27..3d8287df 100644
--- a/src/im-sandbox.c
+++ b/src/im-sandbox.c
@@ -1157,10 +1157,6 @@ int create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
taccs = time_accounts_init();
- if ( sb->zmq ) {
- allDone = 1;
- }
-
do {
/* Check for stream output from workers */
@@ -1198,11 +1194,7 @@ int create_sandbox(struct index_args *iargs, int n_proc, char *prefix,
/* Indicate to the workers that we are finished, and wake them up one
* last time */
time_accounts_set(taccs, TACC_WAKEUP);
- if ( sb->zmq ) {
- STATUS("Waiting to receive patterns over ZMQ...\n");
- } else {
- STATUS("Waiting for the last patterns to be processed...\n");
- }
+ STATUS("Waiting for the last patterns to be processed...\n");
pthread_mutex_lock(&sb->shared->queue_lock);
sb->shared->no_more = 1;
pthread_mutex_unlock(&sb->shared->queue_lock);