Attachment 1103324 Details for Bug 1279502 – new selector patch against 0.30-7

[patch] new selector patch against 0.30-7

selector.patch (text/plain), 1.49 KB, created by Ken Giusti on 2015-12-07 17:17:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ken Giusti

Created: 2015-12-07 17:17:07 UTC

Size: 1.49 KB

patch

obsolete

>--- /home/kgiusti/rpmbuild/BUILD/qpid-python-0.30/qpid/selector.py.ORIG	2015-12-07 08:44:38.073721592 -0500
>+++ /home/kgiusti/rpmbuild/BUILD/qpid-python-0.30/qpid/selector.py	2015-12-07 11:46:28.538732258 -0500
>@@ -48,6 +48,7 @@
>   lock = Lock()
>   DEFAULT = None
>   _current_pid = None
>+  process_forked = False
> 
>   @staticmethod
>   def default():
>@@ -58,6 +59,10 @@
>         atexit.register(sel.stop)
>         sel.start()
>         Selector.DEFAULT = sel
>+        if (Selector._current_pid is not None
>+            and Selector._current_pid != os.getpid()):
>+          log.error("Test patch: fork detected pid=%s", os.getpid())
>+          Selector.process_forked = True
>         Selector._current_pid = os.getpid()
>       return Selector.DEFAULT
>     finally:
>@@ -115,6 +120,7 @@
>       raise
> 
>   def run(self):
>+    loop_count = 0
>     while not self.stopped:
>       wakeup = None
>       for sel in self.selectables.copy():
>@@ -136,6 +142,12 @@
>           else:
>             timeout = max(0, wakeup - time.time())
>           rd, wr, ex = select(self.reading, self.writing, (), timeout)
>+          if Selector.process_forked:
>+            if loop_count > 20:
>+              log.error("Test patch: RAISING EXCEPTION NOW!")
>+              raise Exception("This exception should be logged")
>+            loop_count = loop_count + 1
>+            log.error("Test patch: loop count=%d pid=%d", loop_count, os.getpid())
>           break
>         except SelectError, e:
>           # Repeat the select call if we were interrupted.

Actions: View | Diff

Attachments on bug 1279502: 1101566 | 1101732 | 1102282 | 1103324