diff options
| author | Thomas White <taw@physics.org> | 2020-07-31 14:40:01 +0200 |
|---|---|---|
| committer | Thomas White <taw@physics.org> | 2020-07-31 14:40:01 +0200 |
| commit | 6623a5698c531fdbd73d7b99a7f327b2746b6dfc (patch) | |
| tree | 67fe6bc17e41f25adbe9c3ab712d22aca2365b5c /src | |
| parent | 73236236920006b0b8eeb9ddadfd47c1cddf26a5 (diff) | |
partial_sim: Rename worker_args and queue_args
Diffstat (limited to 'src')
| -rw-r--r-- | src/partial_sim.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/partial_sim.c b/src/partial_sim.c index 5d1a79e8..aeaf469f 100644 --- a/src/partial_sim.c +++ b/src/partial_sim.c @@ -7,7 +7,7 @@ * a research centre of the Helmholtz Association. * * Authors: - * 2011-2017 Thomas White <taw@physics.org> + * 2011-2020 Thomas White <taw@physics.org> * 2014 Valerio Mariani * * This file is part of CrystFEL. @@ -276,7 +276,7 @@ static void show_help(const char *s) } -struct queue_args +struct partial_sim_queue_args { RefList *full; pthread_rwlock_t full_lock; @@ -311,9 +311,9 @@ struct queue_args }; -struct worker_args +struct partial_sim_worker_args { - struct queue_args *qargs; + struct partial_sim_queue_args *qargs; Crystal *crystal; struct image image; @@ -331,13 +331,13 @@ struct worker_args static void *create_job(void *vqargs) { - struct worker_args *wargs; - struct queue_args *qargs = vqargs; + struct partial_sim_worker_args *wargs; + struct partial_sim_queue_args *qargs = vqargs; /* All done already? */ if ( qargs->n_started == qargs->n_to_do ) return NULL; - wargs = malloc(sizeof(struct worker_args)); + wargs = malloc(sizeof(struct partial_sim_worker_args)); wargs->qargs = qargs; wargs->image = *qargs->template_image; @@ -380,8 +380,8 @@ static void *create_job(void *vqargs) static void run_job(void *vwargs, int cookie) { - struct worker_args *wargs = vwargs; - struct queue_args *qargs = wargs->qargs; + struct partial_sim_worker_args *wargs = vwargs; + struct partial_sim_queue_args *qargs = wargs->qargs; int i; Crystal *cr; double osf; @@ -462,8 +462,8 @@ static void run_job(void *vwargs, int cookie) static void finalise_job(void *vqargs, void *vwargs) { - struct worker_args *wargs = vwargs; - struct queue_args *qargs = vqargs; + struct partial_sim_worker_args *wargs = vwargs; + struct partial_sim_queue_args *qargs = vqargs; int i; int ret; @@ -527,7 +527,7 @@ int main(int argc, char *argv[]) int n = 2; int random_intensities = 0; char *save_file = NULL; - struct queue_args qargs; + struct partial_sim_queue_args qargs; struct image image; int n_threads = 1; char *rval; |