diff options
| author | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-03-25 11:54:30 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@intec.ugent.be> | 2016-03-25 11:54:30 +0100 |
| commit | 35b00759a9616033aa19177ba3281eb9643509d2 (patch) | |
| tree | c5c15dbe5ac35578aea922ccd5f7d07c9bc00f47 | |
| parent | dc8e71461eb6c1c72dbfd38261a1616c053e7bbd (diff) | |
| parent | 30da4c65b62b5642f3f603b883e695ce2df2e50b (diff) | |
| download | ouroboros-35b00759a9616033aa19177ba3281eb9643509d2.tar.gz ouroboros-35b00759a9616033aa19177ba3281eb9643509d2.zip | |
Merged in dstaesse/ouroboros/be-logfix (pull request #41)
lib/ipcpd: fixed logging mistake
| -rw-r--r-- | include/ouroboros/shm_du_map.h | 3 | ||||
| -rw-r--r-- | src/ipcpd/pci.c | 4 | ||||
| -rw-r--r-- | src/ipcpd/pci.h | 3 | ||||
| -rw-r--r-- | src/lib/shm_du_map.c | 5 | ||||
| -rw-r--r-- | src/lib/tests/shm_du_map_test.c | 4 |
5 files changed, 13 insertions, 6 deletions
diff --git a/include/ouroboros/shm_du_map.h b/include/ouroboros/shm_du_map.h index 05c49c2d..68492a91 100644 --- a/include/ouroboros/shm_du_map.h +++ b/include/ouroboros/shm_du_map.h @@ -28,8 +28,6 @@ #define _POSIX_C_SOURCE 199506L #endif -#define OUROBOROS_PREFIX "shm_du_map" - #ifndef SHM_DU_BUFF_BLOCK_SIZE #define SHM_DU_BUFF_BLOCK_SIZE sysconf(_SC_PAGESIZE) #endif @@ -43,7 +41,6 @@ #endif #include "common.h" -#include "logs.h" struct shm_du_buff; struct shm_du_map; diff --git a/src/ipcpd/pci.c b/src/ipcpd/pci.c index 19c42e53..548e40e2 100644 --- a/src/ipcpd/pci.c +++ b/src/ipcpd/pci.c @@ -25,6 +25,10 @@ #include <malloc.h> #include <errno.h> +#define OUROBOROS_PREFIX "ipcp/pci" + +#include <ouroboros/logs.h> + #define PCI_HEAD_SIZE(a, b) a.addr_size * 2 + \ a.cep_id_size * 2 + \ a.pdu_length_size + \ diff --git a/src/ipcpd/pci.h b/src/ipcpd/pci.h index c7095bbd..3c011723 100644 --- a/src/ipcpd/pci.h +++ b/src/ipcpd/pci.h @@ -24,10 +24,7 @@ #ifndef OUROBOROS_IPCP_PCI_H #define OUROBOROS_IPCP_PCI_H -#define OUROBOROS_PREFIX "ipcp/pci" - #include "ouroboros/du_buff.h" -#include "ouroboros/logs.h" #include "dt_const.h" struct pci; diff --git a/src/lib/shm_du_map.c b/src/lib/shm_du_map.c index dc73077f..74affc13 100644 --- a/src/lib/shm_du_map.c +++ b/src/lib/shm_du_map.c @@ -28,6 +28,11 @@ #include <malloc.h> #include <string.h> +#define OUROBOROS_PREFIX "shm_du_map" + +#include <ouroboros/logs.h> + + #define SHM_BLOCKS_SIZE (SHM_BLOCKS_IN_MAP * SHM_DU_BUFF_BLOCK_SIZE) #define SHM_FILE_SIZE (SHM_BLOCKS_SIZE + 2 * sizeof (size_t) \ + sizeof(pthread_mutex_t)) diff --git a/src/lib/tests/shm_du_map_test.c b/src/lib/tests/shm_du_map_test.c index d9b44732..f636c941 100644 --- a/src/lib/tests/shm_du_map_test.c +++ b/src/lib/tests/shm_du_map_test.c @@ -27,6 +27,10 @@ #include <sys/mman.h> #include <pthread.h> +#define OUROBOROS_PREFIX "lib/test/shm_du_map_test" + +#include <ouroboros/logs.h> + #define SIZE_OF_DU_BUFF 24 #define TEST_BUFF_SIZE (SHM_DU_BUFF_BLOCK_SIZE - SIZE_OF_DU_BUFF) |