diff options
| -rw-r--r-- | src/irmd/api_table.c | 10 | ||||
| -rw-r--r-- | src/irmd/api_table.h | 2 | ||||
| -rw-r--r-- | src/lib/cdap.c | 11 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/irmd/api_table.c b/src/irmd/api_table.c index 2747ed1a..519b4efe 100644 --- a/src/irmd/api_table.c +++ b/src/irmd/api_table.c @@ -70,6 +70,11 @@ void api_entry_destroy(struct api_entry * e) pthread_mutex_lock(&e->state_lock); + if (e->state == API_DESTROY) { + pthread_mutex_unlock(&e->state_lock); + return; + } + if (e->state == API_SLEEP) e->state = API_DESTROY; @@ -163,6 +168,9 @@ int api_entry_sleep(struct api_entry * e) } } + if (e->state == API_DESTROY) + ret = -1; + e->state = API_INIT; pthread_cond_broadcast(&e->state_cond); pthread_mutex_unlock(&e->state_lock); @@ -177,7 +185,7 @@ void api_entry_wake(struct api_entry * e, struct reg_entry * re) pthread_mutex_lock(&e->state_lock); - if (e->state == API_NULL) { + if (e->state != API_SLEEP) { pthread_mutex_unlock(&e->state_lock); return; } diff --git a/src/irmd/api_table.h b/src/irmd/api_table.h index 0758fdb8..8741a86b 100644 --- a/src/irmd/api_table.h +++ b/src/irmd/api_table.h @@ -41,7 +41,7 @@ struct api_entry { pid_t api; char * apn; /* application process instantiated */ char * daf_name; /* DAF this AP-I belongs to */ - struct list_head names; /* names for which this api accepts flows */ + struct list_head names; /* names for which api accepts flows */ struct reg_entry * re; /* reg_entry for which a flow arrived */ diff --git a/src/lib/cdap.c b/src/lib/cdap.c index 5dc050a4..8b1b3bc6 100644 --- a/src/lib/cdap.c +++ b/src/lib/cdap.c @@ -107,7 +107,7 @@ static void * handle_cdap_msg(void * o) case OPCODE__DELETE: if (msg->name != NULL && msg->has_value) - instance->ops->cdap_create(instance, + instance->ops->cdap_delete(instance, msg->invoke_id, msg->name, msg->value.data, @@ -230,12 +230,10 @@ struct cdap * cdap_create(struct cdap_ops * ops, int cdap_destroy(struct cdap * instance) { if (instance == NULL) - return -1; + return 0; pthread_cancel(instance->reader); - - if (flow_dealloc(instance->fd)) - return -1; + pthread_join(instance->reader, NULL); pthread_mutex_lock(&instance->ids_lock); @@ -243,8 +241,7 @@ int cdap_destroy(struct cdap * instance) pthread_mutex_unlock(&instance->ids_lock); - pthread_join(instance->reader, - NULL); + flow_dealloc(instance->fd); free(instance); |