| Message ID | 20211004013733.700795-2-hzhou@ovn.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [ovs-dev,1/2] ovn-parallel-hmap.h: Minor fixes for hashrow_lock. | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_ovn-kubernetes | success | github build: passed |
| ovsrobot/github-robot-_Build_and_Test | fail | github build: failed |
On 04/10/2021 02:37, Han Zhou wrote: > It is not used, and seems not going to be needed, so remove it. > > Signed-off-by: Han Zhou <hzhou@ovn.org> > --- > lib/ovn-parallel-hmap.c | 1 - > lib/ovn-parallel-hmap.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/lib/ovn-parallel-hmap.c b/lib/ovn-parallel-hmap.c > index b8c7ac786..3c9f3a0ff 100644 > --- a/lib/ovn-parallel-hmap.c > +++ b/lib/ovn-parallel-hmap.c > @@ -132,7 +132,6 @@ ovn_add_worker_pool(void *(*start)(void *)) > new_control->id = i; > new_control->done = new_pool->done; > new_control->data = NULL; > - ovs_mutex_init(&new_control->mutex); > new_control->finished = ATOMIC_VAR_INIT(false); > sprintf(sem_name, WORKER_SEM_NAME, sembase, new_pool, i); > new_control->fire = sem_open(sem_name, O_CREAT, S_IRWXU, 0); > diff --git a/lib/ovn-parallel-hmap.h b/lib/ovn-parallel-hmap.h > index 897208ef8..f3cd7a210 100644 > --- a/lib/ovn-parallel-hmap.h > +++ b/lib/ovn-parallel-hmap.h > @@ -79,7 +79,6 @@ struct worker_control { > atomic_bool finished; /* Set to true after achunk of work is complete. */ > sem_t *fire; /* Work start semaphore - sem_post starts the worker. */ > sem_t *done; /* Work completion semaphore - sem_post on completion. */ > - struct ovs_mutex mutex; /* Guards the data. */ > void *data; /* Pointer to data to be processed. */ > void *workload; /* back-pointer to the worker pool structure. */ > pthread_t worker; I was actually using this in the next series of patches. If we remove it, the next series will be putting it right back in.
On Mon, Oct 4, 2021 at 2:35 AM Anton Ivanov <anton.ivanov@cambridgegreys.com> wrote: > > > On 04/10/2021 02:37, Han Zhou wrote: > > It is not used, and seems not going to be needed, so remove it. > > > > Signed-off-by: Han Zhou <hzhou@ovn.org> > > --- > > lib/ovn-parallel-hmap.c | 1 - > > lib/ovn-parallel-hmap.h | 1 - > > 2 files changed, 2 deletions(-) > > > > diff --git a/lib/ovn-parallel-hmap.c b/lib/ovn-parallel-hmap.c > > index b8c7ac786..3c9f3a0ff 100644 > > --- a/lib/ovn-parallel-hmap.c > > +++ b/lib/ovn-parallel-hmap.c > > @@ -132,7 +132,6 @@ ovn_add_worker_pool(void *(*start)(void *)) > > new_control->id = i; > > new_control->done = new_pool->done; > > new_control->data = NULL; > > - ovs_mutex_init(&new_control->mutex); > > new_control->finished = ATOMIC_VAR_INIT(false); > > sprintf(sem_name, WORKER_SEM_NAME, sembase, new_pool, i); > > new_control->fire = sem_open(sem_name, O_CREAT, S_IRWXU, 0); > > diff --git a/lib/ovn-parallel-hmap.h b/lib/ovn-parallel-hmap.h > > index 897208ef8..f3cd7a210 100644 > > --- a/lib/ovn-parallel-hmap.h > > +++ b/lib/ovn-parallel-hmap.h > > @@ -79,7 +79,6 @@ struct worker_control { > > atomic_bool finished; /* Set to true after achunk of work is complete. */ > > sem_t *fire; /* Work start semaphore - sem_post starts the worker. */ > > sem_t *done; /* Work completion semaphore - sem_post on completion. */ > > - struct ovs_mutex mutex; /* Guards the data. */ > > void *data; /* Pointer to data to be processed. */ > > void *workload; /* back-pointer to the worker pool structure. */ > > pthread_t worker; > > I was actually using this in the next series of patches. > > If we remove it, the next series will be putting it right back in. > Ok, I'll drop this one for now. Thanks, Han > -- > Anton R. Ivanov > Cambridgegreys Limited. Registered in England. Company Number 10273661 > https://www.cambridgegreys.com/ >
diff --git a/lib/ovn-parallel-hmap.c b/lib/ovn-parallel-hmap.c index b8c7ac786..3c9f3a0ff 100644 --- a/lib/ovn-parallel-hmap.c +++ b/lib/ovn-parallel-hmap.c @@ -132,7 +132,6 @@ ovn_add_worker_pool(void *(*start)(void *)) new_control->id = i; new_control->done = new_pool->done; new_control->data = NULL; - ovs_mutex_init(&new_control->mutex); new_control->finished = ATOMIC_VAR_INIT(false); sprintf(sem_name, WORKER_SEM_NAME, sembase, new_pool, i); new_control->fire = sem_open(sem_name, O_CREAT, S_IRWXU, 0); diff --git a/lib/ovn-parallel-hmap.h b/lib/ovn-parallel-hmap.h index 897208ef8..f3cd7a210 100644 --- a/lib/ovn-parallel-hmap.h +++ b/lib/ovn-parallel-hmap.h @@ -79,7 +79,6 @@ struct worker_control { atomic_bool finished; /* Set to true after achunk of work is complete. */ sem_t *fire; /* Work start semaphore - sem_post starts the worker. */ sem_t *done; /* Work completion semaphore - sem_post on completion. */ - struct ovs_mutex mutex; /* Guards the data. */ void *data; /* Pointer to data to be processed. */ void *workload; /* back-pointer to the worker pool structure. */ pthread_t worker;
It is not used, and seems not going to be needed, so remove it. Signed-off-by: Han Zhou <hzhou@ovn.org> --- lib/ovn-parallel-hmap.c | 1 - lib/ovn-parallel-hmap.h | 1 - 2 files changed, 2 deletions(-)