diff options
| author | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-11-25 09:18:59 +0100 |
|---|---|---|
| committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2011-11-25 09:18:59 +0100 |
| commit | 6b3eac36d2fa1e0503217e6a21787ecfb1bc2dae (patch) | |
| tree | b7c77217ae71794d9850841acb789e6e01b2598b /src/lib | |
| parent | 5d1256cc1fcf9d47a7bc0e8ac49a9365e7e59915 (diff) | |
| download | DLT-daemon-6b3eac36d2fa1e0503217e6a21787ecfb1bc2dae.tar.gz | |
Disabled completely SHM if not enabled.
Diffstat (limited to 'src/lib')
| -rwxr-xr-x | src/lib/dlt_user.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 178df18..8c82dd3 100755 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -160,7 +160,9 @@ int dlt_init(void) dlt_user.dlt_is_file = 0; dlt_user.overflow = 0; +#ifdef DLT_SHM_ENABLE memset(&(dlt_user.dlt_shm),0,sizeof(DltShm)); +#endif /* create and open DLT user FIFO */ sprintf(filename,"%s/dlt%d",DLT_USER_DIR,getpid()); @@ -195,6 +197,7 @@ int dlt_init(void) } else { +#ifdef DLT_SHM_ENABLE /* init shared memory */ if (dlt_shm_init_client(&(dlt_user.dlt_shm),DLT_SHM_KEY) < 0) { @@ -202,6 +205,7 @@ int dlt_init(void) dlt_log(LOG_WARNING, str); //return 0; } +#endif } @@ -362,8 +366,10 @@ int dlt_free(void) unlink(filename); } +#ifdef DLT_SHM_ENABLE /* free shared memory */ dlt_shm_free_client(&dlt_user.dlt_shm); +#endif if (dlt_user.dlt_log_handle!=-1) { @@ -2243,8 +2249,10 @@ int dlt_user_log_send_log(DltContextData *log, int mtype) close(dlt_user.dlt_log_handle); dlt_user.dlt_log_handle = -1; +#ifdef DLT_SHM_ENABLE /* free shared memory */ dlt_shm_free_client(&dlt_user.dlt_shm); +#endif if (dlt_user.local_print_mode == DLT_PM_AUTOMATIC) { @@ -2850,6 +2858,7 @@ void dlt_user_log_reattach_to_daemon(void) return; } +#ifdef DLT_SHM_ENABLE /* init shared memory */ if (dlt_shm_init_client(&dlt_user.dlt_shm,DLT_SHM_KEY) < 0) { @@ -2857,6 +2866,7 @@ void dlt_user_log_reattach_to_daemon(void) dlt_log(LOG_WARNING, str); //return 0; } +#endif dlt_log(LOG_NOTICE, "Logging re-enabled!\n"); |