Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

RequestHandler object is now returned as reference rather than as pointer. Memory handling should be more clear by that change.

Browse Source
This commit is contained in:
Dennis Luxen 2011-03-14 13:39:16 +00:00
parent da3789f2ce
commit 2b639a5a14
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Server/Server.h
View File

@ -61,10 +61,8 @@ public:
ioService.stop(); ioService.stop();
} }
RequestHandler & GetRequestHandlerPtr() {
return requestHandler;
RequestHandler * GetRequestHandlerPtr() {
return &requestHandler;
} }
private: private:

8
routed.cpp
View File

@ -56,16 +56,16 @@ int main (int argc, char *argv[])
ServerConfiguration serverConfig("server.ini"); ServerConfiguration serverConfig("server.ini");
Server * s = ServerFactory::CreateServer(serverConfig); Server * s = ServerFactory::CreateServer(serverConfig);
RequestHandler * h = s->GetRequestHandlerPtr(); RequestHandler & h = s->GetRequestHandlerPtr();
BasePlugin * helloWorld = new HelloWorldPlugin(); BasePlugin * helloWorld = new HelloWorldPlugin();
h->RegisterPlugin(helloWorld); h.RegisterPlugin(helloWorld);
BasePlugin * locate = new LocatePlugin( BasePlugin * locate = new LocatePlugin(
serverConfig.GetParameter("ramIndex"), serverConfig.GetParameter("ramIndex"),
serverConfig.GetParameter("fileIndex"), serverConfig.GetParameter("fileIndex"),
serverConfig.GetParameter("nodesData")); serverConfig.GetParameter("nodesData"));
h->RegisterPlugin(locate); h.RegisterPlugin(locate);
BasePlugin * route = new RoutePlugin( BasePlugin * route = new RoutePlugin(
serverConfig.GetParameter("hsgrData"), serverConfig.GetParameter("hsgrData"),
@ -73,7 +73,7 @@ int main (int argc, char *argv[])
serverConfig.GetParameter("fileIndex"), serverConfig.GetParameter("fileIndex"),
serverConfig.GetParameter("nodesData"), serverConfig.GetParameter("nodesData"),
serverConfig.GetParameter("namesData")); serverConfig.GetParameter("namesData"));
h->RegisterPlugin(route); h.RegisterPlugin(route);
boost::thread t(boost::bind(&Server::Run, s)); boost::thread t(boost::bind(&Server::Run, s));