Tweaks to PulseCountO1Engine.

schlangster · schlangster · commit e4fa40dec96c · 2014-03-08T01:35:47.000+01:00
diff --git a/include/react/propagation/PulseCountO1Engine.h b/include/react/propagation/PulseCountO1Engine.h
@@ -40,10 +40,9 @@ class Node : public IReactiveNode
 		cost_ += costDelta;
 	}
 
-	bool	SetMarker(MarkerT marker)			{ return marker_.exchange(marker) != marker; }
-	bool	CheckMarker(MarkerT marker) const	{ return marker_ == marker; }
-	MarkerT	GetMarker() const					{ return marker_; }
-	void	ClearMarker()						{ marker_.store(0); }
+	bool	SetMarker(MarkerT marker)			{ return marker_.exchange(marker, std::memory_order_relaxed) != marker; }
+	MarkerT	GetMarker() const					{ return marker_.load(std::memory_order_relaxed); }
+	void	ClearMarker()						{ marker_.store(0, std::memory_order_relaxed); }
 
 	int		Weight() const	{ return weight_; }
 	int		Cost() const	{ return cost_; }
diff --git a/src/react/propagation/PulseCountO1Engine.cpp b/src/react/propagation/PulseCountO1Engine.cpp
@@ -135,7 +135,7 @@ void PulseCountO1Engine::OnNodeShift(Node& node, Node& oldParent, Node& newParen
 		newParent.Successors.Add(node);
 		node.Predecessors.Add(newParent);
 
-		if (! newParent.CheckMarker(turn.Marker))
+		if (! newParent.GetMarker() == turn.Marker)
 		{
 			shouldTick = true;
 		}

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ void PulseCountO1Engine::OnNodeShift(Node& node, Node& oldParent, Node& newParen`
`135`	`135`	`newParent.Successors.Add(node);`
`136`	`136`	`node.Predecessors.Add(newParent);`
`137`	`137`
`138`		`- if (! newParent.CheckMarker(turn.Marker))`
	`138`	`+ if (! newParent.GetMarker() == turn.Marker)`
`139`	`139`	`{`
`140`	`140`	`shouldTick = true;`
`141`	`141`	`}`