From 04a8f3ceedefa63f9344311e5ff05ab3ce754fda Mon Sep 17 00:00:00 2001 From: dimitri staessens Date: Thu, 7 Jul 2016 15:12:42 +0200 Subject: lib: Add lockfile The pid of the IRMd is stored in a lockfile in shared memory. This makes checking if the IRMd is running independent of the configuration, as previously the IRMd pid was stored at the end of the shm_du_map, which could not be read by an IRMd that would be compiled with different configuration options. Also corrects some unnecessary includes Fixes #21. --- include/ouroboros/config.h.in | 5 +++-- include/ouroboros/lockfile.h | 37 +++++++++++++++++++++++++++++++++++++ include/ouroboros/shm_du_map.h | 5 +---- 3 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 include/ouroboros/lockfile.h (limited to 'include') diff --git a/include/ouroboros/config.h.in b/include/ouroboros/config.h.in index c11c2d05..7bb4cee0 100644 --- a/include/ouroboros/config.h.in +++ b/include/ouroboros/config.h.in @@ -34,12 +34,13 @@ #define AP_MAX_FLOWS 256 #define SHM_DU_BUFF_BLOCK_SIZE sysconf(_SC_PAGESIZE) #define SHM_DU_MAP_MULTI_BLOCK -#define SHM_DU_MAP_FILENAME "ouroboros_du_map" +#define SHM_DU_MAP_FILENAME "ouroboros.shm" +#define LOCKFILE_NAME "ouroboros.lockfile" #define SHM_BLOCKS_IN_MAP (1 << 14) #define SHM_DU_TIMEOUT_MICROS 15000 #define DU_BUFF_HEADSPACE 128 #define DU_BUFF_TAILSPACE 0 -#define SHM_AP_RBUFF_PREFIX "ouroboros_rb_" +#define SHM_AP_RBUFF_PREFIX "ouroboros.rbuff." #define SHM_RBUFF_SIZE (1 << 14) #define IRMD_MAX_FLOWS 4096 #define IRMD_THREADPOOL_SIZE 3 diff --git a/include/ouroboros/lockfile.h b/include/ouroboros/lockfile.h new file mode 100644 index 00000000..c2cf4572 --- /dev/null +++ b/include/ouroboros/lockfile.h @@ -0,0 +1,37 @@ +/* + * Ouroboros - Copyright (C) 2016 + * + * Lockfile for ouroboros system + * + * 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. + */ + +#ifndef OUROBOROS_LOCKFILE_H +#define OUROBOROS_LOCKFILE_H + +#include + +struct lockfile; + +struct lockfile * lockfile_create(); +struct lockfile * lockfile_open(); +void lockfile_close(struct lockfile * lf); +void lockfile_destroy(struct lockfile * lf); + +pid_t lockfile_owner(struct lockfile * lf); + +#endif diff --git a/include/ouroboros/shm_du_map.h b/include/ouroboros/shm_du_map.h index 59cd94a1..23c0c3aa 100644 --- a/include/ouroboros/shm_du_map.h +++ b/include/ouroboros/shm_du_map.h @@ -24,11 +24,9 @@ #ifndef OUROBOROS_SHM_DU_MAP_H #define OUROBOROS_SHM_DU_MAP_H -#include -#include #include -#include #include +#include struct shm_du_buff; struct shm_du_map; @@ -38,7 +36,6 @@ struct shm_du_map * shm_du_map_open(); void shm_du_map_close(struct shm_du_map * dum); void shm_du_map_close_on_exit(struct shm_du_map * dum); void shm_du_map_destroy(struct shm_du_map * dum); -pid_t shm_du_map_owner(struct shm_du_map * dum); void * shm_du_map_sanitize(void * o); /* returns the index of the buffer in the DU map */ -- cgit v1.2.3