From d9e2d23b754c0a3a6ccfdaee423065e4a1cd7784 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 1 Dec 2010 17:40:44 +0100 Subject: 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 --- src/applet/Makefile.am | 10 ++++++++ src/applet/test_report.cpp | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 src/applet/test_report.cpp (limited to 'src/applet') diff --git a/src/applet/Makefile.am b/src/applet/Makefile.am index 4207e818..d32eaa37 100644 --- a/src/applet/Makefile.am +++ b/src/applet/Makefile.am @@ -1,4 +1,5 @@ bin_PROGRAMS = abrt-applet +#test-report abrt_applet_SOURCES = \ Applet.cpp \ @@ -30,6 +31,15 @@ abrt_applet_LDADD = \ $(LIBNOTIFY_LIBS) \ $(GTK_LIBS) +#test_report_SOURCES = \ +# test_report.cpp +#test_report_CPPFLAGS = \ +# -Wall -Werror \ +# -I$(srcdir)/../include \ +# -D_GNU_SOURCE +#test_report_LDADD = \ +# ../lib/libabrt.la + DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ @INTLTOOL_DESKTOP_RULE@ diff --git a/src/applet/test_report.cpp b/src/applet/test_report.cpp new file mode 100644 index 00000000..b93b6759 --- /dev/null +++ b/src/applet/test_report.cpp @@ -0,0 +1,61 @@ +/* + Copyright (C) 2009 Jiri Moskovcak (jmoskovc@redhat.com) + Copyright (C) 2009 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. +*/ +#if HAVE_LOCALE_H +# include +#endif +#include +#include +#include +#include "crash_dump.h" +#include "dump_dir.h" +#include "run_event.h" + +static char *do_log(char *log_line, void *param) +{ + printf("%s\n", log_line); + return log_line; +} + +int main(int argc, char** argv) +{ + map_crash_data_t cd; + + add_to_crash_data(cd, "analyzer", "wow"); + const char *event = "report"; + + struct dump_dir *dd = create_crash_dump_dir(cd); + if (!dd) + return 1; + char *dir_name = strdup(dd->dd_dir); + dd_close(dd); + + printf("Temp dump dir: '%s'\n", dir_name); + + struct run_event_state *run_state = new_run_event_state(); + run_state->logging_callback = do_log; + int r = run_event(run_state, dir_name, event); + if (r == -1) + printf("No actions are found for event '%s'\n", event); + free_run_event_state(run_state); + +// delete_crash_dump_dir(dir_name); + free(dir_name); + + return 0; +} -- cgit