X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-dump-log%2Fmain.c;h=e9901f8ee3f2c90c0e9aa37a864a6f96e08aad63;hb=HEAD;hp=4a11d218298f7a2c0515f940b9586a55d3f0250c;hpb=bb3ae9f960847c3801e5d52129d08f249ca8f3f6;p=i3%2Fi3 diff --git a/i3-dump-log/main.c b/i3-dump-log/main.c index 4a11d218..e9901f8e 100644 --- a/i3-dump-log/main.c +++ b/i3-dump-log/main.c @@ -2,11 +2,13 @@ * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009 Michael Stapelberg and contributors (see also: LICENSE) * * i3-dump-log/main.c: Dumps the i3 SHM log to stdout. * */ +#include + #include #include #include @@ -23,17 +25,43 @@ #include #include #include +#include #include "libi3.h" #include "shmlog.h" #include -static uint32_t offset_next_write, - wrap_count; +#if !defined(__OpenBSD__) +static uint32_t offset_next_write; +#endif +static uint32_t wrap_count; static i3_shmlog_header *header; static char *logbuffer, - *walk; + *walk; +static int ipcfd = -1; + +static volatile bool interrupted = false; + +static void sighandler(int signal) { + interrupted = true; +} + +static void disable_shmlog(void) { + const char *disablecmd = "debuglog off; shmlog off"; + if (ipc_send_message(ipcfd, strlen(disablecmd), + I3_IPC_MESSAGE_TYPE_COMMAND, (uint8_t *)disablecmd) != 0) + err(EXIT_FAILURE, "IPC send"); + + /* Ensure the command was sent by waiting for the reply: */ + uint32_t reply_length = 0; + uint8_t *reply = NULL; + if (ipc_recv_message(ipcfd, I3_IPC_REPLY_TYPE_COMMAND, + &reply_length, &reply) != 0) { + err(EXIT_FAILURE, "IPC recv"); + } + free(reply); +} static int check_for_wrap(void) { if (wrap_count == header->wrap_count) @@ -42,33 +70,49 @@ static int check_for_wrap(void) { /* The log wrapped. Print the remaining content and reset walk to the top * of the log. */ wrap_count = header->wrap_count; - write(STDOUT_FILENO, walk, ((logbuffer + header->offset_last_wrap) - walk)); + const int len = (logbuffer + header->offset_last_wrap) - walk; + swrite(STDOUT_FILENO, walk, len); walk = logbuffer + sizeof(i3_shmlog_header); return 1; } static void print_till_end(void) { check_for_wrap(); - int n = write(STDOUT_FILENO, walk, ((logbuffer + header->offset_next_write) - walk)); - if (n > 0) { - walk += n; - } + const int len = (logbuffer + header->offset_next_write) - walk; + swrite(STDOUT_FILENO, walk, len); + walk += len; +} + +void errorlog(char *fmt, ...) { + va_list args; + + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); } int main(int argc, char *argv[]) { int o, option_index = 0; - bool verbose = false, - follow = false; + bool verbose = false; +#if !defined(__OpenBSD__) + bool follow = false; +#endif static struct option long_options[] = { {"version", no_argument, 0, 'v'}, {"verbose", no_argument, 0, 'V'}, +#if !defined(__OpenBSD__) {"follow", no_argument, 0, 'f'}, +#endif {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; +#if !defined(__OpenBSD__) char *options_string = "s:vfVh"; +#else + char *options_string = "vVh"; +#endif while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) { if (o == 'v') { @@ -76,16 +120,22 @@ int main(int argc, char *argv[]) { return 0; } else if (o == 'V') { verbose = true; +#if !defined(__OpenBSD__) } else if (o == 'f') { follow = true; +#endif } else if (o == 'h') { printf("i3-dump-log " I3_VERSION "\n"); - printf("i3-dump-log [-f] [-s ]\n"); +#if !defined(__OpenBSD__) + printf("i3-dump-log [-fhVv]\n"); +#else + printf("i3-dump-log [-hVv]\n"); +#endif return 0; } } - char *shmname = root_atom_contents("I3_SHMLOG_PATH"); + char *shmname = root_atom_contents("I3_SHMLOG_PATH", NULL, 0); if (shmname == NULL) { /* Something failed. Let’s invest a little effort to find out what it * is. This is hugely helpful for users who want to debug i3 but are @@ -104,16 +154,36 @@ int main(int argc, char *argv[]) { fprintf(stderr, "FYI: The DISPLAY environment variable is set to \"%s\".\n", getenv("DISPLAY")); exit(1); } - if (root_atom_contents("I3_CONFIG_PATH") != NULL) { - fprintf(stderr, "i3-dump-log: ERROR: i3 is running, but SHM logging is not enabled.\n\n"); - if (!is_debug_build()) { + if (root_atom_contents("I3_CONFIG_PATH", conn, screen) != NULL) { + fprintf(stderr, "i3-dump-log: ERROR: i3 is running, but SHM logging is not enabled. Enabling SHM log until cancelled\n\n"); + ipcfd = ipc_connect(NULL); + const char *enablecmd = "debuglog on; shmlog 5242880"; + if (ipc_send_message(ipcfd, strlen(enablecmd), + I3_IPC_MESSAGE_TYPE_COMMAND, (uint8_t *)enablecmd) != 0) + err(EXIT_FAILURE, "IPC send"); + /* By the time we receive a reply, I3_SHMLOG_PATH is set: */ + uint32_t reply_length = 0; + uint8_t *reply = NULL; + if (ipc_recv_message(ipcfd, I3_IPC_REPLY_TYPE_COMMAND, + &reply_length, &reply) != 0) { + err(EXIT_FAILURE, "IPC recv"); + } + free(reply); + + atexit(disable_shmlog); + + /* Retry: */ + shmname = root_atom_contents("I3_SHMLOG_PATH", NULL, 0); + if (shmname == NULL && !is_debug_build()) { fprintf(stderr, "You seem to be using a release version of i3:\n %s\n\n", I3_VERSION); fprintf(stderr, "Release versions do not use SHM logging by default,\ntherefore i3-dump-log does not work.\n\n"); - fprintf(stderr, "Please follow this guide instead:\nhttp://i3wm.org/docs/debugging-release-version.html\n"); + fprintf(stderr, "Please follow this guide instead:\nhttps://i3wm.org/docs/debugging-release-version.html\n"); exit(1); } } - errx(EXIT_FAILURE, "Cannot get I3_SHMLOG_PATH atom contents. Is i3 running on this display?"); + if (shmname == NULL) { + errx(EXIT_FAILURE, "Cannot get I3_SHMLOG_PATH atom contents. Is i3 running on this display?"); + } } if (*shmname == '\0') @@ -134,11 +204,12 @@ int main(int argc, char *argv[]) { if (logbuffer == MAP_FAILED) err(EXIT_FAILURE, "Could not mmap SHM segment for the i3 log"); - header = (i3_shmlog_header*)logbuffer; + header = (i3_shmlog_header *)logbuffer; if (verbose) printf("next_write = %d, last_wrap = %d, logbuffer_size = %d, shmname = %s\n", header->offset_next_write, header->offset_last_wrap, header->size, shmname); + free(shmname); walk = logbuffer + header->offset_next_write; /* We first need to print old content in case there was at least one @@ -162,21 +233,33 @@ int main(int argc, char *argv[]) { walk = logbuffer + sizeof(i3_shmlog_header); print_till_end(); - if (follow) { - /* Since pthread_cond_wait() expects a mutex, we need to provide one. +#if !defined(__OpenBSD__) + if (!follow) { + return 0; + } + + /* Handle SIGINT gracefully to invoke atexit handlers, if any. */ + struct sigaction action; + action.sa_handler = sighandler; + sigemptyset(&action.sa_mask); + action.sa_flags = 0; + sigaction(SIGINT, &action, NULL); + + /* Since pthread_cond_wait() expects a mutex, we need to provide one. * To not lock i3 (that’s bad, mhkay?) we just define one outside of * the shared memory. */ - pthread_mutex_t dummy_mutex = PTHREAD_MUTEX_INITIALIZER; - pthread_mutex_lock(&dummy_mutex); - while (1) { - pthread_cond_wait(&(header->condvar), &dummy_mutex); - /* If this was not a spurious wakeup, print the new lines. */ - if (header->offset_next_write != offset_next_write) { - offset_next_write = header->offset_next_write; - print_till_end(); - } + pthread_mutex_t dummy_mutex = PTHREAD_MUTEX_INITIALIZER; + pthread_mutex_lock(&dummy_mutex); + while (!interrupted) { + pthread_cond_wait(&(header->condvar), &dummy_mutex); + /* If this was not a spurious wakeup, print the new lines. */ + if (header->offset_next_write != offset_next_write) { + offset_next_write = header->offset_next_write; + print_till_end(); } } +#endif + exit(0); return 0; }