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

Added an engine.stop message that modules can use to keep engine running while cleaning up. 

The engine emits engine.stop every second (but at most 5 times) and shuts down only if the message returned false.


git-svn-id: http://yate.null.ro/svn/yate/trunk@3381 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2010-06-16 09:05:08 +00:00
parent 65c34956b5
commit a6a00f9660
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engine/Engine.cpp
View File

@ -118,6 +118,10 @@ using namespace TelEngine;
#define CFG_SUFFIX ".conf"
#endif
// Maximum number of engine.stop messages we allow
#ifndef MAX_STOP
#define MAX_STOP 5
#endif
// Supervisor control constants
@ -1066,7 +1070,8 @@ int Engine::run()
#endif
Output("Yate%s engine is initialized and starting up%s%s",
clientMode() ? " client" : "",s_node.null() ? "" : " on " ,s_node.safe());
while (s_haltcode == -1) {
int stops = MAX_STOP;
while (s_haltcode == -1 || ((--stops >= 0) && dispatch("engine.stop"))) {
if (s_cmds) {
Output("Executing initial commands");
for (ObjList* c = s_cmds->skipNull(); c; c=c->skipNext()) {
@ -1136,13 +1141,15 @@ int Engine::run()
m->addParam("time",String((int)m->msgTime().sec()));
if (nodeName())
m->addParam("nodename",nodeName());
// Try to fine tune the ticker
t = (long)(m->msgTime().usec() % 1000000);
if (t > 500000)
corr -= (1000000-t)/10;
else
corr += t/10;
XDebug(DebugAll,"Adjustment at %ld, corr %ld",t,corr);
if (s_haltcode == -1) {
// Try to fine tune the ticker unless exiting
t = (long)(m->msgTime().usec() % 1000000);
if (t > 500000)
corr -= (1000000-t)/10;
else
corr += t/10;
XDebug(DebugAll,"Adjustment at %ld, corr %ld",t,corr);
}
enqueue(m);
Thread::yield();
}