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/reg_api.c | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 src/irmd/reg_api.c (limited to 'src/irmd/reg_api.c') diff --git a/src/irmd/reg_api.c b/src/irmd/reg_api.c new file mode 100644 index 00000000..e2da1244 --- /dev/null +++ b/src/irmd/reg_api.c @@ -0,0 +1,120 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * The IPC Resource Manager - Registered Application Instances + * + * Dimitri Staessens + * Sander Vrijders + * + * 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 "reg_api.h" + +#include +#include + +struct reg_api * reg_api_create(pid_t api) +{ + struct reg_api * i; + i = malloc(sizeof(*i)); + if (i == NULL) + return NULL; + + i->api = api; + i->state = REG_I_INIT; + + pthread_mutex_init(&i->state_lock, NULL); + pthread_cond_init(&i->state_cond, NULL); + + INIT_LIST_HEAD(&i->next); + + return i; +} + +void reg_api_destroy(struct reg_api * i) +{ + if (i == NULL) + return; + + pthread_mutex_lock(&i->state_lock); + + if (i->state != REG_I_NULL) + i->state = REG_I_DESTROY; + + pthread_cond_signal(&i->state_cond); + + pthread_mutex_unlock(&i->state_lock); + + pthread_cleanup_push((void(*)(void *)) pthread_mutex_unlock, + (void *) &i->state_lock); + + while (i->state != REG_I_NULL) + pthread_cond_wait(&i->state_cond, &i->state_lock); + + pthread_cleanup_pop(true); + + pthread_cond_destroy(&i->state_cond); + pthread_mutex_destroy(&i->state_lock); + + free(i); +} + +static void cleanup_sleeper(void * o) { + struct reg_api * i = (struct reg_api *) o; + i->state = REG_I_NULL; + pthread_cond_signal(&i->state_cond); + pthread_mutex_unlock(&i->state_lock); +} + +void reg_api_sleep(struct reg_api * i) +{ + if (i == NULL) + return; + + pthread_mutex_lock(&i->state_lock); + if (i->state != REG_I_INIT) { + pthread_mutex_unlock(&i->state_lock); + return; + } + + i->state = REG_I_SLEEP; + + pthread_cleanup_push(cleanup_sleeper, (void *) i); + + while (i->state == REG_I_SLEEP) + pthread_cond_wait(&i->state_cond, &i->state_lock); + + pthread_cleanup_pop(true); +} + +void reg_api_wake(struct reg_api * i) +{ + pthread_mutex_lock(&i->state_lock); + + if (i->state == REG_I_NULL) { + pthread_mutex_unlock(&i->state_lock); + return; + } + + i->state = REG_I_WAKE; + + pthread_cond_broadcast(&i->state_cond); + + while (i->state == REG_I_WAKE) + pthread_cond_wait(&i->state_cond, &i->state_lock); + + pthread_mutex_unlock(&i->state_lock); +} -- cgit v1.2.3