summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-10-19 11:40:18 +0200
committerDenys Vlasenko <dvlasenk@redhat.com>2010-10-19 11:40:18 +0200
commitf4546e160a6dda28009d1d13a6439448f4e6c608 (patch)
tree5f08d71092abdb3b5d7335a2d4a2219bc38a51bd
parent079a29311ff8d958b13fb63d30822cdc250631a2 (diff)
downloadabrt-f4546e160a6dda28009d1d13a6439448f4e6c608.tar.gz
abrt-f4546e160a6dda28009d1d13a6439448f4e6c608.tar.xz
abrt-f4546e160a6dda28009d1d13a6439448f4e6c608.zip
move uuid/duphash generation for Kerneloops to abrt-action-analyze-oops
Usage: abrt-action-analyze-oops [-vs] -d DIR Calculates and saves UUID and DUPHASH of oops crash dumps -v, --verbose be verbose -d DIR Crash dump directory -s Log to syslog Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--abrt.spec1
-rw-r--r--inc/crash_types.h2
-rw-r--r--lib/plugins/Kerneloops.cpp145
-rw-r--r--src/daemon/Makefile.am19
-rw-r--r--src/daemon/abrt-action-analyze-oops.c176
5 files changed, 238 insertions, 105 deletions
diff --git a/abrt.spec b/abrt.spec
index d4b42f9e..3b3ca631 100644
--- a/abrt.spec
+++ b/abrt.spec
@@ -351,6 +351,7 @@ fi
%{_sbindir}/abrt-server
%{_sbindir}/abrt-action-analyze-c
%{_sbindir}/abrt-action-analyze-python
+%{_sbindir}/abrt-action-analyze-oops
%{_sbindir}/abrt-action-generate-backtrace
%{_sbindir}/abrt-action-save-package-data
%{_bindir}/abrt-action-bugzilla
diff --git a/inc/crash_types.h b/inc/crash_types.h
index d425f690..6308db89 100644
--- a/inc/crash_types.h
+++ b/inc/crash_types.h
@@ -63,7 +63,7 @@
// CD_UID from _somewhere_ in order to be able to store it in DB record,
// right?)
#define CD_UID "uid"
-/* CCpp and Python are converted to save uuid as a file (oops isn't yet): */
+// Now uuid also is saved as a file (but is still stored in database too):
#define CD_UUID "uuid"
#define CD_INFORMALL "InformAll"
#define CD_DUMPDIR "DumpDir"
diff --git a/lib/plugins/Kerneloops.cpp b/lib/plugins/Kerneloops.cpp
index a847bfbf..8543f6dc 100644
--- a/lib/plugins/Kerneloops.cpp
+++ b/lib/plugins/Kerneloops.cpp
@@ -20,127 +20,64 @@
#include "abrtlib.h"
#include "Kerneloops.h"
#include "abrt_exception.h"
-#include "comm_layer_inner.h"
-static unsigned hash_oops_str(const char *oops_ptr)
+using namespace std;
+
+static string load(const char *dirname, const char *filename)
{
- unsigned char old_c;
- unsigned char c = 0;
- unsigned hash = 0;
+ string ret;
- /* Special-case: if the first line is of form:
- * WARNING: at net/wireless/core.c:614 wdev_cleanup_work+0xe9/0x120 [cfg80211]() (Not tainted)
- * then hash only "file:line func+ofs/len" part.
- */
- if (strncmp(oops_ptr, "WARNING: at ", sizeof("WARNING: at ")-1) == 0)
- {
- const char *p = oops_ptr + sizeof("WARNING: at ")-1;
- p = strchr(p, ' '); /* skip filename:NNN */
- if (p)
- {
- p = strchrnul(p + 1, ' '); /* skip function_name+0xNN/0xNNN */
- oops_ptr += sizeof("WARNING: at ")-1;
- while (oops_ptr < p)
- {
- c = *oops_ptr++;
- hash = ((hash << 5) ^ (hash >> 27)) ^ c;
- }
- return hash;
- }
- }
+ struct dump_dir *dd = dd_opendir(dirname, /*flags:*/ 0);
+ if (!dd)
+ return ret; /* "" */
+ char *s = dd_load_text(dd, filename);
+ dd_close(dd);
- while (1)
+ if (!s[0])
{
- old_c = c;
- c = *oops_ptr++;
- if (!c)
- break;
- if (c == '\n')
+ free(s);
+
+ pid_t pid = fork();
+ if (pid < 0)
{
- // Exclude some lines which have process name - in some oops classes
- // process name is irrelevant and changes with every oops.
- // Lines we filter out:
- // Pid: 8003, comm: Xorg Not tainted (2.6.27.9-159.fc10.i686 #1)
- // Process Xorg (pid: 8003, ti=f0a0c000 task=f2380000 task.ti=f0a0c000)
- if (strncmp(oops_ptr, "Pid: ", 5) == 0
- || strncmp(oops_ptr, "Process ", 8) == 0
- ) {
- while (*oops_ptr && *oops_ptr != '\n')
- oops_ptr++;
- continue;
- }
+ perror_msg("fork");
+ return ret; /* "" */
}
- if (!isalnum(old_c))
+ if (pid == 0) /* child */
{
- if (c >= '0' && c <= '9')
- {
- // Convert all (possibly hex) numbers to just one '0'
- if (c == '0' && *oops_ptr == 'x') // "0xSOMETHING"
- oops_ptr++;
- while (isxdigit(*oops_ptr))
- oops_ptr++;
- c = '0';
- }
- else if ((c|0x20) >= 'a' && (c|0x20) <= 'f')
- {
- // This *may be* a hex number without 0x prefix: "f0a0c000"
- // Check that it indeed is, and replace with '0'
- const char *oops_ptr2 = oops_ptr;
- while (isxdigit(*oops_ptr2))
- oops_ptr2++;
- // Does it end in a letter which is not a hex digit?
- // (Example: "abcw" is not a hex number, "abc " is)
- if (!isalpha(*oops_ptr2))
- {
- // It's "abc " case. Skip the "abc" string
- oops_ptr = oops_ptr2;
- c = '0';
- }
- // else: hash the string as-is
- }
+ char *argv[4]; /* abrt-action-analyze-python -d DIR <NULL> */
+ char **pp = argv;
+ *pp++ = (char*)"abrt-action-analyze-python";
+ *pp++ = (char*)"-d";
+ *pp++ = (char*)dirname;
+ *pp = NULL;
+
+ execvp(argv[0], argv);
+ perror_msg_and_die("Can't execute '%s'", argv[0]);
}
- // TODO: Drop call trace tail - in interrupt-driven oopses,
- // everything before interrupt is irrelevant.
- // Example of call trace part of oops:
- // Call Trace:
- // [<f88e11c7>] ? radeon_cp_resume+0x7d/0xbc [radeon]
- // [<f88745f8>] ? drm_ioctl+0x1b0/0x225 [drm]
- // [<f88e114a>] ? radeon_cp_resume+0x0/0xbc [radeon]
- // [<c049b1c0>] ? vfs_ioctl+0x50/0x69
- // [<c049b414>] ? do_vfs_ioctl+0x23b/0x247
- // [<c0460a56>] ? audit_syscall_entry+0xf9/0x123
- // [<c049b460>] ? sys_ioctl+0x40/0x5c
- // [<c0403c76>] ? syscall_call+0x7/0xb
+ /* parent */
+ waitpid(pid, NULL, 0);
- /* An algorithm proposed by Donald E. Knuth in The Art Of Computer
- * Programming Volume 3, under the topic of sorting and search
- * chapter 6.4.
- */
- hash = ((hash << 5) ^ (hash >> 27)) ^ c;
+ dd = dd_opendir(dirname, /*flags:*/ 0);
+ if (!dd)
+ return ret; /* "" */
+ s = dd_load_text(dd, filename);
+ dd_close(dd);
}
- return hash;
+
+ ret = s;
+ free(s);
+ return ret;
}
-std::string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
+string CAnalyzerKerneloops::GetLocalUUID(const char *pDebugDumpDir)
{
- VERB3 log("Getting local universal unique identification");
-
- struct dump_dir *dd = dd_opendir(pDebugDumpDir, /*flags:*/ 0);
- if (!dd)
- return std::string("");
-
- char *oops = dd_load_text(dd, FILENAME_BACKTRACE);
- unsigned hash = hash_oops_str(oops);
- free(oops);
-
- hash &= 0x7FFFFFFF;
- dd_close(dd);
- return to_string(hash);
+ return load(pDebugDumpDir, CD_UUID);
}
-std::string CAnalyzerKerneloops::GetGlobalUUID(const char *pDebugDumpDir)
+string CAnalyzerKerneloops::GetGlobalUUID(const char *pDebugDumpDir)
{
- return GetLocalUUID(pDebugDumpDir);
+ return load(pDebugDumpDir, FILENAME_DUPHASH);
}
PLUGIN_INFO(ANALYZER,
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index dd9351ee..f3fad098 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -6,6 +6,7 @@ sbin_PROGRAMS = abrtd \
abrt-server \
abrt-action-analyze-c \
abrt-action-analyze-python \
+ abrt-action-analyze-oops \
abrt-action-generate-backtrace \
abrt-action-save-package-data
@@ -96,6 +97,24 @@ abrt_action_analyze_python_CPPFLAGS = \
abrt_action_analyze_python_LDADD = \
../../lib/utils/libABRTUtils.la
+abrt_action_analyze_oops_SOURCES = \
+ abrt-action-analyze-oops.c
+abrt_action_analyze_oops_CPPFLAGS = \
+ -I$(srcdir)/../../inc \
+ -I$(srcdir)/../../lib/utils \
+ -DBIN_DIR=\"$(bindir)\" \
+ -DVAR_RUN=\"$(VAR_RUN)\" \
+ -DCONF_DIR=\"$(CONF_DIR)\" \
+ -DLOCALSTATEDIR='"$(localstatedir)"' \
+ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+ -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
+ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
+ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+ -D_GNU_SOURCE \
+ -Wall -Werror
+abrt_action_analyze_oops_LDADD = \
+ ../../lib/utils/libABRTUtils.la
+
abrt_action_generate_backtrace_SOURCES = \
abrt-action-generate-backtrace.c
abrt_action_generate_backtrace_CPPFLAGS = \
diff --git a/src/daemon/abrt-action-analyze-oops.c b/src/daemon/abrt-action-analyze-oops.c
new file mode 100644
index 00000000..11ea96b3
--- /dev/null
+++ b/src/daemon/abrt-action-analyze-oops.c
@@ -0,0 +1,176 @@
+/*
+ Copyright (C) 2010 ABRT team
+ Copyright (C) 2010 RedHat Inc
+
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+#include "abrtlib.h"
+#include "parse_options.h"
+
+#define PROGNAME "abrt-action-analyze-oops"
+
+static unsigned hash_oops_str(const char *oops_ptr)
+{
+ unsigned char old_c;
+ unsigned char c = 0;
+ unsigned hash = 0;
+
+ /* Special-case: if the first line is of form:
+ * WARNING: at net/wireless/core.c:614 wdev_cleanup_work+0xe9/0x120 [cfg80211]() (Not tainted)
+ * then hash only "file:line func+ofs/len" part.
+ */
+ if (strncmp(oops_ptr, "WARNING: at ", sizeof("WARNING: at ")-1) == 0)
+ {
+ const char *p = oops_ptr + sizeof("WARNING: at ")-1;
+ p = strchr(p, ' '); /* skip filename:NNN */
+ if (p)
+ {
+ p = strchrnul(p + 1, ' '); /* skip function_name+0xNN/0xNNN */
+ oops_ptr += sizeof("WARNING: at ")-1;
+ while (oops_ptr < p)
+ {
+ c = *oops_ptr++;
+ hash = ((hash << 5) ^ (hash >> 27)) ^ c;
+ }
+ return hash;
+ }
+ }
+
+ while (1)
+ {
+ old_c = c;
+ c = *oops_ptr++;
+ if (!c)
+ break;
+ if (c == '\n')
+ {
+ // Exclude some lines which have process name - in some oops classes
+ // process name is irrelevant and changes with every oops.
+ // Lines we filter out:
+ // Pid: 8003, comm: Xorg Not tainted (2.6.27.9-159.fc10.i686 #1)
+ // Process Xorg (pid: 8003, ti=f0a0c000 task=f2380000 task.ti=f0a0c000)
+ if (strncmp(oops_ptr, "Pid: ", 5) == 0
+ || strncmp(oops_ptr, "Process ", 8) == 0
+ ) {
+ while (*oops_ptr && *oops_ptr != '\n')
+ oops_ptr++;
+ continue;
+ }
+ }
+ if (!isalnum(old_c))
+ {
+ if (c >= '0' && c <= '9')
+ {
+ // Convert all (possibly hex) numbers to just one '0'
+ if (c == '0' && *oops_ptr == 'x') // "0xSOMETHING"
+ oops_ptr++;
+ while (isxdigit(*oops_ptr))
+ oops_ptr++;
+ c = '0';
+ }
+ else if ((c|0x20) >= 'a' && (c|0x20) <= 'f')
+ {
+ // This *may be* a hex number without 0x prefix: "f0a0c000"
+ // Check that it indeed is, and replace with '0'
+ const char *oops_ptr2 = oops_ptr;
+ while (isxdigit(*oops_ptr2))
+ oops_ptr2++;
+ // Does it end in a letter which is not a hex digit?
+ // (Example: "abcw" is not a hex number, "abc " is)
+ if (!isalpha(*oops_ptr2))
+ {
+ // It's "abc " case. Skip the "abc" string
+ oops_ptr = oops_ptr2;
+ c = '0';
+ }
+ // else: hash the string as-is
+ }
+ }
+ // TODO: Drop call trace tail - in interrupt-driven oopses,
+ // everything before interrupt is irrelevant.
+ // Example of call trace part of oops:
+ // Call Trace:
+ // [<f88e11c7>] ? radeon_cp_resume+0x7d/0xbc [radeon]
+ // [<f88745f8>] ? drm_ioctl+0x1b0/0x225 [drm]
+ // [<f88e114a>] ? radeon_cp_resume+0x0/0xbc [radeon]
+ // [<c049b1c0>] ? vfs_ioctl+0x50/0x69
+ // [<c049b414>] ? do_vfs_ioctl+0x23b/0x247
+ // [<c0460a56>] ? audit_syscall_entry+0xf9/0x123
+ // [<c049b460>] ? sys_ioctl+0x40/0x5c
+ // [<c0403c76>] ? syscall_call+0x7/0xb
+
+ /* An algorithm proposed by Donald E. Knuth in The Art Of Computer
+ * Programming Volume 3, under the topic of sorting and search
+ * chapter 6.4.
+ */
+ hash = ((hash << 5) ^ (hash >> 27)) ^ c;
+ }
+ return hash;
+}
+
+int main(int argc, char **argv)
+{
+ char *env_verbose = getenv("ABRT_VERBOSE");
+ if (env_verbose)
+ g_verbose = atoi(env_verbose);
+
+ /* Can't keep these strings/structs static: _() doesn't support that */
+ const char *program_usage_string = _(
+ PROGNAME" [-vs] -d DIR\n\n"
+ "Calculates and saves UUID and DUPHASH of oops crash dumps"
+ );
+ const char *dump_dir_name = ".";
+ enum {
+ OPT_v = 1 << 0,
+ OPT_d = 1 << 1,
+ OPT_s = 1 << 2,
+ };
+ /* Keep enum above and order of options below in sync! */
+ struct options program_options[] = {
+ OPT__VERBOSE(&g_verbose),
+ OPT_STRING('d', NULL, &dump_dir_name, "DIR", _("Crash dump directory")),
+ OPT_BOOL( 's', NULL, NULL, _("Log to syslog" )),
+ OPT_END()
+ };
+ /*unsigned opts =*/ parse_opts(argc, argv, program_options, program_usage_string);
+
+ putenv(xasprintf("ABRT_VERBOSE=%u", g_verbose));
+
+//Maybe we will want this... later
+// msg_prefix = xasprintf(PROGNAME"[%u]", getpid());
+// if (opts & OPT_s)
+// {
+// openlog(msg_prefix, 0, LOG_DAEMON);
+// logmode = LOGMODE_SYSLOG;
+// }
+
+ struct dump_dir *dd = dd_opendir(dump_dir_name, /*flags:*/ 0);
+ if (!dd)
+ return 1;
+
+ char *oops = dd_load_text(dd, FILENAME_BACKTRACE);
+ unsigned hash = hash_oops_str(oops);
+ /* free(oops); */
+
+ hash &= 0x7FFFFFFF;
+ char hash_str[sizeof(int)*3 + 2];
+ sprintf(hash_str, "%u", hash);
+ dd_save_text(dd, CD_UUID, hash_str);
+ dd_save_text(dd, FILENAME_DUPHASH, hash_str);
+
+ dd_close(dd);
+
+ return 0;
+}