shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

libdaemon: introduce support for exit on idle

Browse Source 
works with systemd activated daemons only as of now

each daemon implementation may decide to signalize its
internal idle state (i.e. all background tasks unrelated to
client threads are finished)
This commit is contained in:
Ondrej Kozina 2015-04-29 16:59:30 +02:00
parent b120454b50
commit e0a62b8fdc
2 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libdaemon/server/daemon-server.c
View File

@ -80,6 +80,29 @@ static void _exit_handler(int sig __attribute__((unused)))
# include <stdio.h> # include <stdio.h>
static int _is_idle(daemon_state s)
{
return _systemd_activation && s.idle && s.idle->is_idle && !s.threads->next;
}
static struct timeval *_get_timeout(daemon_state s)
{
return (_systemd_activation && s.idle) ? s.idle->ptimeout : NULL;
}
static void _reset_timeout(daemon_state s)
{
if (s.idle) {
s.idle->ptimeout->tv_sec = 1;
s.idle->ptimeout->tv_usec = 0;
}
}
static unsigned _get_max_timeouts(daemon_state s)
{
return s.idle ? s.idle->max_timeouts : 0;
}
static int _set_oom_adj(const char *oom_adj_path, int val) static int _set_oom_adj(const char *oom_adj_path, int val)
{ {
FILE *fp; FILE *fp;
@ -513,6 +536,7 @@ void daemon_start(daemon_state s)
int failed = 0; int failed = 0;
log_state _log = { { 0 } }; log_state _log = { { 0 } };
thread_state _threads = { .next = NULL }; thread_state _threads = { .next = NULL };
unsigned timeout_count = 0;
/* /*
* Switch to C locale to avoid reading large locale-archive file used by * Switch to C locale to avoid reading large locale-archive file used by
@ -583,15 +607,28 @@ void daemon_start(daemon_state s)
failed = 1; failed = 1;
while (!_shutdown_requested && !failed) { while (!_shutdown_requested && !failed) {
_reset_timeout(s);
fd_set in; fd_set in;
FD_ZERO(&in); FD_ZERO(&in);
FD_SET(s.socket_fd, &in); FD_SET(s.socket_fd, &in);
if (select(FD_SETSIZE, &in, NULL, NULL, NULL) < 0 && errno != EINTR) if (select(FD_SETSIZE, &in, NULL, NULL, _get_timeout(s)) < 0 && errno != EINTR)
perror("select error"); perror("select error");
if (FD_ISSET(s.socket_fd, &in)) if (FD_ISSET(s.socket_fd, &in)) {
timeout_count = 0;
if (!_shutdown_requested && !handle_connect(s)) if (!_shutdown_requested && !handle_connect(s))
ERROR(&s, "Failed to handle a client connection."); ERROR(&s, "Failed to handle a client connection.");
}
reap(s, 0); reap(s, 0);
/* s.idle == NULL equals no shutdown on timeout */
if (_is_idle(s)) {
DEBUGLOG(&s, "timeout occured");
if (++timeout_count >= _get_max_timeouts(s)) {
INFO(&s, "Inactive for %d seconds. Exiting.", timeout_count);
break;
}
}
} }
INFO(&s, "%s waiting for client threads to finish", s.name); INFO(&s, "%s waiting for client threads to finish", s.name);

19
libdaemon/server/daemon-server.h
View File

@ -35,6 +35,21 @@ typedef struct {
struct buffer buffer; struct buffer buffer;
} response; } response;
struct timeval;
/*
* is_idle: daemon implementation sets it to true when no background task
* is running
* max_timeouts: how many seconds do daemon allow to be idle before it shutdowns
* ptimeout: internal variable passed to select(). has to be reset to 1 second
* before each select
*/
typedef struct {
volatile unsigned is_idle;
unsigned max_timeouts;
struct timeval *ptimeout;
} daemon_idle;
struct daemon_state; struct daemon_state;
/* /*
@ -98,6 +113,10 @@ typedef struct daemon_state {
log_state *log; log_state *log;
struct thread_state *threads; struct thread_state *threads;
/* suport for shutdown on idle */
daemon_idle *idle;
void *private; /* the global daemon state */ void *private; /* the global daemon state */
} daemon_state; } daemon_state;