Commit f628ffb0 authored by Pavel Vainerman's avatar Pavel Vainerman

Сделал sm-ready-timeout 60 сек (вместо 15-ти).

parent 0e911ee6
......@@ -240,7 +240,7 @@ IOControl::IOControl(UniSetTypes::ObjectId id, UniSetTypes::ObjectId icID,
int sm_tout = conf->getArgInt("--" + prefix + "-sm-ready-timeout", it.getProp("ready_timeout"));
if( sm_tout == 0 )
smReadyTimeout = 30000;
smReadyTimeout = 60000;
else if( sm_tout < 0 )
smReadyTimeout = UniSetTimer::WaitUpTime;
else
......
......@@ -285,7 +285,7 @@ void MBExchange::waitSMReady()
{
// waiting for SM is ready...
int tout = uniset_conf()->getArgInt("--" + prefix + "-sm-ready-timeout", "15000");
timeout_t ready_timeout = 15000;
timeout_t ready_timeout = 60000;
if( tout > 0 )
ready_timeout = tout;
......
......@@ -511,7 +511,7 @@ void MBSlave::waitSMReady()
{
// waiting for SM is ready...
int tout = uniset_conf()->getArgInt("--" + prefix + "-sm-ready-timeout", "15000");
timeout_t ready_timeout = 15000;
timeout_t ready_timeout = 60000;
if( tout > 0 )
ready_timeout = tout;
......
......@@ -103,7 +103,7 @@ void SMDBServer::waitSMReady()
int ready_timeout = conf->getArgInt("--" + prefix + "-sm-ready-timeout", "15000");
if( ready_timeout == 0 )
ready_timeout = 15000;
ready_timeout = 60000;
else if( ready_timeout < 0 )
ready_timeout = UniSetTimer::WaitUpTime;
......
......@@ -461,7 +461,7 @@ void UNetExchange::waitSMReady()
// waiting for SM is ready...
int tout = uniset_conf()->getArgInt("--unet-sm-ready-timeout", "15000");
timeout_t ready_timeout = 15000;
timeout_t ready_timeout = 60000;
if( tout > 0 )
ready_timeout = tout;
......
......@@ -76,7 +76,7 @@ UniExchange::UniExchange(UniSetTypes::ObjectId id, UniSetTypes::ObjectId shmID,
int sm_tout = conf->getArgInt("--io-sm-ready-timeout", it.getProp("ready_timeout"));
if( sm_tout == 0 )
smReadyTimeout = 15000;
smReadyTimeout = 60000;
else if( sm_tout < 0 )
smReadyTimeout = UniSetTimer::WaitUpTime;
else
......
......@@ -110,7 +110,7 @@ int main(int argc, char* argv[] )
std::chrono::time_point<std::chrono::system_clock> start, end;
start = std::chrono::system_clock::now();
run_test(8, 1000000, shm);
run_test( std::thread::hardware_concurrency(), 1000000, shm);
end = std::chrono::system_clock::now();
int elapsed_seconds = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
......
......@@ -448,7 +448,7 @@ void IOController::logging( UniSetTypes::SensorMessage& sm )
return;
sm.consumer = dbID;
TransportMessage tm(sm.transport_msg());
TransportMessage tm(std::move(sm.transport_msg()));
ui->send( sm.consumer, std::move(tm) );
isPingDBServer = true;
}
......
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