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

Bug fix: do proper sorting of applications based on their load. 

Protect access to an application's current transaction count.



git-svn-id: http://yate.null.ro/svn/yate/trunk@5414 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
oana 2013-02-25 15:38:25 +00:00
parent 51c0901bb2
commit e85a43ed1d
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
modules/sig/camel_map.cpp
View File

@ -361,7 +361,7 @@ public:
inline State state()
{ return m_state; }
inline unsigned int trCount()
{ return m_ids.count() + m_pending.count(); }
{ Lock l(this); return m_ids.count() + m_pending.count(); }
inline TcapXUser::UserType type()
{ return m_type; }
inline bool addEncoding()
@ -8515,6 +8515,7 @@ void TcapXApplication::status(NamedList& status)
const AppCtxt* TcapXApplication::findCtxt(const String& appID, const String& remoteID)
{
DDebug(DebugAll,"TcapXApplication::findCtxt('%s','%s') [%p]",appID.c_str(),remoteID.c_str(),this);
Lock l(this);
if (!appID.null()) {
Transaction* t = m_ids.findByAppID(appID);
if (t)
@ -8728,30 +8729,31 @@ void TcapXUser::reorderApps(TcapXApplication* app)
if (!appObj)
return;
ObjList* next = appObj->next();
TcapXApplication* ins = 0;
// it's already at the bottom of the list
if (!next)
return;
unsigned int count = app->trCount() + 1;
while (next) {
TcapXApplication* nextApp = static_cast<TcapXApplication*>(next->get());
if (nextApp) {
if (app->trCount() + 1 > nextApp->trCount()) {
if (!ins) {
ins = app;
m_apps.remove(app,false);
}
next = next->next();
}
else {
if (ins) {
next->insert(app);
ins = 0;
}
if (count < nextApp->trCount())
break;
}
next = next->next();
}
else
break;
}
if (ins)
if (next) {
if (next != appObj->next()) {
m_apps.remove(app,false);
next->insert(app);
return;
}
}
else {
m_apps.remove(app,false);
m_apps.append(app);
}
}
void TcapXUser::statusString(String& str)