Changeset f4167637 in sasview

Timestamp:

Aug 13, 2014 9:37:01 PM (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:

2b875e4c, 66f21cd

Parents:

9afebe1

Message:

update Pr and simulations to fix thread problem. note: I don't think simulations is used at this point but figure it should be fixed if in repo.

Location:

src/sans/perspectives

Files:

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

src/sans/perspectives/pr/pr.py

@@ -724 +724 @@
         if self.calc_thread != None and self.calc_thread.isrunning():
             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.
+            ##
+            ##    -PDB August 13, 2014                  
+            while self.calc_thread.isrunning():
+                time.sleep(0.1)
                 
         pr = self.pr.clone()
@@ -1143 +1152 @@
             self.estimation_thread.isrunning():
             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.
+            ##
+            ##    -PDB August 13, 2014                  
+            while self.estimation_thread.isrunning():
+                time.sleep(0.1)
+                
                 
         pr = self.pr.clone()
@@ -1161 +1180 @@
         if self.estimation_thread != None and self.estimation_thread.isrunning():
             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.
+            ##
+            ##    -PDB August 13, 2014                  
+            while self.estimation_thread.isrunning():
+                time.sleep(0.1)
+                                
         pr = self.pr.clone()
         # Skip the slit settings for the estimation

src/sans/perspectives/simulation/simulation.py

@@ -213 +213 @@
         if self.calc_thread_1D != None and self.calc_thread_1D.isrunning():
             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.
+            ##
+            ##    -PDB August 13, 2014                  
+            while self.calc_thread_1D.isrunning():
+                time.sleep(0.1)
             
         # Create a computation thread