a48f02e0da
Phew, a lot of classes were affected by this. The rationale for the
changes are as follows:
- When a type X declares any constructor, the default constructor is
not declared, so there is no need for X() = delete there. In fact,
there is brutal difference between those two: deleted members
participate in overload resolution, but not-declared members do not!
- When a type X wants to be non-copyable (e.g. to be only movable, like
threads, unique_ptrs, and so on), you can either do it by inheriting
from boost::noncopyable (the old way), or better declare both (!) the
copy constructor _and_ the copy assignment operator as deleted:
X(X const&) = delete;
X& operator=(X const&) = delete;
We had tons of types with deleted copy constructors that were lacking
a corresponding deleted copy assignment operator, making them still
copyable and you wouldn't even notice (read: scary)!
References:
- http://accu.org/content/conf2014/Howard_Hinnant_Accu_2014.pdf
- http://www.boost.org/doc/libs/master/libs/core/doc/html/core/noncopyable.html
Note: I know, I'm quoting Hinnant's extraordinary slides a lot, but
getting the sematic right here is so incredibly important.
72 lines
1.4 KiB
C++
72 lines
1.4 KiB
C++
#ifndef ENGINE_HPP
|
|
#define ENGINE_HPP
|
|
|
|
#include "contractor/query_edge.hpp"
|
|
|
|
#include "osrm/json_container.hpp"
|
|
#include "osrm/osrm.hpp"
|
|
|
|
#include <memory>
|
|
#include <unordered_map>
|
|
#include <string>
|
|
|
|
namespace osrm
|
|
{
|
|
|
|
namespace storage
|
|
{
|
|
struct SharedBarriers;
|
|
}
|
|
|
|
namespace util
|
|
{
|
|
namespace json
|
|
{
|
|
struct Object;
|
|
}
|
|
}
|
|
|
|
namespace engine
|
|
{
|
|
struct EngineConfig;
|
|
struct RouteParameters;
|
|
namespace plugins
|
|
{
|
|
class BasePlugin;
|
|
}
|
|
namespace datafacade
|
|
{
|
|
template <class EdgeDataT> class BaseDataFacade;
|
|
}
|
|
|
|
class Engine final
|
|
{
|
|
private:
|
|
using PluginMap = std::unordered_map<std::string, std::unique_ptr<plugins::BasePlugin>>;
|
|
|
|
public:
|
|
Engine(EngineConfig &config_);
|
|
|
|
Engine(const Engine &) = delete;
|
|
Engine &operator=(const Engine &) = delete;
|
|
|
|
int RunQuery(const RouteParameters &route_parameters, util::json::Object &json_result);
|
|
|
|
private:
|
|
void RegisterPlugin(plugins::BasePlugin *plugin);
|
|
PluginMap plugin_map;
|
|
// will only be initialized if shared memory is used
|
|
std::unique_ptr<storage::SharedBarriers> barrier;
|
|
// base class pointer to the objects
|
|
datafacade::BaseDataFacade<contractor::QueryEdge::EdgeData> *query_data_facade;
|
|
|
|
// decrease number of concurrent queries
|
|
void decrease_concurrent_query_count();
|
|
// increase number of concurrent queries
|
|
void increase_concurrent_query_count();
|
|
};
|
|
}
|
|
}
|
|
|
|
#endif // OSRM_IMPL_HPP
|