summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2010-12-01 17:40:44 +0100
committerDenys Vlasenko <dvlasenk@redhat.com>2010-12-01 17:40:44 +0100
commitd9e2d23b754c0a3a6ccfdaee423065e4a1cd7784 (patch)
tree7f62cf674e5c17910a70ca9fd48debb1697e4bba /src/lib
parentb808fc36602756d1c1495179331a4e92a7b094dc (diff)
downloadabrt-d9e2d23b754c0a3a6ccfdaee423065e4a1cd7784.tar.gz
abrt-d9e2d23b754c0a3a6ccfdaee423065e4a1cd7784.tar.xz
abrt-d9e2d23b754c0a3a6ccfdaee423065e4a1cd7784.zip
factor out headers so that "report lib" API is separated out of abrt API
This patch minimally affects code per se - it adds create_crash_dump_dir() function which takes in-memory representation of the dump (map_crash_data_t object) and creates an on-disk representation. Then it returns pointer to struct dump_dir. With this function, it is possible to run an event on a user-constructed map_crash_data_t: map_crash_data_t cd; add_to_crash_data(cd, "foo", "bar"); struct dump_dir *dd = create_crash_dump_dir(cd); char *dir_name = strdup(dd->dd_dir); dd_close(dd); run_event(run_state, dir_name, event); delete_crash_dump_dir(dir_name); which is, basically, what report library is about. The biggest part of the patch is reshuffling of header files, with the following result: three header files which are not cluttered by other ABRT stuff, and expose the following API each: crash_dump.h - in-memory crash dump data structs and ops dump_dir.h - on-disk crash dump data structs and ops run_event.h - run_event() and friends These is a test application, test_report.cpp.cpp, which demonstrates (and tests) usage of these headers. (grep for "test-report" and enable it in build system if you want it to be built). It creates a temporary dump in /var/run/abrt/tmp-NNNN-NNNNN and runs "report" event. Deleting of temp dump is disabled for testing purposes - you might want to see the contents. Here is how the binary looks like: text data bss dec hex filename 3730 668 48 4446 115e /usr/bin/test-report linux-vdso.so.1 => (0x00007ffffa80f000) libabrt.so.0 => /usr/lib64/libabrt.so.0 (0x00007fad1f35e000) libglib-2.0.so.0 => /lib64/libglib-2.0.so.0 (0x0000003c1f200000) libstdc++.so.6 => /usr/lib64/libstdc++.so.6 (0x0000003c2c200000) libm.so.6 => /lib64/libm.so.6 (0x00007fad1f0da000) libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x0000003c28e00000) libc.so.6 => /lib64/libc.so.6 (0x00007fad1ed5b000) /lib64/ld-linux-x86-64.so.2 (0x00007fad1f570000) Next step would be to clean up the namespace, then rename libabrt.so into libreport.so, then split it into a separate package so that we can install it without installing other two abrt .so files. Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Makefile.am2
-rw-r--r--src/lib/crash_dump.cpp10
-rw-r--r--src/lib/create_crash_dump_dir.cpp57
-rw-r--r--src/lib/run_event.c10
4 files changed, 69 insertions, 10 deletions
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index ad2d2025..a17df28e 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -40,6 +40,7 @@ libabrt_la_SOURCES = \
make_descr.cpp \
run_event.c \
crash_dump.cpp \
+ create_crash_dump_dir.cpp \
ABRTException.cpp \
hooklib.c hooklib.h \
parse_release.cpp \
@@ -50,6 +51,7 @@ libabrt_la_CPPFLAGS = \
-DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
+ -DLOCALSTATEDIR='"$(localstatedir)"' \
-DCONF_DIR=\"$(CONF_DIR)\" \
-DVAR_RUN=\"$(VAR_RUN)\" \
$(GLIB_CFLAGS) \
diff --git a/src/lib/crash_dump.cpp b/src/lib/crash_dump.cpp
index 338724d5..cca28021 100644
--- a/src/lib/crash_dump.cpp
+++ b/src/lib/crash_dump.cpp
@@ -19,16 +19,6 @@
#include "abrtlib.h"
#include "abrt_crash_dump.h"
-const char *const must_have_files[] = {
- FILENAME_ARCHITECTURE,
- FILENAME_KERNEL ,
- FILENAME_PACKAGE ,
- FILENAME_COMPONENT ,
- FILENAME_RELEASE ,
- FILENAME_EXECUTABLE ,
- NULL
-};
-
static const char *const editable_files[] = {
FILENAME_DESCRIPTION,
FILENAME_COMMENT ,
diff --git a/src/lib/create_crash_dump_dir.cpp b/src/lib/create_crash_dump_dir.cpp
new file mode 100644
index 00000000..0a74411b
--- /dev/null
+++ b/src/lib/create_crash_dump_dir.cpp
@@ -0,0 +1,57 @@
+/*
+ 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"
+
+using namespace std;
+
+struct dump_dir *create_crash_dump_dir(const map_crash_data_t& crash_data)
+{
+ char *path = xasprintf(LOCALSTATEDIR"/run/abrt/tmp-%lu-%lu", (long)getpid(), (long)time(NULL));
+ struct dump_dir *dd = dd_create(path, getuid());
+ free(path);
+ if (!dd)
+ return NULL;
+
+ map_crash_data_t::const_iterator its = crash_data.begin();
+ while (its != crash_data.end())
+ {
+ const char *name, *value;
+ name = its->first.c_str();
+
+ if (name[0] == '.' || strchr(name, '/'))
+ {
+ error_msg("Crash data field name contains disallowed chars: '%s'", name);
+ goto next;
+ }
+
+//FIXME: what to do with CD_BINs??
+ /* Fields: CD_TYPE (is CD_SYS, CD_BIN or CD_TXT),
+ * CD_EDITABLE, CD_CONTENT */
+ if (its->second[CD_TYPE] == CD_BIN)
+ goto next;
+
+ value = its->second[CD_CONTENT].c_str();
+ dd_save_text(dd, name, value);
+ next:
+ its++;
+ }
+
+ return dd;
+}
diff --git a/src/lib/run_event.c b/src/lib/run_event.c
index 4ff1070d..28fbfd5e 100644
--- a/src/lib/run_event.c
+++ b/src/lib/run_event.c
@@ -18,6 +18,16 @@
*/
#include "abrtlib.h"
+struct run_event_state *new_run_event_state()
+{
+ return (struct run_event_state*)xzalloc(sizeof(struct run_event_state));
+}
+
+void free_run_event_state(struct run_event_state *state)
+{
+ free(state);
+}
+
int run_event(struct run_event_state *state,
const char *dump_dir_name,
const char *event