dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.

Browse Source
This commit is contained in:
frosch
2015-03-07 18:27:01 +00:00
parent 163ab9fd56
commit a14b836bf2
11 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/linkgraph/mcf.cpp
View File

@@ -148,15 +148,14 @@ public:
*/
void SetNode(NodeID source, NodeID node)
{
static const FlowStat::SharesMap empty;
const FlowStatMap &flows = this->job[node].Flows();
FlowStatMap::const_iterator it = flows.find(this->job[source].Station());
if (it != flows.end()) {
this->it = it->second.GetShares()->begin();
this->end = it->second.GetShares()->end();
} else {
this->it = empty.begin();
this->end = empty.end();
this->it = FlowStat::empty_sharesmap.begin();
this->end = FlowStat::empty_sharesmap.end();
}
}
@@ -379,11 +378,10 @@ void MCF1stPass::EliminateCycle(PathVector &path, Path *cycle_begin, uint flow)
*/
bool MCF1stPass::EliminateCycles(PathVector &path, NodeID origin_id, NodeID next_id)
{
static Path *invalid_path = new Path(INVALID_NODE, true);
Path *at_next_pos = path[next_id];
/* this node has already been searched */
if (at_next_pos == invalid_path) return false;
if (at_next_pos == Path::invalid_path) return false;
if (at_next_pos == NULL) {
/* Summarize paths; add up the paths with the same source and next hop
@@ -431,7 +429,7 @@ bool MCF1stPass::EliminateCycles(PathVector &path, NodeID origin_id, NodeID next
* could be found in this branch, thus it has to be searched again next
* time we spot it.
*/
path[next_id] = found ? NULL : invalid_path;
path[next_id] = found ? NULL : Path::invalid_path;
return found;
}