diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 11:10:51 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-04-17 11:10:51 +0200 |
| commit | 3d914eb90cd7aed1342a01c5993f8c2de4cd1283 (patch) | |
| tree | 46046d3136b5ca4fd864813b36b62d330a9c9559 /runtime/debug.c | |
| parent | 39b35a32b4a45ccb6506e15b02780c30ca8c3973 (diff) | |
| parent | 9d59080b4a43ca6d19bece357cb1132374a2116a (diff) | |
| download | rsyslog-3d914eb90cd7aed1342a01c5993f8c2de4cd1283.tar.gz rsyslog-3d914eb90cd7aed1342a01c5993f8c2de4cd1283.tar.bz2 rsyslog-3d914eb90cd7aed1342a01c5993f8c2de4cd1283.zip | |
Merge branch 'master' into master-imjournal
Diffstat (limited to 'runtime/debug.c')
| -rw-r--r-- | runtime/debug.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/runtime/debug.c b/runtime/debug.c index 1f22d34e..876f61d0 100644 --- a/runtime/debug.c +++ b/runtime/debug.c @@ -303,7 +303,7 @@ static inline void dbgFuncDBRemoveMutexLock(dbgFuncDB_t *pFuncDB, pthread_mutex_ void dbgOutputTID(char* name) { -# ifdef HAVE_SYSCALL +# if defined(HAVE_SYSCALL) && defined(HAVE_SYS_gettid) if(bOutputTidToStderr) fprintf(stderr, "thread tid %u, name '%s'\n", (unsigned)syscall(SYS_gettid), name); @@ -1315,6 +1315,15 @@ dbgmalloc(size_t size) } +/* report fd used for debug log. This is needed in case of + * auto-backgrounding, where the debug log shall not be closed. + */ +int +dbgGetDbglogFd(void) +{ + return altdbg; +} + /* read in the runtime options * rgerhards, 2008-02-28 */ |