gdm r5962 - in trunk: . common

[mccann svn gnome org]

Author: mccann
Date: Sat Mar  8 21:24:52 2008
New Revision: 5962
URL: http://svn.gnome.org/viewvc/gdm?rev=5962&view=rev

Log:
2008-03-08  William Jon McCann  <jmccann redhat com>

	* common/Makefile.am:
	* common/gdb-cmd:
	* common/gdm-crash-logger.c: (main):
	* configure.ac:
	Add crash logger tool.



Added:
   trunk/common/gdb-cmd
   trunk/common/gdm-crash-logger.c
Modified:
   trunk/ChangeLog
   trunk/common/Makefile.am
   trunk/configure.ac

Modified: trunk/common/Makefile.am
==============================================================================
--- trunk/common/Makefile.am	(original)
+++ trunk/common/Makefile.am	Sat Mar  8 21:24:52 2008
@@ -34,6 +34,22 @@
 	gdm-marshal.h		\
 	$(NULL)
 
+gdmdir = $(datadir)/gdm
+gdm_DATA = gdb-cmd
+
+libexec_PROGRAMS = gdm-crash-logger
+gdm_crash_logger_SOURCES = gdm-crash-logger.c
+gdm_crash_logger_CPPFLAGS = \
+	$(GTHREAD_CFLAGS)			\
+	-DG_DISABLE_DEPRECATED			\
+	-DBINDIR=\"$(bindir)\"			\
+	-DSBINDIR=\"$(sbindir)\"		\
+	-DDATADIR=\"$(datadir)\"		\
+	-DSYSCONFDIR=\"$(sysconfdir)\"		\
+	-DLOCALSTATEDIR=\"$(localstatedir)\"	\
+	$(NULL)
+gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
+
 gdm-settings-glue.h: gdm-settings.xml Makefile.am
 	dbus-binding-tool --prefix=gdm_settings --mode=glib-server --output=gdm-settings-glue.h $(srcdir)/gdm-settings.xml
 
@@ -129,4 +145,5 @@
 EXTRA_DIST = 			\
 	gdm-settings.xml	\
 	gdm-marshal.list	\
+	$(gdm_DATA)		\
 	$(NULL)

Added: trunk/common/gdb-cmd
==============================================================================
--- (empty file)
+++ trunk/common/gdb-cmd	Sat Mar  8 21:24:52 2008
@@ -0,0 +1,3 @@
+bt
+thread apply all bt full
+q

Added: trunk/common/gdm-crash-logger.c
==============================================================================
--- (empty file)
+++ trunk/common/gdm-crash-logger.c	Sat Mar  8 21:24:52 2008
@@ -0,0 +1,99 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
+ * Dan Williams <dcbw redhat com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * (C) Copyright 2006 Red Hat, Inc.
+ */
+
+#include "config.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/wait.h>
+#include <stdlib.h>
+#include <syslog.h>
+#include <glib.h>
+
+int main (int argc, char ** argv)
+{
+        GPid            gdb_pid;
+        int             out;
+        char            gdm_pid[16];
+        char            line[256];
+        int             gdb_stat;
+        int             bytes_read;
+        gboolean        res;
+        gboolean        done;
+        GError         *error;
+        char *  args[] = { "gdb",
+                           "--batch",
+                           "--quiet",
+                           "--command=" DATADIR "/gdm/gdb-cmd",
+                           NULL,
+                           NULL };
+
+        snprintf (gdm_pid, sizeof (gdm_pid), "--pid=%d", getppid ());
+        args[4] = &gdm_pid[0];
+        error = NULL;
+        res = g_spawn_async_with_pipes (NULL,
+                                        args,
+                                        NULL,
+                                        G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD,
+                                        NULL,
+                                        NULL,
+                                        &gdb_pid,
+                                        NULL,
+                                        &out,
+                                        NULL,
+                                        &error);
+        if (! res) {
+                g_warning ("Unable to get backtrace: %s", error->message);
+                g_error_free (error);
+                exit (1);
+        }
+
+        openlog ("gdm", LOG_CONS | LOG_PERROR, LOG_DAEMON);
+        syslog (LOG_CRIT, "******************* START **********************************");
+        done = FALSE;
+        while (!done) {
+                bytes_read = read (out, line, sizeof (line) - 1);
+                if (bytes_read > 0) {
+                        char *end = &line[0];
+                        char *start = &line[0];
+
+                        /* Can't just funnel the output to syslog, have to do a separate
+                         * syslog () for each line in the output.
+                         */
+                        line[bytes_read] = '\0';
+                        while (*end != '\0') {
+                                if (*end == '\n') {
+                                        *end = '\0';
+                                        syslog (LOG_CRIT, "%s", start);
+                                        start = end + 1;
+                                }
+                                end++;
+                        }
+                } else if ((bytes_read <= 0) || ((errno != EINTR) && (errno != EAGAIN))) {
+                        done = TRUE;
+                }
+        }
+        syslog (LOG_CRIT, "******************* END **********************************");
+        close (out);
+        waitpid (gdb_pid, &gdb_stat, 0);
+        exit (0);
+}

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Mar  8 21:24:52 2008
@@ -51,6 +51,10 @@
 
 EXTRA_COMPILE_WARNINGS(yes)
 
+PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
+AC_SUBST(GTHREAD_CFLAGS)
+AC_SUBST(GTHREAD_LIBS)
+
 PKG_CHECK_MODULES(COMMON,
         dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
         gobject-2.0 >= $GLIB_REQUIRED_VERSION