Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
f4680be8
Kaydet (Commit)
f4680be8
authored
Kas 19, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
HAVE_FEATURE_CRASHDUMP instead of manual SAL_ENABLE_CRASH_REPORT
Change-Id: Ifaf971d77f11cef207706989bba11dbe2028ca79
üst
b736204f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
12 deletions
+19
-12
config_features.h.in
config_host/config_features.h.in
+3
-0
configure.ac
configure.ac
+1
-0
Library_sal.mk
sal/Library_sal.mk
+2
-2
signal.c
sal/osl/unx/signal.c
+13
-10
No files found.
config_host/config_features.h.in
Dosyayı görüntüle @
f4680be8
...
...
@@ -146,4 +146,7 @@
*/
#define HAVE_FEATURE_COLLADA 0
/* see --enable-crashdump: */
#define HAVE_FEATURE_CRASHDUMP 0
#endif
configure.ac
Dosyayı görüntüle @
f4680be8
...
...
@@ -4537,6 +4537,7 @@ if test "$enable_crashdump" = "yes"; then
ENABLE_CRASHDUMP="TRUE"
BUILD_TYPE="$BUILD_TYPE CRASHREP"
AC_MSG_RESULT([yes])
AC_DEFINE(HAVE_FEATURE_CRASHDUMP)
else
ENABLE_CRASHDUMP=""
AC_MSG_RESULT([no])
...
...
sal/Library_sal.mk
Dosyayı görüntüle @
f4680be8
...
...
@@ -176,8 +176,8 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/time \
$(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
))
$(eval $(call gb_Library_add_cobject
,sal,sal/osl/unx/sign
al, \
$(if $(ENABLE_CRASHDUMP),-DSAL_ENABLE_CRASH_REPORT)
\
$(eval $(call gb_Library_add_cobject
s,s
al, \
sal/osl/unx/signal
\
))
# Note that the uunxapi.mm file just includes the uunxapi.cxx one
...
...
sal/osl/unx/signal.c
Dosyayı görüntüle @
f4680be8
...
...
@@ -17,6 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <sal/config.h>
#include <config_features.h>
/* system headers */
#include "system.h"
...
...
@@ -25,7 +29,7 @@
#if defined( INTEL )
#include "backtrace.h"
#define INCLUDE_BACKTRACE
#if
def SAL_ENABLE_CRASH_REPORT
#if
HAVE_FEATURE_CRASHDUMP
#define STACKTYPE "MacOsX_X86"
#endif
#endif
/* INTEL */
...
...
@@ -36,7 +40,7 @@
#include <execinfo.h>
#include <link.h>
#define INCLUDE_BACKTRACE
#if
defined SAL_ENABLE_CRASH_REPORT
#if
HAVE_FEATURE_CRASHDUMP
#define STACKTYPE "Linux"
#endif
#endif
...
...
@@ -46,7 +50,7 @@
#include "backtrace.h"
#define INCLUDE_BACKTRACE
#if
defined SAL_ENABLE_CRASH_REPORT
#if
HAVE_FEATURE_CRASHDUMP
#if defined( SPARC )
#define STACKTYPE "Solaris_Sparc"
#elif defined( INTEL )
...
...
@@ -77,7 +81,7 @@
#define ACT_EXIT 2
#define ACT_SYSTEM 3
#define ACT_HIDE 4
#if
def SAL_ENABLE_CRASH_REPORT
#if
HAVE_FEATURE_CRASHDUMP
# define ACT_ABORT 5
#else
# define ACT_ABORT ACT_SYSTEM
...
...
@@ -310,7 +314,7 @@ static sal_Bool DeInitSignal(void)
return
sal_False
;
}
#if
defined (SAL_ENABLE_CRASH_REPORT)
&& defined(INCLUDE_BACKTRACE)
#if
HAVE_FEATURE_CRASHDUMP
&& defined(INCLUDE_BACKTRACE)
static
sal_uInt32
calc_md5_checksum
(
const
char
*
filename
,
sal_uInt8
*
pChecksum
,
sal_uInt32
nChecksumLen
)
{
...
...
@@ -389,8 +393,7 @@ static int fputs_xml( const char *string, FILE *stream )
/* Create intermediate files and run crash reporter */
#if defined SAL_ENABLE_CRASH_REPORT && defined INCLUDE_BACKTRACE && \
defined LINUX
#if HAVE_FEATURE_CRASHDUMP && defined INCLUDE_BACKTRACE && defined LINUX
typedef
struct
{
...
...
@@ -473,7 +476,7 @@ dynamic_section_offset(const char *name)
static
int
ReportCrash
(
int
Signal
)
{
#if
def SAL_ENABLE_CRASH_REPORT
#if
HAVE_FEATURE_CRASHDUMP
#define REPORTENV_PARAM "-crashreportenv:"
...
...
@@ -794,12 +797,12 @@ static int ReportCrash( int Signal )
}
return
1
;
#else
/*
defined SAL_ENABLE_CRASH_REPORT
*/
#else
/*
HAVE_FEATURE_CRASHDUMP
*/
/* the utility crash_report is not build, so do the same as when
the option -nocrashreport is used */
(
void
)
Signal
;
// avoid warnings
return
-
1
;
#endif
/*
defined SAL_ENABLE_CRASH_REPORT
*/
#endif
/*
HAVE_FEATURE_CRASHDUMP
*/
}
static
void
PrintStack
(
int
sig
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment