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

adjust facade to pass compilation

Browse Source
This commit is contained in:
Dennis Luxen 2013-09-23 19:00:08 +02:00
parent be29c7fca0
commit 2dd2d3dd7b
6 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataStructures/SearchEngine.h
View File

@ -64,13 +64,13 @@ public:
}; };
SearchEngineHeapPtr SearchEngineData::forwardHeap; // SearchEngineHeapPtr SearchEngineData::forwardHeap;
SearchEngineHeapPtr SearchEngineData::backwardHeap; // SearchEngineHeapPtr SearchEngineData::backwardHeap;
SearchEngineHeapPtr SearchEngineData::forwardHeap2; // SearchEngineHeapPtr SearchEngineData::forwardHeap2;
SearchEngineHeapPtr SearchEngineData::backwardHeap2; // SearchEngineHeapPtr SearchEngineData::backwardHeap2;
SearchEngineHeapPtr SearchEngineData::forwardHeap3; // SearchEngineHeapPtr SearchEngineData::forwardHeap3;
SearchEngineHeapPtr SearchEngineData::backwardHeap3; // SearchEngineHeapPtr SearchEngineData::backwardHeap3;
#endif // SEARCHENGINE_H #endif // SEARCHENGINE_H

15
DataStructures/SearchEngineData.h
View File

@ -45,14 +45,10 @@ struct _HeapData {
}; };
// typedef StaticGraph<QueryEdge::EdgeData> QueryGraph; // typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
typedef BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> > QueryHeapType;
typedef boost::thread_specific_ptr<QueryHeapType> SearchEngineHeapPtr;
struct SearchEngineData { struct SearchEngineData {
typedef StaticGraph<QueryEdge::EdgeData> QueryGraph; typedef BinaryHeap< NodeID, NodeID, int, _HeapData, UnorderedMapStorage<NodeID, int> > QueryHeap;
typedef QueryHeapType QueryHeap; typedef boost::thread_specific_ptr<QueryHeap> SearchEngineHeapPtr;
SearchEngineData() { }
static SearchEngineHeapPtr forwardHeap; static SearchEngineHeapPtr forwardHeap;
static SearchEngineHeapPtr backwardHeap; static SearchEngineHeapPtr backwardHeap;
@ -68,4 +64,11 @@ struct SearchEngineData {
void InitializeOrClearThirdThreadLocalStorage(const unsigned number_of_nodes); void InitializeOrClearThirdThreadLocalStorage(const unsigned number_of_nodes);
}; };
SearchEngineData::SearchEngineHeapPtr SearchEngineData::forwardHeap;
SearchEngineData::SearchEngineHeapPtr SearchEngineData::backwardHeap;
SearchEngineData::SearchEngineHeapPtr SearchEngineData::forwardHeap2;
SearchEngineData::SearchEngineHeapPtr SearchEngineData::backwardHeap2;
SearchEngineData::SearchEngineHeapPtr SearchEngineData::forwardHeap3;
SearchEngineData::SearchEngineHeapPtr SearchEngineData::backwardHeap3;
#endif // SEARCH_ENGINE_DATA_H #endif // SEARCH_ENGINE_DATA_H

9
DataStructures/SharedMemoryVectorWrapper.h
View File

@ -24,7 +24,6 @@ or see http://www.gnu.org/licenses/agpl.txt.
#include "../Util/SimpleLogger.h" #include "../Util/SimpleLogger.h"
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/type_traits.hpp> #include <boost/type_traits.hpp>
#include <algorithm> #include <algorithm>
@ -33,9 +32,9 @@ or see http://www.gnu.org/licenses/agpl.txt.
template<typename DataT> template<typename DataT>
class ShMemIterator : public std::iterator<std::input_iterator_tag, DataT> { class ShMemIterator : public std::iterator<std::input_iterator_tag, DataT> {
boost::shared_ptr<DataT> p; DataT * p;
public: public:
ShMemIterator(boost::shared_ptr<DataT> & x) :p(x) {} ShMemIterator(DataT * x) : p(x) {}
ShMemIterator(const ShMemIterator & mit) : p(mit.p) {} ShMemIterator(const ShMemIterator & mit) : p(mit.p) {}
ShMemIterator& operator++() { ShMemIterator& operator++() {
++p; ++p;
@ -60,7 +59,7 @@ public:
template<typename DataT> template<typename DataT>
class SharedMemoryWrapper { class SharedMemoryWrapper {
private: private:
boost::shared_ptr<DataT> m_ptr; DataT * m_ptr;
std::size_t m_size; std::size_t m_size;
public: public:
@ -73,7 +72,7 @@ public:
m_size(size) m_size(size)
{ } { }
void swap(const SharedMemoryWrapper<DataT> & other) { void swap( SharedMemoryWrapper<DataT> & other ) {
std::swap( m_size, other.m_size); std::swap( m_size, other.m_size);
std::swap( m_ptr , other.m_ptr ); std::swap( m_ptr , other.m_ptr );
} }

6
DataStructures/StaticGraph.h
View File

@ -101,12 +101,6 @@ public:
_nodes.swap(nodes); _nodes.swap(nodes);
_edges.swap(edges); _edges.swap(edges);
if( !UseSharedMemory ) {
//Add dummy node to end of _nodes array;
_nodes.push_back(_nodes.back());
} else {
//TODO: Move to graph array construction
}
#ifndef NDEBUG #ifndef NDEBUG
Percent p(GetNumberOfNodes()); Percent p(GetNumberOfNodes());
for(unsigned u = 0; u < GetNumberOfNodes(); ++u) { for(unsigned u = 0; u < GetNumberOfNodes(); ++u) {

2
Server/DataStructures/BaseDataFacade.h
View File

@ -52,7 +52,7 @@ public:
virtual EdgeDataT &GetEdgeData( const EdgeID e ) = 0; virtual EdgeDataT &GetEdgeData( const EdgeID e ) = 0;
virtual const EdgeDataT &GetEdgeData( const EdgeID e ) const = 0; // virtual const EdgeDataT &GetEdgeData( const EdgeID e ) const = 0;
virtual EdgeID BeginEdges( const NodeID n ) const = 0; virtual EdgeID BeginEdges( const NodeID n ) const = 0;

6
Server/DataStructures/SharedDataFacade.h
View File

@ -159,9 +159,9 @@ public:
return m_query_graph->GetEdgeData(e); return m_query_graph->GetEdgeData(e);
} }
const EdgeDataT &GetEdgeData( const EdgeID e ) const { // const EdgeDataT &GetEdgeData( const EdgeID e ) const {
return m_query_graph->GetEdgeData(e); // return m_query_graph->GetEdgeData(e);
} // }
EdgeID BeginEdges( const NodeID n ) const { EdgeID BeginEdges( const NodeID n ) const {
return m_query_graph->BeginEdges(n); return m_query_graph->BeginEdges(n);