diff options
author | Sander Vrijders <[email protected]> | 2016-08-25 11:58:44 +0200 |
---|---|---|
committer | Sander Vrijders <[email protected]> | 2016-08-25 11:58:44 +0200 |
commit | 830f60599a7912c89b4754e7c757f2ef9e6c00f0 (patch) | |
tree | 8a8c3f900dbc16ce9435a0060a1d5abb98ba544c /src | |
parent | efe987478954d84e970e8b872bddb224d35b211b (diff) | |
parent | 6da1fa9716e508d5d15d2953a2c358cfd24c1570 (diff) | |
download | ouroboros-830f60599a7912c89b4754e7c757f2ef9e6c00f0.tar.gz ouroboros-830f60599a7912c89b4754e7c757f2ef9e6c00f0.zip |
Merged in dstaesse/ouroboros/be-bugfixing (pull request #225)
irmd: Remove stale sources
Diffstat (limited to 'src')
-rw-r--r-- | src/irmd/reg_api.c | 136 | ||||
-rw-r--r-- | src/irmd/reg_api.h | 55 |
2 files changed, 0 insertions, 191 deletions
diff --git a/src/irmd/reg_api.c b/src/irmd/reg_api.c deleted file mode 100644 index 5b7750f7..00000000 --- a/src/irmd/reg_api.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - * - * The IPC Resource Manager - Registered Application Instances - * - * Dimitri Staessens <[email protected]> - * Sander Vrijders <[email protected]> - * - * 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 <ouroboros/config.h> -#include <ouroboros/time_utils.h> -#include <ouroboros/errno.h> - -#include "reg_api.h" - -#include <stdlib.h> -#include <stdbool.h> -#include <time.h> - -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_INIT) - i->state = REG_I_NULL; - - if (i->state != REG_I_NULL) - i->state = REG_I_DESTROY; - - pthread_cond_signal(&i->state_cond); - - while (i->state != REG_I_NULL) - pthread_cond_wait(&i->state_cond, &i->state_lock); - - pthread_mutex_unlock(&i->state_lock); - - pthread_cond_destroy(&i->state_cond); - pthread_mutex_destroy(&i->state_lock); - - free(i); -} - -int reg_api_sleep(struct reg_api * i) -{ - struct timespec timeout = {(IRMD_ACCEPT_TIMEOUT / 1000), - (IRMD_ACCEPT_TIMEOUT % 1000) * MILLION}; - struct timespec now; - struct timespec dl; - - int ret = 0; - - if (i == NULL) - return -EINVAL; - - clock_gettime(CLOCK_REALTIME, &now); - - ts_add(&now, &timeout, &dl); - - pthread_mutex_lock(&i->state_lock); - if (i->state != REG_I_INIT) { - pthread_mutex_unlock(&i->state_lock); - return -EINVAL; - } - - i->state = REG_I_SLEEP; - - while (i->state == REG_I_SLEEP) { - if ((ret = -pthread_cond_timedwait(&i->state_cond, - &i->state_lock, - &dl)) == -ETIMEDOUT) { - i->state = REG_I_INIT; - break; - } else { - i->state = REG_I_NULL; - pthread_cond_broadcast(&i->state_cond); - } - } - - pthread_mutex_unlock(&i->state_lock); - - return ret; -} - -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); -} diff --git a/src/irmd/reg_api.h b/src/irmd/reg_api.h deleted file mode 100644 index 2c84f4c1..00000000 --- a/src/irmd/reg_api.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Ouroboros - Copyright (C) 2016 - * - * The IPC Resource Manager - Registered Application Instances - * - * Dimitri Staessens <[email protected]> - * Sander Vrijders <[email protected]> - * - * 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. - */ - - -#ifndef OUROBOROS_IRMD_REG_API_H -#define OUROBOROS_IRMD_REG_API_H - -#include <ouroboros/list.h> -#include <sys/types.h> -#include <pthread.h> - -enum api_state { - REG_I_NULL = 0, - REG_I_INIT, - REG_I_SLEEP, - REG_I_WAKE, - REG_I_DESTROY -}; - -struct reg_api { - struct list_head next; - pid_t api; - - /* the api will block on this */ - enum api_state state; - pthread_cond_t state_cond; - pthread_mutex_t state_lock; -}; - -struct reg_api * reg_api_create(pid_t pid); -void reg_api_destroy(struct reg_api * i); -int reg_api_sleep(struct reg_api * i); -void reg_api_wake(struct reg_api * i); - -#endif /* OUROBOROS_IRMD_REG_API_H */ |