make data store less verbose in release mode
This commit is contained in:
parent
9bf6bf2c78
commit
4144698540
@ -83,7 +83,6 @@ void OSRM::RegisterPlugin(BasePlugin * plugin) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void OSRM::RunQuery(RouteParameters & route_parameters, http::Reply & reply) {
|
void OSRM::RunQuery(RouteParameters & route_parameters, http::Reply & reply) {
|
||||||
SimpleLogger().Write() << "running query";
|
|
||||||
const PluginMap::const_iterator & iter = plugin_map.find(
|
const PluginMap::const_iterator & iter = plugin_map.find(
|
||||||
route_parameters.service
|
route_parameters.service
|
||||||
);
|
);
|
||||||
@ -91,24 +90,18 @@ void OSRM::RunQuery(RouteParameters & route_parameters, http::Reply & reply) {
|
|||||||
if(plugin_map.end() != iter) {
|
if(plugin_map.end() != iter) {
|
||||||
reply.status = http::Reply::ok;
|
reply.status = http::Reply::ok;
|
||||||
if( use_shared_memory ) {
|
if( use_shared_memory ) {
|
||||||
SimpleLogger().Write() << "shared memory handling";
|
|
||||||
// lock update pending
|
// lock update pending
|
||||||
boost::interprocess::scoped_lock<
|
boost::interprocess::scoped_lock<
|
||||||
boost::interprocess::named_mutex
|
boost::interprocess::named_mutex
|
||||||
> pending_lock(barrier.pending_update_mutex);
|
> pending_lock(barrier.pending_update_mutex);
|
||||||
|
|
||||||
SimpleLogger().Write() << "got pending lock";
|
|
||||||
|
|
||||||
// lock query
|
// lock query
|
||||||
boost::interprocess::scoped_lock<
|
boost::interprocess::scoped_lock<
|
||||||
boost::interprocess::named_mutex
|
boost::interprocess::named_mutex
|
||||||
> query_lock(barrier.query_mutex);
|
> query_lock(barrier.query_mutex);
|
||||||
|
|
||||||
SimpleLogger().Write() << "got query lock";
|
|
||||||
|
|
||||||
// unlock update pending
|
// unlock update pending
|
||||||
pending_lock.unlock();
|
pending_lock.unlock();
|
||||||
SimpleLogger().Write() << "released pending lock";
|
|
||||||
|
|
||||||
// increment query count
|
// increment query count
|
||||||
++(barrier.number_of_queries);
|
++(barrier.number_of_queries);
|
||||||
@ -117,15 +110,12 @@ void OSRM::RunQuery(RouteParameters & route_parameters, http::Reply & reply) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
iter->second->HandleRequest(route_parameters, reply );
|
iter->second->HandleRequest(route_parameters, reply );
|
||||||
SimpleLogger().Write() << "finished request";
|
|
||||||
if( use_shared_memory ) {
|
if( use_shared_memory ) {
|
||||||
// lock query
|
// lock query
|
||||||
boost::interprocess::scoped_lock<
|
boost::interprocess::scoped_lock<
|
||||||
boost::interprocess::named_mutex
|
boost::interprocess::named_mutex
|
||||||
> query_lock(barrier.query_mutex);
|
> query_lock(barrier.query_mutex);
|
||||||
|
|
||||||
SimpleLogger().Write() << "got query lock";
|
|
||||||
|
|
||||||
// decrement query count
|
// decrement query count
|
||||||
--(barrier.number_of_queries);
|
--(barrier.number_of_queries);
|
||||||
BOOST_ASSERT_MSG(
|
BOOST_ASSERT_MSG(
|
||||||
@ -133,10 +123,9 @@ void OSRM::RunQuery(RouteParameters & route_parameters, http::Reply & reply) {
|
|||||||
"invalid number of queries"
|
"invalid number of queries"
|
||||||
);
|
);
|
||||||
|
|
||||||
if (0 == barrier.number_of_queries) {
|
|
||||||
// notify all processes that were waiting for this condition
|
// notify all processes that were waiting for this condition
|
||||||
|
if (0 == barrier.number_of_queries) {
|
||||||
barrier.no_running_queries_condition.notify_all();
|
barrier.no_running_queries_condition.notify_all();
|
||||||
SimpleLogger().Write() << "sent notification";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user