This patch changes crash data to use C structures.

The smallest data element is:

struct crash_item { char *content; unsigned flags; };

where content is, eh, content, and flags is a bit flag field.

crash_data_t is a map of crash_item's, implemented as a pointer
to heap-allocated GHashTable.

vector_of_crash_data_t is a vector of crash_data_t's, implemented
as a pointer to heap-allocated GPtrArray.

Most operations have light wrappers around them to hide the nature
of the containers. For example, to free vector_of_crash_data,
you need to use free_vector_of_crash_data(ptr) instead of
open-coding g_ptr_array_free. The wrapper is thin.

The goal is not so much to hide the implementation, but more
to make it easier to use the correct function.

dbus (un)marshalling functions convert crash_item to three-element
array of strings, in order to keep compatibility with abrt-gui (python).
This can be changed later to use native representation.
crash_data_t and vector_of_crash_data_t are represented in
"natural" way, no funny stuff there.

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

6 files changed, 83 insertions, 69 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index a7790e71..fb91fc1e 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -56,7 +56,8 @@ libCCpp_la_CPPFLAGS = -Wall -Werror \
     -I$(UTILS_PATH) \
     -DCCPP_HOOK_PATH=\"${libexecdir}/abrt-hook-ccpp\" \
     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-    -DLOCALSTATEDIR='"$(localstatedir)"'
+    -DLOCALSTATEDIR='"$(localstatedir)"' \
+    $(GLIB_CFLAGS)
 #    -DHOSTILE_KERNEL
 
 # KerneloopsScanner
@@ -89,6 +90,7 @@ abrt_action_analyze_c_CPPFLAGS = \
     -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_c_LDADD = \
@@ -107,6 +109,7 @@ abrt_action_analyze_python_CPPFLAGS = \
     -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_python_LDADD = \
@@ -125,6 +128,7 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_oops_LDADD = \
@@ -143,6 +147,7 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -DDEBUG_INFO_DIR=\"$(DEBUG_INFO_DIR)\" \
     -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
     -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+    $(GLIB_CFLAGS) \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_generate_backtrace_LDADD = \
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index b396e453..b215735b 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -112,8 +112,8 @@ struct ctx: public abrt_xmlrpc_conn {
     xmlrpc_int32 get_bug_dup_id(xmlrpc_value* result_xml);
     void         get_bug_cc(xmlrpc_value* result_xml, struct bug_info* bz);
     int          add_plus_one_cc(xmlrpc_int32 bug_id, const char* login);
-    xmlrpc_int32 new_bug(const map_crash_data_t& pCrashData, int depend_on_bugno);
-    int          add_attachments(const char* bug_id_str, const map_crash_data_t& pCrashData);
+    xmlrpc_int32 new_bug(crash_data_t *crash_data, int depend_on_bugno);
+    int          add_attachments(const char* bug_id_str, crash_data_t *crash_data);
     int          get_bug_info(struct bug_info* bz, xmlrpc_int32 bug_id);
     int          add_comment(xmlrpc_int32 bug_id, const char* comment, bool is_private);
 
@@ -442,17 +442,17 @@ static const char *tainted_string(unsigned tainted)
     return taint_warnings[idx];
 }
 
-xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData, int depend_on_bugno)
+xmlrpc_int32 ctx::new_bug(crash_data_t *crash_data, int depend_on_bugno)
 {
-    const char *package         = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_PACKAGE);
-    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, 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);
-    const char *analyzer        = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_ANALYZER);
-    const char *tainted_str     = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_TAINTED);
+    const char *package         = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
+    const char *component       = get_crash_item_content_or_NULL(crash_data, FILENAME_COMPONENT);
+    const char *release         = get_crash_item_content_or_NULL(crash_data, FILENAME_RELEASE);
+    const char *arch            = get_crash_item_content_or_NULL(crash_data, FILENAME_ARCHITECTURE);
+    const char *duphash         = get_crash_item_content_or_NULL(crash_data, FILENAME_DUPHASH);
+    const char *reason          = get_crash_item_content_or_NULL(crash_data, FILENAME_REASON);
+    const char *function        = get_crash_item_content_or_NULL(crash_data, FILENAME_CRASH_FUNCTION);
+    const char *analyzer        = get_crash_item_content_or_NULL(crash_data, FILENAME_ANALYZER);
+    const char *tainted_str     = get_crash_item_content_or_NULL(crash_data, FILENAME_TAINTED);
 
     struct strbuf *buf_summary = strbuf_new();
     strbuf_append_strf(buf_summary, "[abrt] %s", package);
@@ -474,7 +474,7 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData, int depend_on_bugn
 
     char *status_whiteboard = xasprintf("abrt_hash:%s", duphash);
 
-    char *bz_dsc = make_description_bz(pCrashData);
+    char *bz_dsc = make_description_bz(crash_data);
     char *full_dsc = xasprintf("abrt version: "VERSION"\n%s", bz_dsc);
     free(bz_dsc);
 
@@ -534,23 +534,24 @@ xmlrpc_int32 ctx::new_bug(const map_crash_data_t& pCrashData, int depend_on_bugn
     return bug_id;
 }
 
-int ctx::add_attachments(const char* bug_id_str, const map_crash_data_t& pCrashData)
+int ctx::add_attachments(const char* bug_id_str, crash_data_t *crash_data)
 {
-    map_crash_data_t::const_iterator it = pCrashData.begin();
-    for (; it != pCrashData.end(); it++)
+    GHashTableIter iter;
+    char *name;
+    struct crash_item *value;
+    g_hash_table_iter_init(&iter, crash_data);
+    while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
     {
-        const char *itemname = it->first.c_str();
-        const char *type = it->second[CD_TYPE].c_str();
-        const char *content = it->second[CD_CONTENT].c_str();
+        const char *content = value->content;
 
-        if ((strcmp(type, CD_TXT) == 0)
-         && (strlen(content) > CD_TEXT_ATT_SIZE || (strcmp(itemname, FILENAME_BACKTRACE) == 0))
+        if ((value->flags & CD_FLAG_TXT)
+         && (strlen(content) > CD_TEXT_ATT_SIZE || (strcmp(name, FILENAME_BACKTRACE) == 0))
         ) {
             char *encoded64 = encode_base64(content, strlen(content));
-            char *filename = xasprintf("File: %s", itemname);
+            char *filename = xasprintf("File: %s", name);
             xmlrpc_value* result = call("bugzilla.addAttachment", "(s{s:s,s:s,s:s,s:s})", bug_id_str,
                                         "description", filename,
-                                        "filename", itemname,
+                                        "filename", name,
                                         "contenttype", "text/plain",
                                         "data", encoded64
                                       );
@@ -644,8 +645,7 @@ static void report_to_bugzilla(
     {
         throw CABRTException(EXCEP_PLUGIN, _("Can't open '%s'"), dump_dir_name);
     }
-    map_crash_data_t pCrashData;
-    load_crash_data_from_crash_dump_dir(dd, pCrashData);
+    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
     dd_close(dd);
 
     const char *env;
@@ -674,9 +674,9 @@ static void report_to_bugzilla(
     env = getenv("Bugzilla_SSLVerify");
     ssl_verify = string_to_bool(env ? env : settings["SSLVerify"].c_str());
 
-    const char *component = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_COMPONENT);
-    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);
+    const char *component = get_crash_item_content_or_NULL(crash_data, FILENAME_COMPONENT);
+    const char *duphash   = get_crash_item_content_or_NULL(crash_data, FILENAME_DUPHASH);
+    const char *release   = get_crash_item_content_or_NULL(crash_data, FILENAME_RELEASE);
 
     ctx bz_server(bugzilla_xmlrpc, ssl_verify);
 
@@ -773,7 +773,7 @@ static void report_to_bugzilla(
     else if (all_bugs_size == 0) // Create new bug
     {
         log(_("Creating a new bug..."));
-        bug_id = bz_server.new_bug(pCrashData, depend_on_bugno);
+        bug_id = bz_server.new_bug(crash_data, depend_on_bugno);
         if (bug_id < 0)
         {
             throw_if_xml_fault_occurred(&bz_server.env);
@@ -781,7 +781,7 @@ static void report_to_bugzilla(
         }
 
         log("Adding attachments to bug %d...", bug_id);
-        int ret = bz_server.add_attachments(to_string(bug_id).c_str(), pCrashData);
+        int ret = bz_server.add_attachments(to_string(bug_id).c_str(), crash_data);
         if (ret == -1)
         {
             throw_if_xml_fault_occurred(&bz_server.env);
@@ -855,13 +855,13 @@ static void report_to_bugzilla(
             throw_if_xml_fault_occurred(&bz_server.env);
         }
 
-        char *dsc = make_description_reproduce_comment(pCrashData);
+        char *dsc = make_description_reproduce_comment(crash_data);
         if (dsc)
         {
-            const char* package    = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_PACKAGE);
-            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* is_private = get_crash_data_item_content_or_NULL(pCrashData, "is_private");
+            const char* package    = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
+            const char* release    = get_crash_item_content_or_NULL(crash_data, FILENAME_RELEASE);
+            const char* arch       = get_crash_item_content_or_NULL(crash_data, FILENAME_ARCHITECTURE);
+            const char* is_private = get_crash_item_content_or_NULL(crash_data, "is_private");
 
             char *full_dsc = xasprintf("Package: %s\n"
                                 "Architecture: %s\n"
@@ -895,6 +895,7 @@ static void report_to_bugzilla(
                 (int)bug_id
     );
 
+    free_crash_data(crash_data);
     bug_info_destroy(&bz);
 }
 
diff --git a/src/plugins/abrt-action-kerneloops.cpp b/src/plugins/abrt-action-kerneloops.cpp
index dea6df17..ac90abd7 100644
--- a/src/plugins/abrt-action-kerneloops.cpp
+++ b/src/plugins/abrt-action-kerneloops.cpp
@@ -91,11 +91,10 @@ static void report_to_kerneloops(
     if (!dd)
         exit(1); /* error msg is already logged */
 
-    map_crash_data_t pCrashData;
-    load_crash_data_from_crash_dump_dir(dd, pCrashData);
+    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
     dd_close(dd);
 
-    const char *backtrace = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_BACKTRACE);
+    const char *backtrace = get_crash_item_content_or_NULL(crash_data, FILENAME_BACKTRACE);
     if (!backtrace)
         error_msg_and_die("Error sending kernel oops due to missing backtrace");
 
@@ -114,6 +113,8 @@ static void report_to_kerneloops(
     if (ret != CURLE_OK)
         error_msg_and_die("Kernel oops has not been sent due to %s", curl_easy_strerror(ret));
 
+    free_crash_data(crash_data);
+
     /* Server replies with:
      * 200 thank you for submitting the kernel oops information
      * RemoteIP: 34192fd15e34bf60fac6a5f01bba04ddbd3f0558
diff --git a/src/plugins/abrt-action-mailx.cpp b/src/plugins/abrt-action-mailx.cpp
index fa7fd8a0..824791fa 100644
--- a/src/plugins/abrt-action-mailx.cpp
+++ b/src/plugins/abrt-action-mailx.cpp
@@ -66,8 +66,7 @@ static void create_and_send_email(
     if (!dd)
         exit(1); /* error msg is already logged by dd_opendir */
 
-    map_crash_data_t pCrashData;
-    load_crash_data_from_crash_dump_dir(dd, pCrashData);
+    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
     dd_close(dd);
 
     char* env;
@@ -90,17 +89,20 @@ static void create_and_send_email(
     unsigned arg_size = 0;
     args = append_str_to_vector(args, arg_size, "/bin/mailx");
 
-    char *dsc = make_description_mailx(pCrashData);
+    char *dsc = make_description_mailx(crash_data);
 
     if (send_binary_data)
     {
-        map_crash_data_t::const_iterator it_cd;
-        for (it_cd = pCrashData.begin(); it_cd != pCrashData.end(); it_cd++)
+        GHashTableIter iter;
+        char *name;
+        struct crash_item *value;
+        g_hash_table_iter_init(&iter, crash_data);
+        while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
         {
-            if (it_cd->second[CD_TYPE] == CD_BIN)
+            if (value->flags & CD_FLAG_BIN)
             {
                 args = append_str_to_vector(args, arg_size, "-a");
-                args = append_str_to_vector(args, arg_size, it_cd->second[CD_CONTENT].c_str());
+                args = append_str_to_vector(args, arg_size, value->content);
             }
         }
     }
@@ -112,7 +114,7 @@ static void create_and_send_email(
     args = append_str_to_vector(args, arg_size, email_to);
 
     log(_("Sending an email..."));
-    const char *uid_str = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_UID);
+    const char *uid_str = get_crash_item_content_or_NULL(crash_data, FILENAME_UID);
     exec_and_feed_input(xatoi_u(uid_str), dsc, args);
 
     free(dsc);
@@ -122,6 +124,8 @@ static void create_and_send_email(
     args -= arg_size;
     free(args);
 
+    free_crash_data(crash_data);
+
     log("Email was sent to: %s", email_to);
 }
 
diff --git a/src/plugins/abrt-action-print.cpp b/src/plugins/abrt-action-print.cpp
index 303c05f7..04d01de3 100644
--- a/src/plugins/abrt-action-print.cpp
+++ b/src/plugins/abrt-action-print.cpp
@@ -81,13 +81,13 @@ int main(int argc, char **argv)
         if (!dd)
             return 1; /* error message is already logged */
 
-        map_crash_data_t pCrashData;
-        load_crash_data_from_crash_dump_dir(dd, pCrashData);
+        crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
         dd_close(dd);
 
-        char *dsc = make_description_logger(pCrashData);
+        char *dsc = make_description_logger(crash_data);
         fputs(dsc, stdout);
         free(dsc);
+        free_crash_data(crash_data);
     }
     catch (CABRTException& e)
     {
diff --git a/src/plugins/abrt-action-rhtsupport.cpp b/src/plugins/abrt-action-rhtsupport.cpp
index eb69489d..994c84f3 100644
--- a/src/plugins/abrt-action-rhtsupport.cpp
+++ b/src/plugins/abrt-action-rhtsupport.cpp
@@ -35,8 +35,7 @@ static void report_to_rhtsupport(
     if (!dd)
         exit(1); /* error msg is already logged by dd_opendir */
 
-    map_crash_data_t pCrashData;
-    load_crash_data_from_crash_dump_dir(dd, pCrashData);
+    crash_data_t *crash_data = load_crash_data_from_crash_dump_dir(dd);
     dd_close(dd);
 
     /* Gzipping e.g. 0.5gig coredump takes a while. Let client know what we are doing */
@@ -79,9 +78,9 @@ static void report_to_rhtsupport(
         goto ret;
     }
 
-    package  = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_PACKAGE);
-    reason   = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_REASON);
-    function = get_crash_data_item_content_or_NULL(pCrashData, FILENAME_CRASH_FUNCTION);
+    package  = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
+    reason   = get_crash_item_content_or_NULL(crash_data, FILENAME_REASON);
+    function = get_crash_item_content_or_NULL(crash_data, FILENAME_CRASH_FUNCTION);
 
     {
         struct strbuf *buf_summary = strbuf_new();
@@ -92,7 +91,7 @@ static void report_to_rhtsupport(
             strbuf_append_strf(buf_summary, ": %s", reason);
         summary = strbuf_free_nobuf(buf_summary);
 
-        char *bz_dsc = make_description_bz(pCrashData);
+        char *bz_dsc = make_description_bz(crash_data);
         dsc = xasprintf("abrt version: "VERSION"\n%s", bz_dsc);
         free(bz_dsc);
     }
@@ -124,21 +123,24 @@ static void report_to_rhtsupport(
     }
 
     {
-        map_crash_data_t::const_iterator it = pCrashData.begin();
-        for (; it != pCrashData.end(); it++)
+        GHashTableIter iter;
+        char *name;
+        struct crash_item *value;
+        g_hash_table_iter_init(&iter, crash_data);
+        while (g_hash_table_iter_next(&iter, (void**)&name, (void**)&value))
         {
-            if (it->first == FILENAME_COUNT) continue;
-            if (it->first == CD_DUMPDIR) continue;
-            if (it->first == FILENAME_INFORMALL) continue;
-            if (it->first == FILENAME_MESSAGE) continue; // plugin's status message (if we already reported it yesterday)
-            if (it->first == FILENAME_DESCRIPTION) continue; // package description
-
-            const char *content = it->second[CD_CONTENT].c_str();
-            if (it->second[CD_TYPE] == CD_TXT)
+            if (strcmp(name, FILENAME_COUNT) == 0) continue;
+            if (strcmp(name, CD_DUMPDIR) == 0) continue;
+            if (strcmp(name, FILENAME_INFORMALL) == 0) continue;
+            if (strcmp(name, FILENAME_MESSAGE) == 0) continue; // plugin's status message (if we already reported it yesterday)
+            if (strcmp(name, FILENAME_DESCRIPTION) == 0) continue; // package description
+
+            const char *content = value->content;
+            if (value->flags & CD_FLAG_TXT)
             {
-                reportfile_add_binding_from_string(file, it->first.c_str(), content);
+                reportfile_add_binding_from_string(file, name, content);
             }
-            else if (it->second[CD_TYPE] == CD_BIN)
+            else if (value->flags & CD_FLAG_BIN)
             {
                 const char *basename = strrchr(content, '/');
                 if (basename)
@@ -148,7 +150,7 @@ static void report_to_rhtsupport(
                 char *xml_name = concat_path_file("content", basename);
                 reportfile_add_binding_from_namedfile(file,
                         /*on_disk_filename */ content,
-                        /*binding_name     */ it->first.c_str(),
+                        /*binding_name     */ name,
                         /*recorded_filename*/ xml_name,
                         /*binary           */ 1);
                 if (tar_append_file(tar, (char*)content, xml_name) != 0)
@@ -248,6 +250,7 @@ static void report_to_rhtsupport(
     free(url);
     free(login);
     free(password);
+    free_crash_data(crash_data);
 
     if (errmsg)
         error_msg_and_die("%s", errmsg);