renamed: Library/*.h -> library/*.hpp

CMakeLists.txt

@@ -76,7 +76,7 @@ list(REMOVE_ITEM DatastructureGlob data_structures/Coordinate.cpp)
 file(GLOB CoordinateGlob data_structures/coordinate*.cpp)
 file(GLOB AlgorithmGlob algorithms/*.cpp)
 file(GLOB HttpGlob server/http/*.cpp)
-file(GLOB LibOSRMGlob Library/*.cpp)
+file(GLOB LibOSRMGlob library/*.cpp)
 file(GLOB DataStructureTestsGlob unit_tests/data_structures/*.cpp data_structures/hilbert_value.cpp)
 file(GLOB AlgorithmTestsGlob unit_tests/algorithms/*.cpp)
 
@@ -325,7 +325,7 @@ if(WITH_TOOLS OR BUILD_TOOLS)
   install(TARGETS osrm-springclean DESTINATION bin)
 endif()
 
-file(GLOB InstallGlob include/osrm/*.hpp Library/OSRM.h)
+file(GLOB InstallGlob include/osrm/*.hpp library/osrm.hpp)
 file(GLOB VariantGlob third_party/variant/*.hpp)
 
 # Add RPATH info to executables so that when they are run after being installed

Library/OSRM_impl.cpp

@@ -33,8 +33,8 @@ class named_mutex;
 }
 }
 
-#include "OSRM_impl.h"
-#include "OSRM.h"
+#include "osrm_impl.hpp"
+#include "osrm.hpp"
 
 #include "../plugins/distance_table.hpp"
 #include "../plugins/hello_world.hpp"

library/osrm.hpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef OSRM_H
-#define OSRM_H
+#ifndef OSRM_HPP
+#define OSRM_HPP
 
 #include <osrm/libosrm_config.hpp>
 
@@ -51,4 +51,4 @@ class OSRM
     int RunQuery(RouteParameters &route_parameters, JSON::Object &json_result);
 };
 
-#endif // OSRM_H
+#endif // OSRM_HPP

library/osrm_impl.cpp

@@ -0,0 +1,178 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+namespace boost
+{
+namespace interprocess
+{
+class named_mutex;
+}
+}
+
+#include "osrm_impl.hpp"
+#include "osrm.hpp"
+
+#include "../plugins/distance_table.hpp"
+#include "../plugins/hello_world.hpp"
+#include "../plugins/locate.hpp"
+#include "../plugins/nearest.hpp"
+#include "../plugins/timestamp.hpp"
+#include "../plugins/viaroute.hpp"
+#include "../server/data_structures/datafacade_base.hpp"
+#include "../server/data_structures/internal_datafacade.hpp"
+#include "../server/data_structures/shared_barriers.hpp"
+#include "../server/data_structures/shared_datafacade.hpp"
+#include "../Util/make_unique.hpp"
+#include "../Util/ProgramOptions.h"
+#include "../Util/simple_logger.hpp"
+
+#include <boost/assert.hpp>
+#include <boost/interprocess/sync/named_condition.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+
+#include <osrm/route_parameters.hpp>
+
+#include <algorithm>
+#include <fstream>
+#include <utility>
+#include <vector>
+
+OSRM_impl::OSRM_impl(libosrm_config &lib_config)
+{
+    if (lib_config.use_shared_memory)
+    {
+        barrier = osrm::make_unique<SharedBarriers>();
+        query_data_facade = new SharedDataFacade<QueryEdge::EdgeData>();
+    }
+    else
+    {
+        // populate base path
+        populate_base_path(lib_config.server_paths);
+        query_data_facade = new InternalDataFacade<QueryEdge::EdgeData>(lib_config.server_paths);
+    }
+
+    // The following plugins handle all requests.
+    RegisterPlugin(new DistanceTablePlugin<BaseDataFacade<QueryEdge::EdgeData>>(
+        query_data_facade, lib_config.max_locations_distance_table));
+    RegisterPlugin(new HelloWorldPlugin());
+    RegisterPlugin(new LocatePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new NearestPlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new TimestampPlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+    RegisterPlugin(new ViaRoutePlugin<BaseDataFacade<QueryEdge::EdgeData>>(query_data_facade));
+}
+
+OSRM_impl::~OSRM_impl()
+{
+    delete query_data_facade;
+    for (PluginMap::value_type &plugin_pointer : plugin_map)
+    {
+        delete plugin_pointer.second;
+    }
+}
+
+void OSRM_impl::RegisterPlugin(BasePlugin *plugin)
+{
+    SimpleLogger().Write() << "loaded plugin: " << plugin->GetDescriptor();
+    if (plugin_map.find(plugin->GetDescriptor()) != plugin_map.end())
+    {
+        delete plugin_map.find(plugin->GetDescriptor())->second;
+    }
+    plugin_map.emplace(plugin->GetDescriptor(), plugin);
+}
+
+int OSRM_impl::RunQuery(RouteParameters &route_parameters, JSON::Object &json_result)
+{
+    const auto &plugin_iterator = plugin_map.find(route_parameters.service);
+
+    if (plugin_map.end() == plugin_iterator)
+    {
+        return 400;
+    }
+
+    increase_concurrent_query_count();
+    plugin_iterator->second->HandleRequest(route_parameters, json_result);
+    decrease_concurrent_query_count();
+    return 200;
+}
+
+// decrease number of concurrent queries
+void OSRM_impl::decrease_concurrent_query_count()
+{
+    if (!barrier)
+    {
+        return;
+    }
+    // lock query
+    boost::interprocess::scoped_lock<boost::interprocess::named_mutex> query_lock(
+        barrier->query_mutex);
+
+    // decrement query count
+    --(barrier->number_of_queries);
+    BOOST_ASSERT_MSG(0 <= barrier->number_of_queries, "invalid number of queries");
+
+    // notify all processes that were waiting for this condition
+    if (0 == barrier->number_of_queries)
+    {
+        barrier->no_running_queries_condition.notify_all();
+    }
+}
+
+// increase number of concurrent queries
+void OSRM_impl::increase_concurrent_query_count()
+{
+    if (!barrier)
+    {
+        return;
+    }
+
+    // lock update pending
+    boost::interprocess::scoped_lock<boost::interprocess::named_mutex> pending_lock(
+        barrier->pending_update_mutex);
+
+    // lock query
+    boost::interprocess::scoped_lock<boost::interprocess::named_mutex> query_lock(
+        barrier->query_mutex);
+
+    // unlock update pending
+    pending_lock.unlock();
+
+    // increment query count
+    ++(barrier->number_of_queries);
+
+    (static_cast<SharedDataFacade<QueryEdge::EdgeData> *>(query_data_facade))
+        ->CheckAndReloadFacade();
+}
+
+// proxy code for compilation firewall
+OSRM::OSRM(libosrm_config &lib_config) : OSRM_pimpl_(osrm::make_unique<OSRM_impl>(lib_config)) {}
+
+OSRM::~OSRM() { OSRM_pimpl_.reset(); }
+
+int OSRM::RunQuery(RouteParameters &route_parameters, JSON::Object &json_result)
+{
+    return OSRM_pimpl_->RunQuery(route_parameters, json_result);
+}

library/osrm_impl.hpp

@@ -25,11 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef OSRM_IMPL_H
-#define OSRM_IMPL_H
+#ifndef OSRM_IMPL_HPP
+#define OSRM_IMPL_HPP
 
 class BasePlugin;
-namespace http { class Reply; }
+namespace http
+{
+class Reply;
+}
 struct RouteParameters;
 
 #include "../data_structures/query_edge.hpp"
@@ -69,4 +72,4 @@ class OSRM_impl
     void increase_concurrent_query_count();
 };
 
-#endif // OSRM_IMPL_H
+#endif // OSRM_IMPL_HPP

routed.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "Library/OSRM.h"
+#include "library/osrm.hpp"
 #include "server/server.hpp"
 #include "Util/git_sha.hpp"
 #include "Util/ProgramOptions.h"

server/request_handler.cpp

@@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "http/reply.hpp"
 #include "http/request.hpp"
 
-#include "../Library/OSRM.h"
+#include "../library/osrm.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/string_util.hpp"

tools/simpleclient.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../Library/OSRM.h"
+#include "../library/osrm.hpp"
 #include "../Util/git_sha.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/ProgramOptions.h"