diff options
| author | Thomas White <taw@physics.org> | 2021-07-06 15:20:04 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-06-02 12:15:38 +0200 |
| commit | eecd67a344d2f5524fe8dd0175758632b932d6cb (patch) | |
| tree | 32266143ebc3bb5f45523da95dc2ab44d15394c6 /src | |
| parent | 45d3a8670da1d40145202ed42129c7cddba18df5 (diff) | |
ASAP::O: Actually get the data
Diffstat (limited to 'src')
| -rw-r--r-- | src/im-sandbox.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c index 654f07d1..7da02970 100644 --- a/src/im-sandbox.c +++ b/src/im-sandbox.c @@ -457,10 +457,8 @@ static int run_work(const struct index_args *iargs, Stream *st, if ( !sb->zmq ) { - pargs.zmq_data = NULL; - pargs.zmq_data_size = 0; - - } else { + } + if ( sb->zmq ) { do { pargs.zmq_data = im_zmq_fetch(zmqstuff, @@ -472,6 +470,16 @@ static int run_work(const struct index_args *iargs, Stream *st, * importantly, the event queue gave us a unique * serial number for this image. */ + } else if ( sb->asapo ) { + + /* Temporary (?) abuse of "zmq_data", even though + * data comes via ASAP::O */ + pargs.zmq_data = im_asapo_fetch(asapostuff, + &pargs.zmq_data_size); + + } else { + pargs.zmq_data = NULL; + pargs.zmq_data_size = 0; } sb->shared->time_last_start[cookie] = get_monotonic_seconds(); @@ -489,7 +497,9 @@ static int run_work(const struct index_args *iargs, Stream *st, } } + /* These are both no-ops if argument is NULL */ im_zmq_shutdown(zmqstuff); + im_asapo_shutdown(asapostuff); cleanup_indexing(iargs->ipriv); cell_free(iargs->cell); |