diff options
| author | Thomas White <taw@physics.org> | 2023-06-06 13:41:52 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2023-06-06 13:41:52 +0200 |
| commit | 117ed0d0339163e04290349f9fe468b4bb6982e7 (patch) | |
| tree | b96e7dfb22cb27d8272a21f155817f7eec257e3e /src/im-sandbox.c | |
| parent | de407aa9fa93192aad6773a53fe51295d9c8cb8e (diff) | |
| parent | b5550e4399415fe4863057d6cbd406faf3f2df31 (diff) | |
Merge branch 'asapo-producer'
Diffstat (limited to 'src/im-sandbox.c')
| -rw-r--r-- | src/im-sandbox.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/im-sandbox.c b/src/im-sandbox.c index 51d9db99..7f02b1cf 100644 --- a/src/im-sandbox.c +++ b/src/im-sandbox.c @@ -476,6 +476,7 @@ static int run_work(const struct index_args *iargs, Stream *st, char *filename; char *event; int finished = 0; + int message_id; profile_start("asapo-fetch"); set_last_task(sb->shared->last_task[cookie], "ASAPO fetch"); @@ -484,7 +485,8 @@ static int run_work(const struct index_args *iargs, Stream *st, &pargs.asapo_meta, &filename, &event, - &finished); + &finished, + &message_id); profile_end("asapo-fetch"); if ( pargs.asapo_data != NULL ) { ok = 1; @@ -496,6 +498,10 @@ static int run_work(const struct index_args *iargs, Stream *st, pargs.filename = filename; pargs.event = event; sb->shared->end_of_stream[cookie] = 0; + + /* We will also use ASAP::O's serial number + * instead of our own. */ + ser = message_id; } else { if ( finished ) { sb->shared->end_of_stream[cookie] = 1; @@ -510,7 +516,8 @@ static int run_work(const struct index_args *iargs, Stream *st, sb->shared->time_last_start[cookie] = get_monotonic_seconds(); profile_start("process-image"); process_image(iargs, &pargs, st, cookie, tmpdir, ser, - sb->shared, sb->shared->last_task[cookie]); + sb->shared, sb->shared->last_task[cookie], + asapostuff); profile_end("process-image"); } |