From 59a9da5ba16561947fbd443bc5919cde901aecfe Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Wed, 25 Nov 2015 16:50:22 +0100 Subject: add way to add additional information to the crash report We can add several additional key value pairs during the execution of the program that will be used on the server to show more information. Reviewed-on: https://gerrit.libreoffice.org/22553 Tested-by: Jenkins Reviewed-by: Markus Mohrhard (cherry picked from commit 98a8eafa915b8d57b8bdccab9981e537d77f6f4a) Change-Id: I4102adc15fc821415fa0b997ca7fe0dc4f7abcec --- desktop/source/app/crashreport.cxx | 33 +++++++++++++++++++++++++++++ desktop/source/app/sofficemain.cxx | 2 +- desktop/source/app/sofficemain.h | 2 +- desktop/source/inc/desktopdllapi.h | 24 --------------------- desktop/source/pkgchk/unopkg/unopkg_app.cxx | 2 +- desktop/source/pkgchk/unopkg/unopkg_main.h | 2 +- 6 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 desktop/source/app/crashreport.cxx delete mode 100644 desktop/source/inc/desktopdllapi.h (limited to 'desktop/source') diff --git a/desktop/source/app/crashreport.cxx b/desktop/source/app/crashreport.cxx new file mode 100644 index 000000000000..0bde05979a72 --- /dev/null +++ b/desktop/source/app/crashreport.cxx @@ -0,0 +1,33 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include +#include + +osl::Mutex CrashReporter::maMutex; + +#if HAVE_FEATURE_BREAKPAD +void CrashReporter::AddKeyValue(const OUString& rKey, const OUString& rValue) +{ + osl::MutexGuard aGuard(maMutex); + std::string ini_path = getIniFileName(); + std::ofstream ini_file(ini_path, std::ios_base::app); + ini_file << rtl::OUStringToOString(rKey, RTL_TEXTENCODING_UTF8).getStr() << "="; + ini_file << rtl::OUStringToOString(rValue, RTL_TEXTENCODING_UTF8).getStr() << "\n"; +} +#endif + +const char* CrashReporter::getIniFileName() +{ + return "/tmp/dump.ini"; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 28296ee857f0..7e4e7af27df7 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -19,7 +19,7 @@ #include -#include "desktopdllapi.h" +#include #include "app.hxx" #include "cmdlineargs.hxx" diff --git a/desktop/source/app/sofficemain.h b/desktop/source/app/sofficemain.h index d0a9988a5c7f..c291df7af295 100644 --- a/desktop/source/app/sofficemain.h +++ b/desktop/source/app/sofficemain.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H #define INCLUDED_DESKTOP_SOURCE_APP_SOFFICEMAIN_H -#include "desktopdllapi.h" +#include #if defined __cplusplus extern "C" { diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h deleted file mode 100644 index ebc75f1214ac..000000000000 --- a/desktop/source/inc/desktopdllapi.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -#ifndef INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H -#define INCLUDED_DESKTOP_SOURCE_INC_DESKTOPDLLAPI_H - -#include -#include - -#if defined(DESKTOP_DLLIMPLEMENTATION) -# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -# define DESKTOP_DLLPUBLIC SAL_DLLPUBLIC_IMPORT -#endif - -#endif - -/* vim: set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index d3afd077f73e..93fa127fbba7 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -18,7 +18,7 @@ */ -#include "desktopdllapi.h" +#include #include "dp_misc.h" #include "unopkg_main.h" #include "unopkg_shared.h" diff --git a/desktop/source/pkgchk/unopkg/unopkg_main.h b/desktop/source/pkgchk/unopkg/unopkg_main.h index 6cac46a08480..bfd9ee69b376 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_main.h +++ b/desktop/source/pkgchk/unopkg/unopkg_main.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H #define INCLUDED_DESKTOP_SOURCE_PKGCHK_UNOPKG_UNOPKG_MAIN_H -#include "desktopdllapi.h" +#include #if defined __cplusplus extern "C" { -- cgit llabora/lov-6.4'>distro/collabora/lov-6.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/config.sub
AgeCommit message (Expand)Author