summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inc/crash_types.h7
-rw-r--r--lib/plugins/Bugzilla.cpp4
-rw-r--r--lib/plugins/CCpp.cpp4
-rw-r--r--lib/plugins/RHTSupport.cpp2
-rw-r--r--lib/utils/make_descr.cpp8
-rw-r--r--lib/utils/test.cpp2
-rw-r--r--src/cli/report.cpp4
-rw-r--r--src/daemon/MiddleWare.cpp4
-rw-r--r--src/daemon/abrt-action-generate-backtrace.c4
-rw-r--r--src/gui/CCDump.py24
10 files changed, 35 insertions, 28 deletions
diff --git a/inc/crash_types.h b/inc/crash_types.h
index e786cc5a..d978071a 100644
--- a/inc/crash_types.h
+++ b/inc/crash_types.h
@@ -21,6 +21,8 @@
#include "abrt_types.h"
+// Keep in sync with CCDump.py:
+
// Filenames in dump directory:
// filled by a hook:
#define FILENAME_ANALYZER "analyzer"
@@ -32,7 +34,9 @@
#define FILENAME_BACKTRACE "backtrace"
#define FILENAME_MEMORYMAP "memorymap"
// Used by CCpp analyzer to cache GetGlobalUUID() calls.
-#define FILENAME_GLOBAL_UUID "global_uuid"
+// FIXME! make ALL analyzers to save it as a file!
+// Now, Python and kerneloops do not!
+#define FILENAME_DUPHASH "global_uuid" /* name is compat, to be renamed to "duphash" */
// Name of the function where the application crashed.
// Optional.
#define FILENAME_CRASH_FUNCTION "crash_function"
@@ -61,7 +65,6 @@
#define CD_UID "uid" /* lowercase: compat with older versions */
#define CD_UUID "UUID"
#define CD_INFORMALL "InformAll"
-#define CD_DUPHASH "DUPHASH"
#define CD_DUMPDIR "DumpDir"
#define CD_COUNT "Count"
#define CD_REPORTED "Reported"
diff --git a/lib/plugins/Bugzilla.cpp b/lib/plugins/Bugzilla.cpp
index b3a00e13..6b6591ee 100644
--- a/lib/plugins/Bugzilla.cpp
+++ b/lib/plugins/Bugzilla.cpp
@@ -390,7 +390,7 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData, int depend_on_bugn
const char *component = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_COMPONENT);
const char *release = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_RELEASE);
const char *arch = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_ARCHITECTURE);
- const char *duphash = get_crash_data_item_content_or_NULL(pCrashData, CD_DUPHASH);
+ const char *duphash = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_DUPHASH);
const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON);
const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION);
@@ -689,7 +689,7 @@ std::string CReporterBugzilla::Report(const map_crash_data_t& pCrashData,
}
const char *component = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_COMPONENT);
- const char *duphash = get_crash_data_item_content_or_NULL(pCrashData, CD_DUPHASH);
+ const char *duphash = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_DUPHASH);
const char *release = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_RELEASE);
ctx bz_server(bugzilla_xmlrpc, ssl_verify);
diff --git a/lib/plugins/CCpp.cpp b/lib/plugins/CCpp.cpp
index a83a2b23..48bbbb5d 100644
--- a/lib/plugins/CCpp.cpp
+++ b/lib/plugins/CCpp.cpp
@@ -459,9 +459,9 @@ string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir)
if (!dd_opendir(dd, pDebugDumpDir, DD_CLOSE_ON_OPEN_ERR))
return string("");
- if (dd_exist(dd, FILENAME_GLOBAL_UUID))
+ if (dd_exist(dd, FILENAME_DUPHASH))
{
- char *uuid = dd_load_text(dd, FILENAME_GLOBAL_UUID);
+ char *uuid = dd_load_text(dd, FILENAME_DUPHASH);
dd_close(dd);
string ret = uuid;
free(uuid);
diff --git a/lib/plugins/RHTSupport.cpp b/lib/plugins/RHTSupport.cpp
index 94615fe9..016d5a91 100644
--- a/lib/plugins/RHTSupport.cpp
+++ b/lib/plugins/RHTSupport.cpp
@@ -128,7 +128,7 @@ string CReporterRHticket::Report(const map_crash_data_t& pCrashData,
// const string& component = get_crash_data_item_content(pCrashData, FILENAME_COMPONENT);
// const string& release = get_crash_data_item_content(pCrashData, FILENAME_RELEASE);
// const string& arch = get_crash_data_item_content(pCrashData, FILENAME_ARCHITECTURE);
-// const string& duphash = get_crash_data_item_content(pCrashData, CD_DUPHASH);
+// const string& duphash = get_crash_data_item_content(pCrashData, FILENAME_DUPHASH);
const char *reason = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON);
const char *function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION);
diff --git a/lib/utils/make_descr.cpp b/lib/utils/make_descr.cpp
index bfe2a100..79065100 100644
--- a/lib/utils/make_descr.cpp
+++ b/lib/utils/make_descr.cpp
@@ -66,10 +66,10 @@ static const char *const blacklisted_items[] = {
FILENAME_COREDUMP ,
FILENAME_DESCRIPTION, /* package description - basically useless */
FILENAME_HOSTNAME ,
- FILENAME_GLOBAL_UUID,
+ FILENAME_DUPHASH ,
CD_UUID ,
CD_INFORMALL ,
- CD_DUPHASH ,
+ FILENAME_DUPHASH ,
CD_DUMPDIR ,
CD_COUNT ,
CD_REPORTED ,
@@ -90,14 +90,14 @@ char* make_dsc_mailx(const map_crash_data_t & crash_data)
if (it->second[CD_TYPE] == CD_TXT)
{
const char *itemname = it->first.c_str();
- if ((strcmp(itemname, CD_DUPHASH) != 0)
+ if ((strcmp(itemname, FILENAME_DUPHASH) != 0)
&& (strcmp(itemname, FILENAME_ARCHITECTURE) != 0)
&& (strcmp(itemname, FILENAME_KERNEL) != 0)
&& (strcmp(itemname, FILENAME_PACKAGE) != 0)
) {
strbuf_append_strf(buf_additional_files, "%s\n-----\n%s\n\n", itemname, it->second[CD_CONTENT].c_str());
}
- else if (strcmp(itemname, CD_DUPHASH) == 0)
+ else if (strcmp(itemname, FILENAME_DUPHASH) == 0)
strbuf_append_strf(buf_duphash_file, "%s\n-----\n%s\n\n", itemname, it->second[CD_CONTENT].c_str());
else
strbuf_append_strf(buf_common_files, "%s\n-----\n%s\n\n", itemname, it->second[CD_CONTENT].c_str());
diff --git a/lib/utils/test.cpp b/lib/utils/test.cpp
index 35edb0c5..f2fe9584 100644
--- a/lib/utils/test.cpp
+++ b/lib/utils/test.cpp
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
* If we do not want user interaction, just send data immediately
*/
map_crash_data_t crashReport;
- middleWare.CreateCrashReport(crashInfo[CD_DUPHASH][CD_CONTENT],
+ middleWare.CreateCrashReport(crashInfo[FILENAME_DUPHASH][CD_CONTENT],
crashInfo[CD_UID][CD_CONTENT],
crashReport);
/* Report crash */
diff --git a/src/cli/report.cpp b/src/cli/report.cpp
index cb6e2081..46205f7e 100644
--- a/src/cli/report.cpp
+++ b/src/cli/report.cpp
@@ -192,7 +192,7 @@ static void write_crash_report(const map_crash_data_t &report, FILE *fp)
_("# How to reproduce the crash?"));
write_crash_report_field(fp, report, FILENAME_BACKTRACE,
_("# Backtrace\n# Check that it does not contain any sensitive data (passwords, etc.)"));
- write_crash_report_field(fp, report, CD_DUPHASH, "# DUPHASH");
+ write_crash_report_field(fp, report, FILENAME_DUPHASH, "# DUPHASH");
write_crash_report_field(fp, report, FILENAME_ARCHITECTURE, _("# Architecture"));
write_crash_report_field(fp, report, FILENAME_CMDLINE, _("# Command line"));
write_crash_report_field(fp, report, FILENAME_COMPONENT, _("# Component"));
@@ -279,7 +279,7 @@ static int read_crash_report(map_crash_data_t &report, const char *text)
result |= read_crash_report_field(text, report, FILENAME_COMMENT);
result |= read_crash_report_field(text, report, FILENAME_REPRODUCE);
result |= read_crash_report_field(text, report, FILENAME_BACKTRACE);
- result |= read_crash_report_field(text, report, CD_DUPHASH);
+ result |= read_crash_report_field(text, report, FILENAME_DUPHASH);
result |= read_crash_report_field(text, report, FILENAME_ARCHITECTURE);
result |= read_crash_report_field(text, report, FILENAME_CMDLINE);
result |= read_crash_report_field(text, report, FILENAME_COMPONENT);
diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index ae25180f..0bb24634 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -331,7 +331,7 @@ mw_result_t CreateCrashReport(const char *crash_id,
if (DebugDumpToCrashReport(row->db_dump_dir, pCrashData))
{
add_to_crash_data_ext(pCrashData, CD_UUID , CD_SYS, CD_ISNOTEDITABLE, row->db_uuid);
- add_to_crash_data_ext(pCrashData, CD_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
+ add_to_crash_data_ext(pCrashData, FILENAME_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
}
else
{
@@ -501,7 +501,7 @@ report_status_t Report(const map_crash_data_t& client_report,
std::string dup_hash = GetGlobalUUID(analyzer.c_str(), pDumpDir.c_str());
VERB3 log(" DUPHASH:'%s'", dup_hash.c_str());
- add_to_crash_data_ext(stored_report, CD_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
+ add_to_crash_data_ext(stored_report, FILENAME_DUPHASH, CD_TXT, CD_ISNOTEDITABLE, dup_hash.c_str());
// Run reporters
diff --git a/src/daemon/abrt-action-generate-backtrace.c b/src/daemon/abrt-action-generate-backtrace.c
index 71946f5e..4be123b8 100644
--- a/src/daemon/abrt-action-generate-backtrace.c
+++ b/src/daemon/abrt-action-generate-backtrace.c
@@ -343,7 +343,7 @@ int main(int argc, char **argv)
strbuf_prepend_str(bt, package);
char hash_str[SHA1_RESULT_LEN*2 + 1];
create_hash(hash_str, bt->buf);
- dd_save_text(dd, FILENAME_GLOBAL_UUID, hash_str);
+ dd_save_text(dd, FILENAME_DUPHASH, hash_str);
strbuf_free(bt);
/* Compute and store backtrace rating. The crash frame
@@ -384,7 +384,7 @@ int main(int argc, char **argv)
strbuf_prepend_str(ibt, package);
char hash_str[SHA1_RESULT_LEN*2 + 1];
create_hash(hash_str, ibt->buf);
- dd_save_text(dd, FILENAME_GLOBAL_UUID, hash_str);
+ dd_save_text(dd, FILENAME_DUPHASH, hash_str);
strbuf_free(ibt);
/* Compute and store backtrace rating. */
diff --git a/src/gui/CCDump.py b/src/gui/CCDump.py
index e6dc78c6..e94d0c9b 100644
--- a/src/gui/CCDump.py
+++ b/src/gui/CCDump.py
@@ -3,7 +3,7 @@ from datetime import datetime
from abrt_utils import _, init_logging, log, log1, log2
-# Should match CrashTypes.h!
+# Keep in sync with crash_types.h!
CD_TYPE = 0
CD_EDITABLE = 1
CD_CONTENT = 2
@@ -12,28 +12,32 @@ CD_SYS = "s"
CD_BIN = "b"
CD_TXT = "t"
+FILENAME_ANALYZER = "analyzer"
+FILENAME_EXECUTABLE = "executable"
+FILENAME_BINARY = "binary"
+FILENAME_CMDLINE = "cmdline"
+FILENAME_REASON = "reason"
+FILENAME_COREDUMP = "coredump"
+FILENAME_BACKTRACE = "backtrace"
+FILENAME_MEMORYMAP = "memorymap"
+FILENAME_DUPHASH = "global_uuid"
+FILENAME_CRASH_FUNCTION = "crash_function"
FILENAME_ARCHITECTURE = "architecture"
FILENAME_KERNEL = "kernel"
FILENAME_TIME = "time"
+FILENAME_RELEASE = "release"
FILENAME_PACKAGE = "package"
FILENAME_COMPONENT = "component"
FILENAME_DESCRIPTION = "description"
-FILENAME_ANALYZER = "analyzer"
-FILENAME_RELEASE = "release"
-FILENAME_EXECUTABLE = "executable"
-FILENAME_REASON = "reason"
FILENAME_COMMENT = "comment"
FILENAME_REPRODUCE = "reproduce"
FILENAME_RATING = "rating"
-FILENAME_CMDLINE = "cmdline"
-FILENAME_COREDUMP = "coredump"
-FILENAME_BACKTRACE = "backtrace"
-FILENAME_MEMORYMAP = "memorymap"
+FILENAME_HOSTNAME = "hostname"
+FILENAME_REMOTE = "remote"
CD_UID = "uid"
CD_UUID = "UUID"
CD_INFORMALL = "InformAll"
-CD_DUPHASH = "DUPHASH"
CD_DUMPDIR = "DumpDir"
CD_COUNT = "Count"
CD_REPORTED = "Reported"
generated by cgit (git 2.34.1) at 2024-05-09 20:47:30 +0000