shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 01:55:10 +03:00
Code Releases Activity

dmeventd: move code from signal handler

Browse Source 
Instead of calling syslog() from signal event handler,
run all logging code in the main loop.

Also it needs to take the lock and check for list
only when really needed.
This commit is contained in:
Zdenek Kabelac 2013-06-30 15:53:42 +02:00
parent 0ca1688134
commit fd399d52a9
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.78 -
===================================
Move syslog code out of signal handle in dmeventd.
Add DM_TO_STRING public macro.
Always return success on dmeventd -V command call.
Fix parsing of 64bit snapshot status in dmeventd snapshot plugin.

41
daemons/dmeventd/dmeventd.c
View File

@ -68,7 +68,6 @@
#include <syslog.h>
static volatile sig_atomic_t _exit_now = 0; /* set to '1' when signal is given to exit */
static volatile sig_atomic_t _thread_registries_empty = 1; /* registries are empty initially */
/* List (un)link macros. */
#define LINK(x, head) dm_list_add(head, &(x)->list)
@ -1602,19 +1601,7 @@ static void _init_thread_signals(void)
*/
static void _exit_handler(int sig __attribute__((unused)))
{
/*
* We exit when '_exit_now' is set.
* That is, when a signal has been received.
*
* We can not simply set '_exit_now' unless all
* threads are done processing.
*/
if (!_thread_registries_empty) {
syslog(LOG_ERR, "There are still devices being monitored.");
syslog(LOG_ERR, "Refusing to exit.");
} else
_exit_now = 1;
_exit_now = 1;
}
#ifdef linux
@ -1918,6 +1905,7 @@ int main(int argc, char *argv[])
{
signed char opt;
struct dm_event_fifos fifos;
int nothreads;
//struct sys_log logdata = {DAEMON_NAME, LOG_DAEMON};
opterr = 0;
@ -2008,16 +1996,25 @@ int main(int argc, char *argv[])
if (_initial_registrations)
_process_initial_registrations();
while (!_exit_now) {
for (;;) {
if (_exit_now) {
_exit_now = 0;
/*
* When '_exit_now' is set, signal has been received,
* but can not simply exit unless all
* threads are done processing.
*/
_lock_mutex();
nothreads = (dm_list_empty(&_thread_registry) &&
dm_list_empty(&_thread_registry_unused));
_unlock_mutex();
if (nothreads)
break;
syslog(LOG_ERR, "There are still devices being monitored.");
syslog(LOG_ERR, "Refusing to exit.");
}
_process_request(&fifos);
_cleanup_unused_threads();
_lock_mutex();
if (!dm_list_empty(&_thread_registry)
|| !dm_list_empty(&_thread_registry_unused))
_thread_registries_empty = 0;
else
_thread_registries_empty = 1;
_unlock_mutex();
}
_exit_dm_lib();