Fixes a race condition when more than one thread tries to access the grid file (thanks Patrick)
This commit is contained in:
@@ -0,0 +1,47 @@
|
||||
/*
|
||||
open source routing machine
|
||||
Copyright (C) Dennis Luxen, others 2010
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU AFFERO General Public License as published by
|
||||
the Free Software Foundation; either version 3 of the License, or
|
||||
any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Affero General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
or see http://www.gnu.org/licenses/agpl.txt.
|
||||
|
||||
Created on: 18.11.2010
|
||||
Author: dennis
|
||||
*/
|
||||
|
||||
#ifndef HASHTABLE_H_
|
||||
#define HASHTABLE_H_
|
||||
|
||||
#include <google/sparse_hash_map>
|
||||
|
||||
template<typename keyT, typename valueT>
|
||||
class HashTable {
|
||||
typedef google::sparse_hash_map<keyT, valueT> MyHashTable;
|
||||
public:
|
||||
HashTable() { }
|
||||
HashTable(const unsigned size) {
|
||||
table.resize(size);
|
||||
}
|
||||
void Add(const keyT& key, const valueT& value){
|
||||
table[key] = value;
|
||||
}
|
||||
valueT Find(const keyT& key) {
|
||||
return table.find(key)->second;
|
||||
}
|
||||
private:
|
||||
MyHashTable table;
|
||||
};
|
||||
|
||||
#endif /* HASHTABLE_H_ */
|
||||
+508
-475
File diff suppressed because it is too large
Load Diff
@@ -61,6 +61,10 @@ public:
|
||||
inline bool FindRoutingStarts(const _Coordinate start, const _Coordinate target, PhantomNodes * phantomNodes) {
|
||||
g->FindRoutingStarts(start, target, phantomNodes);
|
||||
}
|
||||
|
||||
inline void RegisterThread(const unsigned k, const unsigned v) {
|
||||
g->threadLookup.table.Add(k, v);
|
||||
}
|
||||
private:
|
||||
vector<_Coordinate> * int2ExtNodeMap;
|
||||
ReadOnlyGrid * g;
|
||||
|
||||
@@ -37,4 +37,12 @@ inline double get_timestamp()
|
||||
double y2lat(double a) { return 180/M_PI * (2 * atan(exp(a*M_PI/180)) - M_PI/2); }
|
||||
double lat2y(double a) { return 180/M_PI * log(tan(M_PI/4+a*(M_PI/180)/2)); }
|
||||
|
||||
inline unsigned boost_thread_id_hash(boost::thread::id const& id)
|
||||
{
|
||||
std::stringstream ostr;
|
||||
ostr << id;
|
||||
std::tr1::hash<std::string> h;
|
||||
return h(ostr.str());
|
||||
}
|
||||
|
||||
#endif /* TIMEUTIL_H_ */
|
||||
|
||||
Reference in New Issue
Block a user