diff options
| author | Thomas White <taw@physics.org> | 2019-09-02 14:57:16 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2019-09-12 16:35:52 +0200 |
| commit | b0ceb28b75b7b0642cc40fa5dc4a48dcf8ec92ec (patch) | |
| tree | 9e997fd426d675148c5cf206bacc9a689d34843c /src/indexamajig.c | |
| parent | 6e713e3a78167d421acd7b511d07675ca0032d5a (diff) | |
Increase indexing timeout when using pinkIndexer
Diffstat (limited to 'src/indexamajig.c')
| -rw-r--r-- | src/indexamajig.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/indexamajig.c b/src/indexamajig.c index 9fe14c65..13a44471 100644 --- a/src/indexamajig.c +++ b/src/indexamajig.c @@ -313,6 +313,7 @@ int main(int argc, char *argv[]) char *spectrum_fn = NULL; int zmq = 0; char *zmq_address = NULL; + int timeout = 240; /* Defaults */ iargs.cell = NULL; @@ -1363,6 +1364,8 @@ int main(int argc, char *argv[]) } else { + int i, n; + const IndexingMethod *methods; IndexingFlags flags = 0; if ( iargs.cell != NULL ) { @@ -1400,6 +1403,15 @@ int main(int argc, char *argv[]) return 1; } + methods = indexing_methods(iargs.ipriv, &n); + for ( i=0; i<n; i++ ) { + if ( methods[i] & INDEXING_PINKINDEXER ) { + /* Extend timeout if using pinkIndexer */ + timeout = 3000; + break; + } + } + } /* Change back to where we were before. Sandbox code will create @@ -1439,7 +1451,7 @@ int main(int argc, char *argv[]) } r = create_sandbox(&iargs, n_proc, prefix, config_basename, fh, - st, tmpdir, serial_start, zmq_address); + st, tmpdir, serial_start, zmq_address, timeout); free_imagefile_field_list(iargs.copyme); cell_free(iargs.cell); |