Commit 419dd6a0 authored by Pavel Vainerman's avatar Pavel Vainerman

(IONC): добавил в getInfo() userparam=2: вывод объектов у которых lostEvent>0

parent e0ec8534
...@@ -39,7 +39,7 @@ class TDelay: ...@@ -39,7 +39,7 @@ class TDelay:
} }
void setDelay( timeout_t timeMS ); void setDelay( timeout_t timeMS );
inline timeout_t getDelay() inline timeout_t getDelay() const
{ {
return delay; return delay;
} }
......
...@@ -81,7 +81,7 @@ SimpleInfo* IONotifyController::getInfo( ::CORBA::Long userparam ) ...@@ -81,7 +81,7 @@ SimpleInfo* IONotifyController::getInfo( ::CORBA::Long userparam )
inf << i->info << endl; inf << i->info << endl;
if( userparam == 1 ) if( userparam == 1 || userparam == 2 )
{ {
inf << "------------------------------- consumers list ------------------------------" << endl; inf << "------------------------------- consumers list ------------------------------" << endl;
{ {
...@@ -99,14 +99,48 @@ SimpleInfo* IONotifyController::getInfo( ::CORBA::Long userparam ) ...@@ -99,14 +99,48 @@ SimpleInfo* IONotifyController::getInfo( ::CORBA::Long userparam )
if( i.clst.empty() ) if( i.clst.empty() )
continue; continue;
inf << "(" << setw(6) << a.first << ")[" << oind->getMapName(a.first) << "]" << endl; // если надо выводить только тех, у кого есть "потери"(lostEvent>0)
// то надо сперва смотреть список, а потом выводить
if( userparam == 2 )
{
bool ok = false;
for( const auto& c : i.clst )
{
if( c.lostEvents > 0 )
{
ok = true;
break;
}
}
if( !ok )
continue;
for( const auto& c : i.clst ) // выводим тех у кого lostEvent>0
inf << "(" << setw(6) << a.first << ")[" << oind->getMapName(a.first) << "]" << endl;
for( const auto& c : i.clst )
{
if( c.lostEvents > 0 )
{
inf << " " << "(" << setw(6) << c.id << ")"
<< setw(35) << ORepHelpers::getShortName(oind->getMapName(c.id))
<< " [lostEvents=" << c.lostEvents << " attempt=" << c.attempt << "]"
<< endl;
}
}
}
else // просто выводим всех
{ {
inf << " " << "(" << setw(6) << c.id << ")" inf << "(" << setw(6) << a.first << ")[" << oind->getMapName(a.first) << "]" << endl;
<< setw(35) << ORepHelpers::getShortName(oind->getMapName(c.id))
<< " [lostEvents=" << c.lostEvents << " attempt=" << c.attempt << "]" for( const auto& c : i.clst )
<< endl; {
inf << " " << "(" << setw(6) << c.id << ")"
<< setw(35) << ORepHelpers::getShortName(oind->getMapName(c.id))
<< " [lostEvents=" << c.lostEvents << " attempt=" << c.attempt << "]"
<< endl;
}
} }
} }
} }
...@@ -115,7 +149,8 @@ SimpleInfo* IONotifyController::getInfo( ::CORBA::Long userparam ) ...@@ -115,7 +149,8 @@ SimpleInfo* IONotifyController::getInfo( ::CORBA::Long userparam )
inf << "IONotifyController::UserParam help: " << endl inf << "IONotifyController::UserParam help: " << endl
<< " 0. Common info" << endl << " 0. Common info" << endl
<< " 1. Consumers list " << endl; << " 1. Consumers list " << endl
<< " 2. Consumers list with lostEvent > 0" << endl;
i->info = inf.str().c_str(); i->info = inf.str().c_str();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment