shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Various improvements to the daemon-common code, including automated response

Browse Source 
formatting from config trees provided by the daemon implementation.
This commit is contained in:
Petr Rockai 2011-07-18 14:46:54 +00:00
parent aac236f4a8
commit 372e9b3d64
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemons/common/daemon-client.h
View File

@ -12,6 +12,7 @@
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#include "libdevmapper.h" // for dm_list, needed by config.h
#include "config.h" // should become part of libdevmapper later #include "config.h" // should become part of libdevmapper later
#ifndef _LVM_DAEMON_COMMON_CLIENT_H #ifndef _LVM_DAEMON_COMMON_CLIENT_H

30
daemons/common/daemon-server.c
View File

@ -218,6 +218,22 @@ struct thread_baton {
client_handle client; client_handle client;
}; };
int buffer_rewrite(char **buf, const char *format, const char *string) {
char *old = *buf;
dm_asprintf(buf, format, *buf, string);
dm_free(old);
return 0;
}
int buffer_line(const char *line, void *baton) {
response *r = baton;
if (r->buffer)
buffer_rewrite(&r->buffer, "%s\n%s", line);
else
dm_asprintf(&r->buffer, "%s\n", line);
return 0;
}
void *client_thread(void *baton) void *client_thread(void *baton)
{ {
struct thread_baton *b = baton; struct thread_baton *b = baton;
@ -227,12 +243,16 @@ void *client_thread(void *baton)
goto fail; goto fail;
req.cft = create_config_tree_from_string(req.buffer); req.cft = create_config_tree_from_string(req.buffer);
if (!req.cft)
fprintf(stderr, "error parsing request:\n %s\n", req.buffer);
response res = b->s.handler(b->s, b->client, req); response res = b->s.handler(b->s, b->client, req);
destroy_config_tree(req.cft); if (req.cft)
destroy_config_tree(req.cft);
dm_free(req.buffer); dm_free(req.buffer);
if (!res.buffer) { if (!res.buffer) {
/* TODO fill in the buffer from res.cft */ write_config_node(res.cft->root, buffer_line, &res);
buffer_rewrite(&res.buffer, "%s\n\n", NULL);
} }
write_buffer(b->client.socket_fd, res.buffer, strlen(res.buffer)); write_buffer(b->client.socket_fd, res.buffer, strlen(res.buffer));
@ -318,6 +338,9 @@ void daemon_start(daemon_state s)
if (!s.foreground) if (!s.foreground)
kill(getppid(), SIGTERM); kill(getppid(), SIGTERM);
if (s.daemon_init)
s.daemon_init(&s);
while (!_shutdown_requested && !failed) { while (!_shutdown_requested && !failed) {
int status; int status;
fd_set in; fd_set in;
@ -333,6 +356,9 @@ void daemon_start(daemon_state s)
if (s.socket_fd >= 0) if (s.socket_fd >= 0)
unlink(s.socket_path); unlink(s.socket_path);
if (s.daemon_fini)
s.daemon_fini(&s);
syslog(LOG_NOTICE, "%s shutting down", s.name); syslog(LOG_NOTICE, "%s shutting down", s.name);
closelog(); closelog();
remove_lockfile(s.pidfile); remove_lockfile(s.pidfile);

7
daemons/common/daemon-server.h
View File

@ -45,10 +45,14 @@ struct daemon_state;
response daemon_reply_simple(char *id, ...); response daemon_reply_simple(char *id, ...);
static inline int daemon_request_int(request r, const char *path, int def) { static inline int daemon_request_int(request r, const char *path, int def) {
if (!r.cft)
return def;
return find_config_int(r.cft->root, path, def); return find_config_int(r.cft->root, path, def);
} }
static inline const char *daemon_request_str(request r, const char *path, const char *def) { static inline const char *daemon_request_str(request r, const char *path, const char *def) {
if (!r.cft)
return def;
return find_config_str(r.cft->root, path, def); return find_config_str(r.cft->root, path, def);
} }
@ -77,7 +81,8 @@ typedef struct daemon_state {
const char *socket_path; const char *socket_path;
int log_level; int log_level;
handle_request handler; handle_request handler;
int (*setup_post)(struct daemon_state *st); int (*daemon_init)(struct daemon_state *st);
int (*daemon_fini)(struct daemon_state *st);
/* Global runtime info maintained by the framework. */ /* Global runtime info maintained by the framework. */
int socket_fd; int socket_fd;