Enable (unlimited) core dumps when running i3 development versions
Also prints out useful stuff: CORE DUMPS: You are running a development version of i3, so coredumps were automatically enabled (ulimit -c unlimited). CORE DUMPS: Your current working directory is "/home/michael/i3". CORE DUMPS: Your core_pattern is: /tmp/%e.core.%p i3 (tree) version 4.0.2-479-g26ab2ac (2011-11-08, branch "next") starting This does not affect child processes of i3. The intention of this change is to make debugging easier – it’s one less thing users of the development version have to worry about when trying to help with debugging.
This commit is contained in:
parent
26ab2ac008
commit
332dbfe9c1
|
@ -10,6 +10,9 @@
|
||||||
#ifndef _I3_H
|
#ifndef _I3_H
|
||||||
#define _I3_H
|
#define _I3_H
|
||||||
|
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/resource.h>
|
||||||
|
|
||||||
#include <xcb/xcb_keysyms.h>
|
#include <xcb/xcb_keysyms.h>
|
||||||
|
|
||||||
#include <X11/XKBlib.h>
|
#include <X11/XKBlib.h>
|
||||||
|
@ -21,6 +24,10 @@
|
||||||
#include "data.h"
|
#include "data.h"
|
||||||
#include "xcb.h"
|
#include "xcb.h"
|
||||||
|
|
||||||
|
/** The original value of RLIMIT_CORE when i3 was started. We need to restore
|
||||||
|
* this before starting any other process, since we set RLIMIT_CORE to
|
||||||
|
* RLIM_INFINITY for i3 debugging versions. */
|
||||||
|
extern struct rlimit original_rlimit_core;
|
||||||
extern xcb_connection_t *conn;
|
extern xcb_connection_t *conn;
|
||||||
extern int conn_screen;
|
extern int conn_screen;
|
||||||
/** The last timestamp we got from X11 (timestamps are included in some events
|
/** The last timestamp we got from X11 (timestamps are included in some events
|
||||||
|
|
36
src/main.c
36
src/main.c
|
@ -12,10 +12,17 @@
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <sys/un.h>
|
#include <sys/un.h>
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/resource.h>
|
||||||
#include "all.h"
|
#include "all.h"
|
||||||
|
|
||||||
#include "sd-daemon.h"
|
#include "sd-daemon.h"
|
||||||
|
|
||||||
|
/* The original value of RLIMIT_CORE when i3 was started. We need to restore
|
||||||
|
* this before starting any other process, since we set RLIMIT_CORE to
|
||||||
|
* RLIM_INFINITY for i3 debugging versions. */
|
||||||
|
struct rlimit original_rlimit_core;
|
||||||
|
|
||||||
static int xkb_event_base;
|
static int xkb_event_base;
|
||||||
|
|
||||||
int xkb_current_group;
|
int xkb_current_group;
|
||||||
|
@ -225,6 +232,10 @@ int main(int argc, char *argv[]) {
|
||||||
|
|
||||||
setlocale(LC_ALL, "");
|
setlocale(LC_ALL, "");
|
||||||
|
|
||||||
|
/* Get the RLIMIT_CORE limit at startup time to restore this before
|
||||||
|
* starting processes. */
|
||||||
|
getrlimit(RLIMIT_CORE, &original_rlimit_core);
|
||||||
|
|
||||||
/* Disable output buffering to make redirects in .xsession actually useful for debugging */
|
/* Disable output buffering to make redirects in .xsession actually useful for debugging */
|
||||||
if (!isatty(fileno(stdout)))
|
if (!isatty(fileno(stdout)))
|
||||||
setbuf(stdout, NULL);
|
setbuf(stdout, NULL);
|
||||||
|
@ -384,6 +395,31 @@ int main(int argc, char *argv[]) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* I3_VERSION contains either something like this:
|
||||||
|
* "4.0.2 (2011-11-11, branch "release")".
|
||||||
|
* or: "4.0.2-123-gCOFFEEBABE (2011-11-11, branch "next")".
|
||||||
|
*
|
||||||
|
* So we check for the offset of the first opening round bracket to
|
||||||
|
* determine whether this is a git version or a release version. */
|
||||||
|
if ((strchr(I3_VERSION, '(') - I3_VERSION) > 10) {
|
||||||
|
struct rlimit limit = { RLIM_INFINITY, RLIM_INFINITY };
|
||||||
|
setrlimit(RLIMIT_CORE, &limit);
|
||||||
|
|
||||||
|
/* The following code is helpful, but not required. We thus don’t pay
|
||||||
|
* much attention to error handling, non-linux or other edge cases. */
|
||||||
|
char cwd[PATH_MAX];
|
||||||
|
LOG("CORE DUMPS: You are running a development version of i3, so coredumps were automatically enabled (ulimit -c unlimited).\n");
|
||||||
|
if (getcwd(cwd, sizeof(cwd)) != NULL)
|
||||||
|
LOG("CORE DUMPS: Your current working directory is \"%s\".\n", cwd);
|
||||||
|
int patternfd;
|
||||||
|
if ((patternfd = open("/proc/sys/kernel/core_pattern", O_RDONLY)) >= 0) {
|
||||||
|
if (read(patternfd, cwd, sizeof(cwd)) > 0)
|
||||||
|
/* a trailing newline is included in cwd */
|
||||||
|
LOG("CORE DUMPS: Your core_pattern is: %s", cwd);
|
||||||
|
close(patternfd);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
LOG("i3 (tree) version " I3_VERSION " starting\n");
|
LOG("i3 (tree) version " I3_VERSION " starting\n");
|
||||||
|
|
||||||
conn = xcb_connect(NULL, &conn_screen);
|
conn = xcb_connect(NULL, &conn_screen);
|
||||||
|
|
|
@ -112,6 +112,7 @@ void start_application(const char *command, bool no_startup_id) {
|
||||||
if (fork() == 0) {
|
if (fork() == 0) {
|
||||||
/* Child process */
|
/* Child process */
|
||||||
setsid();
|
setsid();
|
||||||
|
setrlimit(RLIMIT_CORE, &original_rlimit_core);
|
||||||
if (fork() == 0) {
|
if (fork() == 0) {
|
||||||
/* Setup the environment variable(s) */
|
/* Setup the environment variable(s) */
|
||||||
if (!no_startup_id)
|
if (!no_startup_id)
|
||||||
|
|
Loading…
Reference in New Issue