Changeset 844

Timestamp:

11/23/15 07:32:25 (6 months ago)

Author:

mmckerns

Message:

check if handler enabled before using signal (so solver works in ThreadPool?)

Location:

mystic

Files:

• examples3/test_searcher.py (modified) (1 diff)
• mystic/abstract_solver.py (modified) (2 diffs)
• mystic/ensemble.py (modified) (4 diffs)

mystic/examples3/test_searcher.py

@@ -10 +10 @@
 #   start = time.time()
     # if available, use a multiprocessing worker pool
-    try: #NOTE: ThreadPool and ParallelPool fail
+    try: #NOTE: ParallelPool fails
         from pathos.helpers import freeze_support
         freeze_support()

mystic/mystic/abstract_solver.py

@@ -824 +824 @@
 
         # activate signal handler
+       #import threading as thread
+       #mainthread = isinstance(thread.current_thread(), thread._MainThread)
+       #if mainthread: #XXX: if not mainthread, signal will raise ValueError
         import signal
-        if self._handle_sigint: signal.signal(signal.SIGINT,self.signal_handler)
+        if self._handle_sigint:
+            signal.signal(signal.SIGINT,self.signal_handler)
 
         # register: cost, termination, ExtraArgs
@@ -837 +841 @@
 
         # restore default handler for signal interrupts
-        signal.signal(signal.SIGINT,signal.default_int_handler)
+        if self._handle_sigint:
+            signal.signal(signal.SIGINT,signal.default_int_handler)
         return
 

mystic/mystic/ensemble.py

@@ -106 +106 @@
 
         # activate signal_handler
+       #import threading as thread
+       #mainthread = isinstance(thread.current_thread(), thread._MainThread)
+       #if mainthread: #XXX: if not mainthread, signal will raise ValueError
         import signal
-        if self._handle_sigint: signal.signal(signal.SIGINT,self.signal_handler)
+        if self._handle_sigint:
+            signal.signal(signal.SIGINT,self.signal_handler)
 
         # register termination function
@@ -228 +232 @@
 
         # restore default handler for signal interrupts
-        signal.signal(signal.SIGINT,signal.default_int_handler)
+        if self._handle_sigint:
+            signal.signal(signal.SIGINT,signal.default_int_handler)
 
         # log any termination messages
@@ -303 +308 @@
 
         # activate signal_handler
+       #import threading as thread
+       #mainthread = isinstance(thread.current_thread(), thread._MainThread)
+       #if mainthread: #XXX: if not mainthread, signal will raise ValueError
         import signal
-        if self._handle_sigint: signal.signal(signal.SIGINT,self.signal_handler)
+        if self._handle_sigint:
+            signal.signal(signal.SIGINT,self.signal_handler)
 
         # register termination function
@@ -418 +427 @@
 
         # restore default handler for signal interrupts
-        signal.signal(signal.SIGINT,signal.default_int_handler)
+        if self._handle_sigint:
+            signal.signal(signal.SIGINT,signal.default_int_handler)
 
         # log any termination messages