Commit a8f2f509 authored by Berk Geveci's avatar Berk Geveci
Browse files

BUG: Removed hard-coded tag. A parallel test was failing because the tag value changed

parent 98f7697e
...@@ -42,7 +42,8 @@ proc ExitMaster { code } { ...@@ -42,7 +42,8 @@ proc ExitMaster { code } {
for { set i 1 } { $i < $numProcs } { incr i } { for { set i 1 } { $i < $numProcs } { incr i } {
# Send break to all the nodes # Send break to all the nodes
#puts "Send break to: $i" #puts "Send break to: $i"
catch [ [ compManager GetController ] TriggerRMI $i 239954 ] set contr [ compManager GetController ]
catch [ $contr TriggerRMI $i [$contr GetBreakRMITag] ]
} }
vtkCommand DeleteAllObjects vtkCommand DeleteAllObjects
......
...@@ -60,7 +60,8 @@ def ExitMaster(a, b): ...@@ -60,7 +60,8 @@ def ExitMaster(a, b):
#print "Trigger exit RMI on all satellite nodes" #print "Trigger exit RMI on all satellite nodes"
for a in range(1, numProcs): for a in range(1, numProcs):
#print "Trigger exit in satellite node %d" % a #print "Trigger exit in satellite node %d" % a
compManager.GetController().TriggerRMI(a, 239954) contr = compManager.GetController()
contr.TriggerRMI(a, contr.GetBreakRMITag())
if myProcId == 0: if myProcId == 0:
iren = vtkRenderWindowInteractor() iren = vtkRenderWindowInteractor()
......
...@@ -199,7 +199,15 @@ public: ...@@ -199,7 +199,15 @@ public:
vtkGetMacro(BreakFlag, int); vtkGetMacro(BreakFlag, int);
// Description: // Description:
// Returns the communicator associated with this controller.
// A default communicator is created in constructor.
vtkGetObjectMacro(Communicator, vtkCommunicator); vtkGetObjectMacro(Communicator, vtkCommunicator);
// Description:
// Accessor to some default tags.
static int GetBreakRMITag() { return BREAK_RMI_TAG; }
static int GetRMITag() { return RMI_TAG; }
static int GetRMIArgTag() { return RMI_ARG_TAG; }
//BTX //BTX
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment