mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS gslpatches07 (1.17.66); FILE MERGED

Browse Source 
2006/02/14 15:23:40 fs 1.17.66.1: #i52747# +osl_setDetailedDebugMessageFunc
This commit is contained in:
Kurt Zenker
2006-02-28 09:35:57 +00:00
parent d46018564f
commit 226ced6948
1 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sal/osl/unx/diagnose.c
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: diagnose.c,v $ * $RCSfile: diagnose.c,v $
* *
* $Revision: 1.17 $ * $Revision: 1.18 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 14:53:36 $ * last change: $Author: kz $ $Date: 2006-02-28 10:35:57 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -75,6 +75,9 @@ static pthread_mutex_t g_mutex = PTHREAD_MUTEX_INITIALIZER;
typedef pfunc_osl_printDebugMessage oslDebugMessageFunc; typedef pfunc_osl_printDebugMessage oslDebugMessageFunc;
static oslDebugMessageFunc volatile g_pDebugMessageFunc = 0; static oslDebugMessageFunc volatile g_pDebugMessageFunc = 0;
typedef pfunc_osl_printDetailedDebugMessage oslDetailedDebugMessageFunc;
static oslDetailedDebugMessageFunc volatile g_pDetailedDebugMessageFunc = 0;
static void osl_diagnose_backtrace_Impl ( static void osl_diagnose_backtrace_Impl (
oslDebugMessageFunc f); oslDebugMessageFunc f);
@@ -124,8 +127,7 @@ static void osl_diagnose_frame_Impl (
sname ? sname : "???", sname ? sname : "???",
offset); offset);
if ( !getenv("DISABLE_SAL_DBGBOX") || 0 != f ) OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
} }
/************************************************************************/ /************************************************************************/
@@ -207,6 +209,17 @@ sal_Bool SAL_CALL osl_assertFailedLine (
sal_Int32 nLine, sal_Int32 nLine,
const sal_Char* pszMessage) const sal_Char* pszMessage)
{ {
/* If there's a callback for detailed messages, use it */
if ( g_pDetailedDebugMessageFunc != NULL )
{
g_pDetailedDebugMessageFunc( pszFileName, nLine, pszMessage );
return sal_False;
}
/* if SAL assertions are disabled in general, stop here */
if ( getenv("DISABLE_SAL_DBGBOX") )
return sal_False;
oslDebugMessageFunc f = g_pDebugMessageFunc; oslDebugMessageFunc f = g_pDebugMessageFunc;
char szMessage[1024]; char szMessage[1024];
@@ -228,8 +241,7 @@ sal_Bool SAL_CALL osl_assertFailedLine (
pthread_mutex_lock(&g_mutex); pthread_mutex_lock(&g_mutex);
/* output message buffer */ /* output message buffer */
if ( !getenv("DISABLE_SAL_DBGBOX") || 0 != f ) OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
OSL_DIAGNOSE_OUTPUTMESSAGE(f, szMessage);
/* output backtrace */ /* output backtrace */
osl_diagnose_backtrace_Impl(f); osl_diagnose_backtrace_Impl(f);
@@ -269,6 +281,17 @@ oslDebugMessageFunc SAL_CALL osl_setDebugMessageFunc (
return pOldFunc; return pOldFunc;
} }
/************************************************************************/
/* osl_setDetailedDebugMessageFunc */
/************************************************************************/
pfunc_osl_printDetailedDebugMessage SAL_CALL osl_setDetailedDebugMessageFunc (
pfunc_osl_printDetailedDebugMessage pNewFunc)
{
oslDetailedDebugMessageFunc pOldFunc = g_pDebugMessageFunc;
g_pDetailedDebugMessageFunc = pNewFunc;
return pOldFunc;
}
/************************************************************************/ /************************************************************************/
/* osl_trace */ /* osl_trace */
/************************************************************************/ /************************************************************************/