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

Fixing regression and rewrote portions of the memory handling of registered server plugins

Browse Source
This commit is contained in:
Dennis Luxen 2011-03-14 13:35:16 +00:00
parent 50373d0a94
commit da3789f2ce
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataStructures/HashTable.h
View File

@ -53,8 +53,9 @@ public:
} }
void EraseAll() { void EraseAll() {
if(table.size() > 0) if(table.size() > 0)
table.clear(); table.clear();
} }
private: private:
MyHashTable table; MyHashTable table;
}; };

20
Server/RequestHandler.h
View File

@ -34,10 +34,15 @@ namespace http {
class RequestHandler : private boost::noncopyable { class RequestHandler : private boost::noncopyable {
public: public:
explicit RequestHandler() { } explicit RequestHandler() : _pluginCount(0) { }
~RequestHandler() { ~RequestHandler() {
pluginMap.EraseAll();
for(unsigned i = 0; i < _pluginVector.size(); i++) {
BasePlugin * tempPointer = _pluginVector[i];
delete tempPointer;
}
} }
void handle_request(const Request& req, Reply& rep){ void handle_request(const Request& req, Reply& rep){
@ -59,7 +64,7 @@ public:
// std::cout << "[debug] found handler for '" << command << "' at version: " << pluginMap.Find(command)->GetVersionString() << std::endl; // std::cout << "[debug] found handler for '" << command << "' at version: " << pluginMap.Find(command)->GetVersionString() << std::endl;
// std::cout << "[debug] remaining parameters: " << parameters.size() << std::endl; // std::cout << "[debug] remaining parameters: " << parameters.size() << std::endl;
rep.status = Reply::ok; rep.status = Reply::ok;
pluginMap.Find(command)->HandleRequest(parameters, rep ); _pluginVector[pluginMap.Find(command)]->HandleRequest(parameters, rep );
} else { } else {
rep = Reply::stockReply(Reply::badRequest); rep = Reply::stockReply(Reply::badRequest);
} }
@ -73,12 +78,15 @@ public:
void RegisterPlugin(BasePlugin * plugin) { void RegisterPlugin(BasePlugin * plugin) {
std::cout << "[handler] registering plugin " << plugin->GetDescriptor() << std::endl; std::cout << "[handler] registering plugin " << plugin->GetDescriptor() << std::endl;
pluginMap.Add(plugin->GetDescriptor(), plugin); pluginMap.Add(plugin->GetDescriptor(), _pluginCount);
_pluginVector.push_back(plugin);
_pluginCount++;
} }
private: private:
boost::mutex pluginMutex; HashTable<std::string, unsigned> pluginMap;
HashTable<std::string, BasePlugin *> pluginMap; std::vector<BasePlugin *> _pluginVector;
unsigned _pluginCount;
}; };
} // namespace http } // namespace http

4
routed.cpp
View File

@ -89,10 +89,6 @@ int main (int argc, char *argv[])
std::cout << std::endl << "[server] shutting down" << std::endl; std::cout << std::endl << "[server] shutting down" << std::endl;
s->Stop(); s->Stop();
t.join(); t.join();
delete helloWorld;
delete locate;
delete route;
delete h;
delete s; delete s;
} catch (std::exception& e) { } catch (std::exception& e) {
std::cerr << "[fatal error] exception: " << e.what() << std::endl; std::cerr << "[fatal error] exception: " << e.what() << std::endl;