Changeset f3efa09 in sasview

Timestamp:

Jan 25, 2015 11:39:26 AM (10 years ago)

Author:

butler

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

b52f47f, 5972029

Parents:

5ba88d3

Message:

Fix Pr failure ticket #273

Long version: In August 2013 it was determined that many instability problems experienced by SasView? were do to a threading problem in fitting.py. Mainly the authors seemed to not realize that calling thread.stop just raised a flag and that the thread itself needed to check for said flag regularly and kill the thread if it found the flag raised. A quick fix was implemented by adding a wait till the existing thread ended naturally to the two places in the code where the stop is raised. This seems to work.

At the same time pr.py was found to use the same raising of the stop flag three times and it was assumed that the same problem existed and the same wait “fix” was implemented. Subsequenty it has been shown that the new wait code in pr.py NEVER gets reached and thus the fix breaks the PrView? perspective. It may be that this earlier code properly dealt with threads properly(still remembering how the thread code was meant to be used). Whatever the case will remove this fix for now.

Finally another thread.stop was found once in simulation.py. since this is older code it may also be handled properly so am removing the “Fix” from that as well for now.

to quickly find these points in the future:
fitting.py - two instances that seem to need fixing
pr.py - three instances that may work correctly
simulation.py - one instace

search terms:
“-PDB” or
“d.stop” (thread.stop or thread_1D.stop or 2D.stop)

Location:

src/sans/perspectives

Files:

• pr/pr.py (modified) (3 diffs)
• simulation/simulation.py (modified) (1 diff)

src/sans/perspectives/pr/pr.py

@@ -725 +725 @@
             self.calc_thread.stop()
             ## stop just raises the flag -- the thread is supposed to 
-            ## then kill itself but cannot.  Paul Kienzle came up with
-            ## this fix to prevent threads from stepping on each other
-            ## in Calc1D of fitting.py which was causing a simple custom model
-            ## to crash Sasview.  See rest of notes under Calc1D.
+            ## then kill itself. In August 2014 it was shown that this is
+            ## incorrectly handled by fitting.py and a fix implemented. 
+            ## It is not clear whether it is properly used here, but the
+            ## "fix" of waiting for the previous thread to end breaks the
+            ## pr perspective completely as it causes an infinite loop.
+            ## Thus it is likely the threading is bing properly handled.
+            ## While the "fix" is no longer implemented the comment is
+            ## left here till somebody ascertains that in fact the threads
+            ## are being properly handled.
             ##
-            ##    -PDB August 13, 2014                  
-            while self.calc_thread.isrunning():
-                time.sleep(0.1)
+            ##    -PDB January 25, 2015                  
                 
         pr = self.pr.clone()
@@ -1153 +1156 @@
             self.estimation_thread.stop()
             ## stop just raises the flag -- the thread is supposed to 
-            ## then kill itself but cannot.  Paul Kienzle came up with
-            ## this fix to prevent threads from stepping on each other
-            ## in Calc1D of fitting.py which was causing a simple custom model
-            ## to crash Sasview.  See rest of notes under Calc1D.
+            ## then kill itself. In August 2014 it was shown that this is
+            ## incorrectly handled by fitting.py and a fix implemented. 
+            ## It is not clear whether it is properly used here, but the
+            ## "fix" of waiting for the previous thread to end breaks the
+            ## pr perspective completely as it causes an infinite loop.
+            ## Thus it is likely the threading is bing properly handled.
+            ## While the "fix" is no longer implemented the comment is
+            ## left here till somebody ascertains that in fact the threads
+            ## are being properly handled.
             ##
-            ##    -PDB August 13, 2014                  
-            while self.estimation_thread.isrunning():
-                time.sleep(0.1)
+            ##    -PDB January 25, 2015                  
                 
                 
@@ -1181 +1187 @@
             self.estimation_thread.stop()
             ## stop just raises the flag -- the thread is supposed to 
-            ## then kill itself but cannot.  Paul Kienzle came up with
-            ## this fix to prevent threads from stepping on each other
-            ## in Calc1D of fitting.py which was causing a simple custom model
-            ## to crash Sasview.  See rest of notes under Calc1D.
+            ## then kill itself. In August 2014 it was shown that this is
+            ## incorrectly handled by fitting.py and a fix implemented. 
+            ## It is not clear whether it is properly used here, but the
+            ## "fix" of waiting for the previous thread to end breaks the
+            ## pr perspective completely as it causes an infinite loop.
+            ## Thus it is likely the threading is bing properly handled.
+            ## While the "fix" is no longer implemented the comment is
+            ## left here till somebody ascertains that in fact the threads
+            ## are being properly handled.
             ##
-            ##    -PDB August 13, 2014                  
-            while self.estimation_thread.isrunning():
-                time.sleep(0.1)
+            ##    -PDB January 25, 2015                  
                                 
         pr = self.pr.clone()

src/sans/perspectives/simulation/simulation.py

@@ -214 +214 @@
             self.calc_thread_1D.stop()
             ## stop just raises the flag -- the thread is supposed to 
-            ## then kill itself but cannot.  Paul Kienzle came up with
-            ## this fix to prevent threads from stepping on each other
-            ## in Calc1D of fitting.py which was causing a simple custom model
-            ## to crash Sasview.  See rest of notes under Calc1D.
+            ## then kill itself. In August 2014 it was shown that this is
+            ## incorrectly handled by fitting.py and a fix implemented. 
+            ## It is not clear that it is improperly used here so no fix
+            ## is being added here.
             ##
-            ##    -PDB August 13, 2014                  
-            while self.calc_thread_1D.isrunning():
-                time.sleep(0.1)
+            ##    -PDB January 25, 2015                  
             
         # Create a computation thread