diff options
Diffstat (limited to 'src/system/dlt-system-process-handling.c')
| -rw-r--r-- | src/system/dlt-system-process-handling.c | 195 |
1 files changed, 96 insertions, 99 deletions
diff --git a/src/system/dlt-system-process-handling.c b/src/system/dlt-system-process-handling.c index 21e2987..51c2547 100644 --- a/src/system/dlt-system-process-handling.c +++ b/src/system/dlt-system-process-handling.c @@ -61,88 +61,89 @@ DLT_IMPORT_CONTEXT(dltsystem) int daemonize() { - DLT_LOG(dltsystem,DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, daemonize")); - - // Fork new process - int f = fork(); - - if(f < 0) - return f; - if(f > 0) - exit(0); - - // Create a new process group - if(setsid() < 0) - return -1; - - /** - * Close all file descriptors and point - * stdin, stdout and stderr to /dev/null - */ - int i; - for(i = getdtablesize(); i >= 0; i--) + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, daemonize")); + + /* Fork new process */ + int f = fork(); + + if (f < 0) + return f; + + if (f > 0) + exit(0); + + /* Create a new process group */ + if (setsid() < 0) + return -1; + + /** + * Close all file descriptors and point + * stdin, stdout and stderr to /dev/null + */ + int i; + + for (i = getdtablesize(); i >= 0; i--) close(i); - int fd = open("/dev/null",O_RDWR); - if(fd < 0) - { + int fd = open("/dev/null", O_RDWR); + + if (fd < 0) return -1; - } - if(dup(fd) < 0 || dup(fd) < 0) - { + if ((dup(fd) < 0) || (dup(fd) < 0)) { close(fd); - return -1; + return -1; } - /** - * Ignore signals related to child processes and - * terminal handling. - */ + /** + * Ignore signals related to child processes and + * terminal handling. + */ signal(SIGCHLD, SIG_IGN); signal(SIGTSTP, SIG_IGN); signal(SIGTTOU, SIG_IGN); signal(SIGTTIN, SIG_IGN); - //no close(fd); - we just intentionally pointed stdx to null! tbd: set ignore for coverity - return 0; + /*no close(fd); - we just intentionally pointed stdx to null! tbd: set ignore for coverity */ + return 0; } void start_threads(DltSystemConfiguration *config) { - DLT_LOG(dltsystem,DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, start threads")); + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, start threads")); - int i; - threads.count = 0; - threads.shutdown = 0; - for(i = 0;i < MAX_THREADS; i++) - { - threads.threads[i] = 0; - } + int i; + threads.count = 0; + threads.shutdown = 0; + + for (i = 0; i < MAX_THREADS; i++) + threads.threads[i] = 0; #if defined(DLT_SYSTEMD_WATCHDOG_ENABLE) - start_systemd_watchdog(config); + start_systemd_watchdog(config); #endif - if(config->Shell.Enable) - init_shell(); + if (config->Shell.Enable) + init_shell(); - if(config->LogFile.Enable) - start_logfile(config); + if (config->LogFile.Enable) + start_logfile(config); - if(config->Filetransfer.Enable) - start_filetransfer(config); + if (config->Filetransfer.Enable) + start_filetransfer(config); - if(config->LogProcesses.Enable) - start_logprocess(config); + if (config->LogProcesses.Enable) + start_logprocess(config); - if(config->Syslog.Enable) - start_syslog(config); + if (config->Syslog.Enable) + start_syslog(config); #if defined(DLT_SYSTEMD_JOURNAL_ENABLE) - if(config->Journal.Enable) - start_systemd_journal(config); + + if (config->Journal.Enable) + start_systemd_journal(config); + #endif } @@ -153,52 +154,48 @@ void start_threads(DltSystemConfiguration *config) */ void join_threads() { - int i; - DLT_LOG(dltsystem, DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, waiting for threads to exit.")); - - if(threads.count < 1) - { - DLT_LOG(dltsystem, DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, no threads, waiting for signal.")); - sleep(UINT_MAX); - } - else - { - DLT_LOG(dltsystem,DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, thread count: "), - DLT_INT(threads.count)); - - for (i = 0; i < threads.count; i++) - { - pthread_join(threads.threads[i], NULL); - DLT_LOG(dltsystem,DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, thread exit: "), - DLT_INT(threads.threads[i])); - } - } + int i; + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, waiting for threads to exit.")); + + if (threads.count < 1) { + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, no threads, waiting for signal.")); + sleep(UINT_MAX); + } + else { + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, thread count: "), + DLT_INT(threads.count)); + + for (i = 0; i < threads.count; i++) { + pthread_join(threads.threads[i], NULL); + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, thread exit: "), + DLT_INT(threads.threads[i])); + } + } } void dlt_system_signal_handler(int sig) { - DLT_LOG(dltsystem,DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, signal handler")); - - switch (sig) - { - case SIGHUP: - case SIGTERM: - case SIGINT: - case SIGQUIT: - DLT_LOG(dltsystem,DLT_LOG_DEBUG, - DLT_STRING("dlt-system-process-handling, exit, signal: "), - DLT_INT(sig)); - exit(0); - break; - default: - DLT_LOG(dltsystem,DLT_LOG_WARN, - DLT_STRING("dlt-system-process-handling, unknown signal!")); - break; - } + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, signal handler")); + + switch (sig) { + case SIGHUP: + case SIGTERM: + case SIGINT: + case SIGQUIT: + DLT_LOG(dltsystem, DLT_LOG_DEBUG, + DLT_STRING("dlt-system-process-handling, exit, signal: "), + DLT_INT(sig)); + exit(0); + break; + default: + DLT_LOG(dltsystem, DLT_LOG_WARN, + DLT_STRING("dlt-system-process-handling, unknown signal!")); + break; + } } |