From 18e440197cae6d537765a4de6a915f074dce4de5 Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Mon, 8 Aug 2016 21:15:57 +0200 Subject: irmd: Refactor and bugfixes Refactors the IRMd to extract reg_api and irm_flow structures to their own sources. Fixes some locking bugs. --- src/irmd/irm_flow.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 src/irmd/irm_flow.c (limited to 'src/irmd/irm_flow.c') diff --git a/src/irmd/irm_flow.c b/src/irmd/irm_flow.c new file mode 100644 index 00000000..6531e4f6 --- /dev/null +++ b/src/irmd/irm_flow.c @@ -0,0 +1,81 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * The IPC Resource Manager - Flows + * + * Dimitri Staessens + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include + +#include "irm_flow.h" + +#include +#include + +struct irm_flow * irm_flow_create() +{ + struct irm_flow * f = malloc(sizeof(*f)); + if (f == NULL) + return NULL; + + f->n_api = -1; + f->n_1_api = -1; + f->port_id = -1; + f->state = FLOW_NULL; + + if (pthread_cond_init(&f->state_cond, NULL)) { + free(f); + return NULL; + } + + if (pthread_mutex_init(&f->state_lock, NULL)) { + free(f); + return NULL; + } + + f->t0.tv_sec = 0; + f->t0.tv_nsec = 0; + + return f; +} + +void irm_flow_destroy(struct irm_flow * f) +{ + pthread_mutex_lock(&f->state_lock); + + if (f->state == FLOW_PENDING) + f->state = FLOW_DESTROY; + else + f->state = FLOW_NULL; + + pthread_cond_signal(&f->state_cond); + pthread_mutex_unlock(&f->state_lock); + + pthread_cleanup_push((void (*)(void *)) pthread_mutex_unlock, + (void *) &f->state_lock); + + while (f->state != FLOW_NULL) + pthread_cond_wait(&f->state_cond, &f->state_lock); + + pthread_cleanup_pop(true); + + pthread_cond_destroy(&f->state_cond); + pthread_mutex_destroy(&f->state_lock); + + free(f); +} -- cgit v1.2.3