commit 7e1d5c54487356c0a1ef86f88f800a7d24d34283
author Rich Lane <rich.lane@bigswitch.com> Mon Dec 24 14:08:32 2012 -0800
committer Rich Lane <rich.lane@bigswitch.com> Mon Dec 24 14:08:32 2012 -0800
tree 57a57e50e3a32ed44e4a78983b32699771466b91
parent 5b5da2d4413ff7249522d9f167c61cd2e298f9ca

EventDescriptor: dont block notify() if pipe is full

src/python/oftest/ofutils.py

diff --git a/src/python/oftest/ofutils.py b/src/python/oftest/ofutils.py
index a75d266..9df90bd 100644
--- a/src/python/oftest/ofutils.py
+++ b/src/python/oftest/ofutils.py
@@ -6,6 +6,7 @@
 import random
 import time
 import os
+import fcntl
 
 default_timeout = None # set by oft
 
@@ -44,13 +45,17 @@
 
     def __init__(self):
         self.pipe_rd, self.pipe_wr = os.pipe()
+        fcntl.fcntl(self.pipe_wr, fcntl.F_SETFL, os.O_NONBLOCK)
 
     def __del__(self):
         os.close(self.pipe_rd)
         os.close(self.pipe_wr)
 
     def notify(self):
-        os.write(self.pipe_wr, "x")
+        try:
+            os.write(self.pipe_wr, "x")
+        except OSError as e:
+            logger.warn("Failed to notify EventDescriptor: %s", e)
 
     def wait(self):
         os.read(self.pipe_rd, 1)