retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added option (default enabled) to display some engine stats when aborting. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6199 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2017-04-02 11:03:48 +00:00
parent 9fb6af146e
commit 4e0fa17e7f
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf.d/yate.conf.sample
View File

@ -78,6 +78,9 @@
; Set to boolean false to disable tracking only if you are sure what you want
;trackparam=handlers
; abortinfo: boolean: Display some engine statistics during a process abort
;abortinfo=enable
; msgsniff: bool: Activate message sniffer module (if loaded) at engine init time
;msgsniff=disable

34
engine/Engine.cpp
View File

@ -24,6 +24,7 @@
#include <process.h>
#include <shlobj.h>
typedef void (*sig_func_t)(int);
#define RTLD_NOW 0
#define dlopen(name,flags) LoadLibrary(name)
#define dlclose !FreeLibrary
@ -49,6 +50,7 @@ __declspec(dllimport) BOOL WINAPI SHGetSpecialFolderPathA(HWND,LPSTR,INT,BOOL);
#include <sys/wait.h>
#include <sys/resource.h>
typedef void* HMODULE;
#define sig_func_t sighandler_t
#define PATH_SEP "/"
#ifndef CFG_DIR
#ifdef HAVE_MACOSX_SUPPORT
@ -176,6 +178,7 @@ static bool s_interactive = true;
static bool s_localsymbol = false;
static bool s_logtruncate = false;
static const char* s_logfile = 0;
static sig_func_t s_abrt_handler = SIG_DFL;
static void sighandler(int signal)
{
@ -212,6 +215,35 @@ static void sighandler(int signal)
}
}
static void abrthandler(int sig)
{
::signal(SIGABRT,s_abrt_handler);
Engine* eng = Engine::self();
if (eng) {
// TODO: retrieve all the information without getting any mutex locks
uint64_t enq,deq,disp,qmax;
eng->getStats(enq,deq,disp,qmax);
::fprintf(stderr,
"*** ABORT INFO BEGIN ***\n"
" Messages: " FMT64U "\n"
" MaxQueue: " FMT64U "\n"
" Msg Rate: %u\n"
" Max Rate: %u\n"
" Threads: %d\n"
" Workers: %d\n"
" Mutexes: %d\n"
" Locks: %d\n"
" Congestion: %u\n"
" Call Accept: %s\n"
"*** ABORT INFO END ***\n",
(enq - deq),qmax,eng->messageRate(),eng->messageMaxRate(),
Thread::count(),EnginePrivate::count,Mutex::count(),Mutex::locks(),
Engine::getCongestion(),lookup(Engine::accept(),Engine::getCallAcceptStates())
);
}
::raise(SIGABRT);
}
String Engine::s_node;
String Engine::s_shrpath(SHR_PATH);
String Engine::s_cfgsuffix(CFG_SUFFIX);
@ -1528,6 +1560,8 @@ int Engine::engineInit()
Debug(DebugWarn,"No supervisor - disabling automatic restarts");
s_restarts = 0;
}
if (s_cfg.getBoolValue("general","abortinfo",true))
s_abrt_handler = ::signal(SIGABRT,abrthandler);
initPlugins();
checkPoint();
::signal(SIGINT,sighandler);