summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/daemon/dlt-daemon.c33
-rw-r--r--src/daemon/dlt-daemon.h5
-rw-r--r--src/lib/dlt_user.c22
-rw-r--r--src/shared/dlt_common.c20
-rw-r--r--src/shared/dlt_shm.c339
5 files changed, 299 insertions, 120 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
index 3c80434..2f18ca8 100644
--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
@@ -106,6 +106,12 @@ void usage()
printf(" (Applications wanting to connect to a daemon using a\n");
printf(" custom directory need to be started with the environment \n");
printf(" variable DLT_PIPE_DIR set appropriately)\n");
+#ifdef DLT_SHM_ENABLE
+ printf(" -s filename The file name to create the share memory (Default: /dlt-shm)\n");
+ printf(" (Applications wanting to connect to a daemon using a\n");
+ printf(" custom shm name need to be started with the environment \n");
+ printf(" variable DLT_SHM_NAME set appropriately)\n");
+#endif
printf(" -p port port to monitor for incoming requests (Default: 3490)\n");
printf(" (Applications wanting to connect to a daemon using a custom\n");
printf(" port need to be started with the environment variable\n");
@@ -132,9 +138,17 @@ int option_handling(DltDaemonLocal *daemon_local, int argc, char *argv[])
strncpy(dltFifoBaseDir, DLT_USER_IPC_PATH, DLT_PATH_MAX);
dltFifoBaseDir[DLT_PATH_MAX - 1] = 0;
+#ifdef DLT_SHM_ENABLE
+ strncpy(dltShmName, "/dlt-shm", NAME_MAX);
+#endif
+
opterr = 0;
+#ifdef DLT_SHM_ENABLE
+ while ((c = getopt (argc, argv, "hdc:t:s:p:")) != -1)
+#else
while ((c = getopt (argc, argv, "hdc:t:p:")) != -1)
+#endif
switch (c) {
case 'd':
{
@@ -152,6 +166,13 @@ int option_handling(DltDaemonLocal *daemon_local, int argc, char *argv[])
dltFifoBaseDir[DLT_PATH_MAX - 1] = 0;
break;
}
+#ifdef DLT_SHM_ENABLE
+ case 's':
+ {
+ strncpy(dltShmName, optarg, NAME_MAX);
+ break;
+ }
+#endif
case 'p':
{
daemon_local->flags.port = atoi(optarg);
@@ -192,9 +213,13 @@ int option_handling(DltDaemonLocal *daemon_local, int argc, char *argv[])
#ifndef DLT_USE_UNIX_SOCKET_IPC
snprintf(daemon_local->flags.userPipesDir, DLT_PATH_MAX,
"%s/dltpipes", dltFifoBaseDir);
-#endif
snprintf(daemon_local->flags.daemonFifoName, DLT_PATH_MAX,
"%s/dlt", dltFifoBaseDir);
+#endif
+
+#ifdef DLT_SHM_ENABLE
+ strncpy(daemon_local->flags.dltShmName, dltShmName, NAME_MAX);
+#endif
return 0;
@@ -930,7 +955,9 @@ int dlt_daemon_local_init_p2(DltDaemon *daemon, DltDaemonLocal *daemon_local, in
#ifdef DLT_SHM_ENABLE
/* init shared memory */
- if (dlt_shm_init_server(&(daemon_local->dlt_shm), DLT_SHM_KEY, daemon_local->flags.sharedMemorySize) == -1) {
+ if (dlt_shm_init_server(&(daemon_local->dlt_shm), daemon_local->flags.dltShmName,
+ daemon_local->flags.sharedMemorySize) == DLT_RETURN_ERROR)
+ {
dlt_log(LOG_ERR, "Could not initialize shared memory\n");
return -1;
}
@@ -1312,7 +1339,7 @@ void dlt_daemon_local_cleanup(DltDaemon *daemon, DltDaemonLocal *daemon_local, i
#ifdef DLT_SHM_ENABLE
/* free shared memory */
- dlt_shm_free_server(&(daemon_local->dlt_shm));
+ dlt_shm_free_server(&(daemon_local->dlt_shm), daemon_local->flags.dltShmName);
#endif
if (daemon_local->flags.offlineLogstorageMaxDevices > 0) {
diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h
index 39ccb91..4702b69 100644
--- a/src/daemon/dlt-daemon.h
+++ b/src/daemon/dlt-daemon.h
@@ -121,9 +121,12 @@ typedef struct
char appSockPath[DLT_DAEMON_FLAG_MAX]; /**< Path to User socket */
#else
char userPipesDir[DLT_PATH_MAX]; /**< (String: Directory) directory where dltpipes reside (Default: /tmp/dltpipes) */
-#endif
char daemonFifoName[DLT_PATH_MAX]; /**< (String: Filename) name of local fifo (Default: /tmp/dlt) */
char daemonFifoGroup[DLT_PATH_MAX]; /**< (String: Group name) Owner group of local fifo (Default: Primary Group) */
+#endif
+#ifdef DLT_SHM_ENABLE
+ char dltShmName[NAME_MAX + 1]; /**< Shared memory name */
+#endif
unsigned int port; /**< port number */
char ctrlSockPath[DLT_DAEMON_FLAG_MAX]; /**< Path to Control socket */
int gatewayMode; /**< (Boolean) Gateway Mode */
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index d040d38..4ae1fde 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -365,16 +365,12 @@ DltReturnValue dlt_init(void)
memset(&(dlt_user.dlt_shm), 0, sizeof(DltShm));
/* init shared memory */
- if (dlt_shm_init_client(&(dlt_user.dlt_shm), DLT_SHM_KEY) < 0) {
- dlt_vlog(LOG_WARNING,
- "Logging disabled, Shared memory %d cannot be created!\n",
- DLT_SHM_KEY);
- /*return 0; */
- }
+ if (dlt_shm_init_client(&(dlt_user.dlt_shm), dltShmName) < DLT_RETURN_OK)
+ dlt_vnlog(LOG_WARNING, DLT_USER_BUFFER_LENGTH, "Logging disabled,"
+ " Shared memory %s cannot be created!\n", dltShmName);
#endif
#ifdef DLT_USE_UNIX_SOCKET_IPC
-
if (dlt_initialize_socket_connection() != DLT_RETURN_OK)
/* We could connect to the pipe, but not to the socket, which is normally */
/* open before by the DLT daemon => bad failure => return error code */
@@ -382,7 +378,6 @@ DltReturnValue dlt_init(void)
return DLT_RETURN_ERROR;
#else /* FIFO connection */
-
if (dlt_initialize_fifo_connection() != DLT_RETURN_OK)
return DLT_RETURN_ERROR;
@@ -391,7 +386,6 @@ DltReturnValue dlt_init(void)
dlt_user_initialised = false;
return DLT_RETURN_ERROR;
}
-
#endif
/* These will be lazy initialized only when needed */
@@ -4439,13 +4433,9 @@ void dlt_user_log_reattach_to_daemon(void)
#ifdef DLT_SHM_ENABLE
/* init shared memory */
- if (dlt_shm_init_client(&dlt_user.dlt_shm, DLT_SHM_KEY) < 0)
- dlt_vnlog(LOG_WARNING,
- DLT_USER_BUFFER_LENGTH,
- "Loging disabled, Shared memory %d cannot be created!\n",
- DLT_SHM_KEY);
- /*return DLT_RETURN_OK; */
-
+ if (dlt_shm_init_client(&dlt_user.dlt_shm, dltShmName) < DLT_RETURN_OK)
+ dlt_vnlog(LOG_WARNING, DLT_USER_BUFFER_LENGTH, "Logging disabled,"
+ " Shared memory %s cannot be created!\n", dltShmName);
#endif
dlt_log(LOG_NOTICE, "Logging (re-)enabled!\n");
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index 58896f6..8cb9413 100644
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -67,6 +67,10 @@ const char dltSerialHeader[DLT_ID_SIZE] = { 'D', 'L', 'S', 1 };
char dltSerialHeaderChar[DLT_ID_SIZE] = { 'D', 'L', 'S', 1 };
char dltFifoBaseDir[DLT_PATH_MAX] = "/tmp";
+#ifdef DLT_SHM_ENABLE
+char dltShmName[NAME_MAX + 1] = "/dlt-shm";
+#endif
+
/* internal logging parameters */
static int logging_mode = DLT_LOG_TO_CONSOLE;
static int logging_level = LOG_INFO;
@@ -1703,6 +1707,14 @@ void dlt_log_set_fifo_basedir(const char *env_pipe_dir)
dltFifoBaseDir[DLT_PATH_MAX - 1] = 0;
}
+#ifdef DLT_SHM_ENABLE
+void dlt_log_set_shm_name(const char * env_shm_name)
+{
+ strncpy(dltShmName, env_shm_name, NAME_MAX);
+ dltShmName[NAME_MAX] = 0;
+}
+#endif
+
void dlt_log_init(int mode)
{
if ((mode < DLT_LOG_TO_CONSOLE) || (mode > DLT_LOG_DROPPED)) {
@@ -3704,6 +3716,14 @@ void dlt_check_envvar()
if (env_pipe_dir != NULL)
dlt_log_set_fifo_basedir(env_pipe_dir);
+
+#ifdef DLT_SHM_ENABLE
+ char* env_shm_name = getenv("DLT_SHM_NAME");
+ if (env_shm_name != NULL)
+ {
+ dlt_log_set_shm_name(env_shm_name);
+ }
+#endif
}
int dlt_set_loginfo_parse_service_id(char *resp_text,
diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c
index 8fb3a72..e1c96b7 100644
--- a/src/shared/dlt_shm.c
+++ b/src/shared/dlt_shm.c
@@ -53,16 +53,16 @@
*******************************************************************************/
#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#include <sys/sem.h>
+#include <fcntl.h>
#include <sys/stat.h>
+#include <sys/mman.h>
#include <stdio.h>
#include <string.h>
+#include <errno.h>
#if !defined(_MSC_VER)
-# include <unistd.h>
-# include <syslog.h>
+#include <unistd.h>
+#include <syslog.h>
#endif
#include <dlt_shm.h>
@@ -82,114 +82,206 @@ void dlt_shm_print_hex(char *ptr, int size)
printf("\n");
}
-void dlt_shm_pv(int id, int operation)
+DltReturnValue dlt_shm_init_server(DltShm *buf, const char *name, int size)
{
- static struct sembuf semaphor;
-
- semaphor.sem_op = operation;
- semaphor.sem_flg = SEM_UNDO;
-
- if (semop(id, &semaphor, 1) == -1)
- dlt_log(LOG_WARNING, "SHM: semop() failed");
-}
-
-int dlt_shm_init_server(DltShm *buf, int key, int size)
-{
- struct shmid_ds shm_buf;
unsigned char *ptr;
- /* Init parameters */
- buf->shmid = 0;
- buf->semid = 0;
+ /* Check if buffer and name available */
+ if (buf == NULL || name == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return DLT_RETURN_WRONG_PARAMETER;
+ }
- /* Create the segment. */
- if ((buf->shmid = shmget(key, size, IPC_CREAT | 0666)) < 0) {
- dlt_log(LOG_WARNING, "SHM: shmget() failed");
+ /* Init parameters */
+ buf->shmfd = 0;
+ buf->sem = NULL;
+
+ /**
+ * Create the shared memory segment.
+ * @name Name of the new shared memory object.
+ * (shm_open will create a file under /dev/shm/<name>)
+ * @oflag O_CREAT | O_EXCL | O_RDWR
+ * O_CREAT | O_EXCL: The shm_open() fails if the shared memory exists.
+ * O_RDWR: Open the object for read-write access.
+ * @mode 0666
+ * The shared memory object's permission.
+ */
+ buf->shmfd = shm_open(name, O_CREAT | O_EXCL | O_RDWR, 0666);
+ if (buf->shmfd == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: shm_open() failed: %s\n",
+ __func__, strerror(errno));
return DLT_RETURN_ERROR; /* ERROR */
}
- /* get the size of shm */
- if (shmctl(buf->shmid, IPC_STAT, &shm_buf)) {
- dlt_log(LOG_WARNING, "SHM: shmctl() failed");
+ /* Set the size of shm */
+ if (ftruncate(buf->shmfd, size) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: ftruncate() failed: %s\n",
+ __func__, strerror(errno));
return DLT_RETURN_ERROR; /* ERROR */
}
/* Now we attach the segment to our data space. */
- if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *)-1) {
- dlt_log(LOG_WARNING, "SHM: shmat() failed");
+ ptr = (unsigned char *)mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+ buf->shmfd, 0);
+ if (ptr == MAP_FAILED)
+ {
+ dlt_vlog(LOG_ERR, "%s: mmap() failed: %s\n",
+ __func__, strerror(errno));
return DLT_RETURN_ERROR; /* ERROR */
}
- /* Init semaphore */
- if ((buf->semid = semget(DLT_SHM_SEM, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT | IPC_EXCL)) == -1) {
- if ((buf->semid = semget(DLT_SHM_SEM, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_EXCL)) == -1) {
- dlt_log(LOG_WARNING, "SHM: semget() failed");
- return DLT_RETURN_ERROR; /* ERROR */
- }
+ /**
+ * Create the semaphore with input name
+ * @name name
+ * Name of the new semaphore
+ * (sem_open will create a file under /dev/shm/sem.<name>)
+ * @oflag O_CREAT | O_EXCEL
+ * The sem_open() fails if the semaphore name exists.
+ * @mode 0777
+ * The permissions to be placed on the new semaphore.
+ * @value 1
+ * Initial value for the new semaphore.
+ */
+ buf->sem = sem_open(name, O_CREAT | O_EXCL, 0666, 1);
+ if (buf->sem == SEM_FAILED)
+ {
+ dlt_vlog(LOG_ERR, "%s: sem_open() failed: %s\n",
+ __func__, strerror(errno));
+ return DLT_RETURN_ERROR; /* ERROR */
}
- if (semctl(buf->semid, 0, SETVAL, (int)1) == -1) {
- dlt_log(LOG_WARNING, "SHM: semctl() failed");
+ /* Init buffer */
+ dlt_buffer_init_static_server(&(buf->buffer), ptr, size);
+
+ /* The 'buf->shmfd' is no longer needed */
+ if (close(buf->shmfd) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: Failed to close shared memory"
+ " file descriptor: %s\n", __func__, strerror(errno));
return DLT_RETURN_ERROR; /* ERROR */
}
- /* init buffer */
- dlt_buffer_init_static_server(&(buf->buffer), ptr, shm_buf.shm_segsz);
-
return DLT_RETURN_OK; /* OK */
}
-DltReturnValue dlt_shm_init_client(DltShm *buf, int key)
+DltReturnValue dlt_shm_init_client(DltShm *buf, const char *name)
{
- struct shmid_ds shm_buf;
+ struct stat shm_buf;
unsigned char *ptr;
- /* init parameters */
- buf->shmid = 0;
- buf->semid = 0;
+ /* Check if buffer and name available */
+ if (buf == NULL || name == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return DLT_RETURN_WRONG_PARAMETER;
+ }
- /* Create the segment. */
- if ((buf->shmid = shmget(key, 0, 0666)) < 0) {
- dlt_log(LOG_WARNING, "SHM: shmget() failed");
+ /* Init parameters */
+ buf->shmfd = 0;
+ buf->sem = NULL;
+
+ /**
+ * Open the existing shared memory segment created by the server.
+ * @name Name of the existing shared memory object.
+ * (shm_open will open the file under /dev/shm/<name>)
+ * @oflag O_RDWR
+ * Open the object for read-write access.
+ * @mode 0
+ * We are not creating a new object, this argument should be specified as 0.
+ */
+ buf->shmfd = shm_open(name, O_RDWR, 0);
+ if (buf->shmfd == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: shm_open() failed: %s\n",
+ __func__, strerror(errno));
return DLT_RETURN_ERROR; /* ERROR */
}
- /* get the size of shm */
- if (shmctl(buf->shmid, IPC_STAT, &shm_buf)) {
- dlt_log(LOG_WARNING, "SHM: shmctl() failed");
- return DLT_RETURN_ERROR; /* ERROR */
+ /* Get the size of shm */
+ if (fstat(buf->shmfd, &shm_buf) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: fstat() failed: %s\n",
+ __func__, strerror(errno));
+ return DLT_RETURN_ERROR; /* ERROR */
}
/* Now we attach the segment to our data space. */
- if ((ptr = shmat(buf->shmid, NULL, 0)) == (unsigned char *)-1) {
- dlt_log(LOG_WARNING, "shmat() failed");
+ ptr = (unsigned char *)mmap(NULL, shm_buf.st_size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, buf->shmfd, 0);
+ if (ptr == MAP_FAILED)
+ {
+ dlt_vlog(LOG_ERR, "%s: mmap() failed: %s\n",
+ __func__, strerror(errno));
return DLT_RETURN_ERROR; /* ERROR */
}
- /* Init semaphore */
- if ((buf->semid = semget(DLT_SHM_SEM, 0, 0)) == -1) {
- dlt_log(LOG_WARNING, "SHM: semget() failed");
- return DLT_RETURN_ERROR; /* ERROR */
+ /**
+ * Open the existing semaphore with name created by the server
+ * The call requires only two arguments.
+ * @name name
+ * Name of the existing semaphore
+ * (sem_open will open a file under /dev/shm/sem.<name>)
+ * @oflag 0
+ * We are accessing an existing semaphore, oflag should be specified as 0.
+ */
+ buf->sem = sem_open(name, 0);
+ if (buf->sem == SEM_FAILED)
+ {
+ dlt_vlog(LOG_ERR, "%s: sem_open() failed: %s\n",
+ __func__, strerror(errno));
+ return DLT_RETURN_ERROR; /* ERROR */
}
- /* init buffer */
- dlt_buffer_init_static_client(&(buf->buffer), ptr, shm_buf.shm_segsz);
+ /* Init buffer */
+ dlt_buffer_init_static_client(&(buf->buffer), ptr, shm_buf.st_size);
+
+ /* The 'buf->shmfd' is no longer needed */
+ if (close(buf->shmfd) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: Failed to close shared memory"
+ " file descriptor: %s\n", __func__, strerror(errno));
+ return DLT_RETURN_ERROR; /* ERROR */
+ }
return DLT_RETURN_OK; /* OK */
}
void dlt_shm_info(DltShm *buf)
{
+ /* Check if buffer available */
+ if (buf == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return;
+ }
+
dlt_buffer_info(&(buf->buffer));
}
void dlt_shm_status(DltShm *buf)
{
+ /* Check if buffer available */
+ if (buf == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return;
+ }
+
dlt_buffer_status(&(buf->buffer));
}
int dlt_shm_get_total_size(DltShm *buf)
{
+ /* Check if buffer available */
+ if (buf == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return -1;
+ }
+
return dlt_buffer_get_total_size(&(buf->buffer));
}
@@ -197,19 +289,28 @@ int dlt_shm_get_used_size(DltShm *buf)
{
int ret;
- /* check if buffer available */
- if (!buf->buffer.mem)
+ /* Check if buffer available */
+ if ((buf == NULL) || (buf->buffer.mem == NULL))
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
return -1;
+ }
- DLT_SHM_SEM_GET(buf->semid);
- ret = dlt_buffer_get_used_size(&(buf->buffer));
- DLT_SHM_SEM_FREE(buf->semid);
+ DLT_SHM_SEM_GET(buf->sem);
+ ret = dlt_buffer_get_used_size(&(buf->buffer));
+ DLT_SHM_SEM_FREE(buf->sem);
return ret;
}
int dlt_shm_get_message_count(DltShm *buf)
{
+ /* Check if buffer available */
+ if (buf == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return -1;
+ }
return dlt_buffer_get_message_count(&(buf->buffer));
}
@@ -223,13 +324,17 @@ int dlt_shm_push(DltShm *buf,
{
int ret;
- /* check if buffer available */
- if (!buf->buffer.mem)
+ /* Check if buffer available */
+ if ((buf == NULL) || (buf->buffer.mem == NULL))
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
return -1;
+ }
- DLT_SHM_SEM_GET(buf->semid);
- ret = dlt_buffer_push3(&(buf->buffer), data1, size1, data2, size2, data3, size3);
- DLT_SHM_SEM_FREE(buf->semid);
+ DLT_SHM_SEM_GET(buf->sem);
+ ret = dlt_buffer_push3(&(buf->buffer),
+ data1, size1, data2, size2, data3, size3);
+ DLT_SHM_SEM_FREE(buf->sem);
return ret;
}
@@ -238,13 +343,16 @@ int dlt_shm_pull(DltShm *buf, unsigned char *data, int max_size)
{
int ret;
- /* check if buffer available */
- if (!buf->buffer.mem)
+ /* Check if buffer available */
+ if ((buf == NULL) || (buf->buffer.mem == NULL))
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
return -1;
+ }
- DLT_SHM_SEM_GET(buf->semid);
+ DLT_SHM_SEM_GET(buf->sem);
ret = dlt_buffer_pull(&(buf->buffer), data, max_size);
- DLT_SHM_SEM_FREE(buf->semid);
+ DLT_SHM_SEM_FREE(buf->sem);
return ret;
}
@@ -253,13 +361,16 @@ int dlt_shm_copy(DltShm *buf, unsigned char *data, int max_size)
{
int ret;
- /* check if buffer available */
- if (!buf->buffer.mem)
+ /* Check if buffer available */
+ if ((buf == NULL) || (buf->buffer.mem == NULL))
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
return -1;
+ }
- DLT_SHM_SEM_GET(buf->semid);
+ DLT_SHM_SEM_GET(buf->sem);
ret = dlt_buffer_copy(&(buf->buffer), data, max_size);
- DLT_SHM_SEM_FREE(buf->semid);
+ DLT_SHM_SEM_FREE(buf->sem);
return ret;
}
@@ -268,54 +379,82 @@ int dlt_shm_remove(DltShm *buf)
{
int ret;
- /* check if buffer available */
- if (!buf->buffer.mem)
+ /* Check if buffer available */
+ if ((buf == NULL) || (buf->buffer.mem == NULL))
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
return -1;
+ }
- DLT_SHM_SEM_GET(buf->semid);
+ DLT_SHM_SEM_GET(buf->sem);
ret = dlt_buffer_remove(&(buf->buffer));
- DLT_SHM_SEM_FREE(buf->semid);
+ DLT_SHM_SEM_FREE(buf->sem);
return ret;
}
-DltReturnValue dlt_shm_free_server(DltShm *buf)
+DltReturnValue dlt_shm_free_server(DltShm *buf, const char *name)
{
+ if ((buf == NULL) || (buf->buffer.shm == NULL) || name == NULL)
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return DLT_RETURN_WRONG_PARAMETER;
+ }
- if (shmdt(buf->buffer.shm)) {
- dlt_log(LOG_WARNING, "SHM: shmdt() failed");
- return DLT_RETURN_ERROR; /* ERROR */
+ if (munmap(buf->buffer.shm, buf->buffer.min_size) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: munmap() failed: %s\n",
+ __func__, strerror(errno));
}
- if (shmctl(buf->shmid, IPC_RMID, NULL) == -1) {
- dlt_log(LOG_WARNING, "SHM: shmdt() failed");
- return DLT_RETURN_ERROR; /* ERROR */
+ if (shm_unlink(name) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: shm_unlink() failed: %s\n",
+ __func__, strerror(errno));
}
- if (semctl(buf->semid, 0, IPC_RMID, (int)0) == -1) {
- dlt_log(LOG_WARNING, "SHM: shmdt() failed");
- return DLT_RETURN_ERROR; /* ERROR */
+ if (sem_close(buf->sem) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: sem_close() failed: %s\n",
+ __func__, strerror(errno));
+ }
+
+ if (sem_unlink(name) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: sem_unlink() failed: %s\n",
+ __func__, strerror(errno));
}
/* Reset parameters */
- buf->shmid = 0;
- buf->semid = 0;
+ buf->shmfd = 0;
+ buf->sem = NULL;
return dlt_buffer_free_static(&(buf->buffer));
-
}
DltReturnValue dlt_shm_free_client(DltShm *buf)
{
+ if ((buf == NULL) || (buf->buffer.shm == NULL))
+ {
+ dlt_vlog(LOG_ERR, "%s: Wrong parameter: Null pointer\n", __func__);
+ return DLT_RETURN_WRONG_PARAMETER;
+ }
- if (shmdt(buf->buffer.shm)) {
- dlt_log(LOG_WARNING, "SHM: shmdt() failed");
- return DLT_RETURN_ERROR; /* ERROR */
+ if (munmap(buf->buffer.shm, buf->buffer.min_size) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: munmap() failed: %s\n",
+ __func__, strerror(errno));
+ }
+
+ if (sem_close(buf->sem) == -1)
+ {
+ dlt_vlog(LOG_ERR, "%s: sem_close() failed: %s\n",
+ __func__, strerror(errno));
}
/* Reset parameters */
- buf->shmid = 0;
- buf->semid = 0;
+ buf->shmfd = 0;
+ buf->sem = NULL;
return dlt_buffer_free_static(&(buf->buffer));
}
View Lorry Controller Status