From 0c41273687df7aaebf8b749a89d4c2ab328bf4c1 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Sat, 27 Aug 2016 23:25:53 +0200 Subject: cdap: Fix destruction Destroying NULL should succeed. Resources need to be freed even if flow_dealloc fails. --- src/lib/cdap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/lib/cdap.c') diff --git a/src/lib/cdap.c b/src/lib/cdap.c index 5dc050a4..df2128a0 100644 --- a/src/lib/cdap.c +++ b/src/lib/cdap.c @@ -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); -- cgit v1.2.3 From bb2e24baf3f05c03450defd4c22a8a1279698bb1 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Mon, 29 Aug 2016 10:46:10 +0200 Subject: lib, cdap: Fix message handler When getting a DELETE opcode, create was called instead of delete. --- src/lib/cdap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/cdap.c') diff --git a/src/lib/cdap.c b/src/lib/cdap.c index df2128a0..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, -- cgit v1.2.3