@@ -80,7 +80,7 @@ static int tracefd = -1;
static bool recovery = true;
static int reopen_log_pipe[2];
static int reopen_log_pipe0_pollfd_idx = -1;
-static char *tracefile = NULL;
+char *tracefile = NULL;
static TDB_CONTEXT *tdb_ctx = NULL;
static bool trigger_talloc_report = false;
@@ -205,12 +205,17 @@ static void trigger_reopen_log(int signal __attribute__((unused)))
dummy = write(reopen_log_pipe[1], &c, 1);
}
+void close_log(void)
+{
+ if (tracefd > 0)
+ close(tracefd);
+ tracefd = -1;
+}
-static void reopen_log(void)
+void reopen_log(void)
{
if (tracefile) {
- if (tracefd > 0)
- close(tracefd);
+ close_log();
tracefd = open(tracefile, O_WRONLY|O_CREAT|O_APPEND, 0600);
@@ -2030,6 +2035,8 @@ int main(int argc, char *argv[])
finish_daemonize();
signal(SIGHUP, trigger_reopen_log);
+ if (tracefile)
+ tracefile = talloc_strdup(NULL, tracefile);
/* Get ready to listen to the tools. */
initialize_fds(*sock, &sock_pollfd_idx, *ro_sock, &ro_sock_pollfd_idx,
@@ -168,7 +168,10 @@ void trace_create(const void *data, const char *type);
void trace_destroy(const void *data, const char *type);
void trace(const char *fmt, ...);
void dtrace_io(const struct connection *conn, const struct buffered_data *data, int out);
+void reopen_log(void);
+void close_log(void);
+extern char *tracefile;
extern int dom0_domid;
extern int dom0_event;
extern int priv_domid;
@@ -44,6 +44,38 @@ static int do_debug_check(void *ctx, struct connection *conn,
return 0;
}
+static int do_debug_log(void *ctx, struct connection *conn,
+ char **vec, int num)
+{
+ if (num != 1)
+ return EINVAL;
+
+ if (!strcmp(vec[0], "on"))
+ reopen_log();
+ else if (!strcmp(vec[0], "off"))
+ close_log();
+ else
+ return EINVAL;
+
+ send_ack(conn, XS_DEBUG);
+ return 0;
+}
+
+static int do_debug_logfile(void *ctx, struct connection *conn,
+ char **vec, int num)
+{
+ if (num != 1)
+ return EINVAL;
+
+ close_log();
+ talloc_free(tracefile);
+ tracefile = talloc_strdup(NULL, vec[0]);
+ reopen_log();
+
+ send_ack(conn, XS_DEBUG);
+ return 0;
+}
+
static int do_debug_print(void *ctx, struct connection *conn,
char **vec, int num)
{
@@ -60,6 +92,8 @@ static int do_debug_help(void *, struct connection *, char **, int);
static struct cmd_s cmds[] = {
{ "check", do_debug_check, "" },
+ { "log", do_debug_log, "on|off" },
+ { "logfile", do_debug_logfile, "<file>" },
{ "print", do_debug_print, "<string>" },
{ "help", do_debug_help, "" },
};
Today Xenstore supports logging only if specified at start of the Xenstore daemon. As it can't be disabled during runtime it is not recommended to start xenstored with logging enabled. Add support for switching logging on and off at runtime and to specify a (new) logfile. This is done via the XS_DEBUG wire command which can be sent with xenstore-control. To switch logging on just use: xenstore-control log on To switch it off again: xenstore-control log off To specify a (new) logfile: xenstore-control logfile <file> Signed-off-by: Juergen Gross <jgross@suse.com> --- tools/xenstore/xenstored_core.c | 15 +++++++++++---- tools/xenstore/xenstored_core.h | 3 +++ tools/xenstore/xenstored_debug.c | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-)