diff options
| author | Thomas White <taw@physics.org> | 2022-03-03 16:31:18 +0100 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2022-03-07 16:05:11 +0100 |
| commit | c062c1a763288f964d466e3d48531211ebad0669 (patch) | |
| tree | 0b7212e4431f121e51d031afdcedf8d512045f5f /src | |
| parent | ed80ad943b41a3d1d020ca799299c12c44d24edb (diff) | |
Add new time accounts (preparation for finer-grained profiling)
Diffstat (limited to 'src')
| -rw-r--r-- | src/process_image.c | 4 | ||||
| -rw-r--r-- | src/time-accounts.c | 16 | ||||
| -rw-r--r-- | src/time-accounts.h | 8 |
3 files changed, 20 insertions, 8 deletions
diff --git a/src/process_image.c b/src/process_image.c index 445a25b3..1919aa14 100644 --- a/src/process_image.c +++ b/src/process_image.c @@ -150,7 +150,7 @@ static struct image *file_wait_open_read(const char *filename, do { - time_accounts_set(taccs, TACC_HDF5READ); + time_accounts_set(taccs, TACC_IMAGE_DATA); set_last_task(last_task, "read file"); sb_shared->pings[cookie]++; @@ -189,7 +189,7 @@ void process_image(const struct index_args *iargs, struct pattern_args *pargs, int any_crystals; if ( pargs->zmq_data != NULL ) { - time_accounts_set(taccs, TACC_HDF5READ); + time_accounts_set(taccs, TACC_IMAGE_DATA); set_last_task(last_task, "unpacking messagepack object"); image = image_read_data_block(iargs->dtempl, pargs->zmq_data, diff --git a/src/time-accounts.c b/src/time-accounts.c index 7124ed51..63ac5b50 100644 --- a/src/time-accounts.c +++ b/src/time-accounts.c @@ -181,8 +181,12 @@ static const char *taccname(enum timeaccount acc) case TACC_WAKEUP : return "Waking up workers"; case TACC_WAITPID : return "Waiting on workers"; case TACC_WAITFILE : return "Waiting for image file"; - case TACC_HDF5OPEN : return "Opening image file"; - case TACC_HDF5READ : return "Reading image file"; + case TACC_IMAGE_DATA : return "Reading image data"; + case TACC_IMAGE_PARAMS : return "Reading image parameters"; + case TACC_CREATE_DETGEOM : return "Creating detgeom"; + case TACC_CREATE_BADMAP : return "Creating bad pixel map"; + case TACC_CREATE_SATMAP : return "Creating saturation map"; + case TACC_CACHE_HEADERS : return "Caching image headers"; case TACC_FILTER : return "Image filters"; case TACC_RESRANGE : return "Resolution range"; case TACC_PEAKSEARCH : return "Peak search"; @@ -212,8 +216,12 @@ static const char *taccname_short(enum timeaccount acc) case TACC_WAKEUP : return "wakew"; case TACC_WAITPID : return "waitw"; case TACC_WAITFILE : return "wfile"; - case TACC_HDF5OPEN : return "ofile"; - case TACC_HDF5READ : return "rfile"; + case TACC_IMAGE_DATA : return "idata"; + case TACC_IMAGE_PARAMS : return "iprms"; + case TACC_CREATE_DETGEOM : return "dgeom"; + case TACC_CREATE_BADMAP : return "bdmap"; + case TACC_CREATE_SATMAP : return "stmap"; + case TACC_CACHE_HEADERS : return "headc"; case TACC_FILTER : return "filtr"; case TACC_RESRANGE : return "rrnge"; case TACC_PEAKSEARCH : return "peaks"; diff --git a/src/time-accounts.h b/src/time-accounts.h index c7e54d0f..d08da573 100644 --- a/src/time-accounts.h +++ b/src/time-accounts.h @@ -45,8 +45,12 @@ enum timeaccount TACC_WAKEUP, TACC_WAITPID, TACC_WAITFILE, - TACC_HDF5OPEN, - TACC_HDF5READ, + TACC_IMAGE_DATA, + TACC_IMAGE_PARAMS, + TACC_CREATE_DETGEOM, + TACC_CREATE_BADMAP, + TACC_CREATE_SATMAP, + TACC_CACHE_HEADERS, TACC_FILTER, TACC_RESRANGE, TACC_PEAKSEARCH, |