From 1449feb1f5507e79c4259ab7e122451b07d147c8 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 14 Mar 2019 11:49:09 +0100
Subject: Process ZMQ data inside main loop

---
 src/im-sandbox.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3