summaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/event_loop.py
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2018-03-26 19:13:32 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2018-04-04 12:38:08 +0200
commitbf176e420ee20e526fc408a8a16d4dc7811ce703 (patch)
treedb891c84d65762c16e2d64b6d7066cfb93759c93 /src/osmo_gsm_tester/event_loop.py
parent2c0ae6288d525a9e81271b5b005a0d64ba18edac (diff)
event_loop: Use glib as mainloop impl and move modem to use event_loop
Several benefits: - We can add APIs to poll on fds in the future (for smpp socket for instance) instead of using busy polling. - During wait(), we now block in the glib mainloop instead of sleeping 0.1 secs and not handling events during that time. - We remove glib mainloop specific bits from modem.py Change-Id: I8c3bc44bbe443703077110cdc67207e9cbb43767
Diffstat (limited to 'src/osmo_gsm_tester/event_loop.py')
-rw-r--r--src/osmo_gsm_tester/event_loop.py137
1 files changed, 109 insertions, 28 deletions
diff --git a/src/osmo_gsm_tester/event_loop.py b/src/osmo_gsm_tester/event_loop.py
index ebe6afb..068eca9 100644
--- a/src/osmo_gsm_tester/event_loop.py
+++ b/src/osmo_gsm_tester/event_loop.py
@@ -18,48 +18,129 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
import time
+from gi.repository import GLib, GObject
+
from . import log
-poll_funcs = []
+class DeferredHandling:
+ defer_queue = []
+
+ def handle_queue(self):
+ while DeferredHandling.defer_queue:
+ handler, args, kwargs = self.defer_queue.pop(0)
+ handler(*args, **kwargs)
+
+ def defer(self, handler, *args, **kwargs):
+ self.defer_queue.append((handler, args, kwargs))
+
+class WaitRequest:
+ timeout_ack = False
+ condition_ack = False
+
+ def __init__(self, condition, condition_args, condition_kwargs, timeout, timestep):
+ self.timeout_started = time.time()
+ self.timeout = timeout
+ self.condition = condition
+ self.condition_args = condition_args
+ self.condition_kwargs = condition_kwargs
+
+ def condition_check(self):
+ #print("_wait_condition_check")
+ waited = time.time() - self.timeout_started
+ if self.condition(*self.condition_args, **self.condition_kwargs):
+ self.condition_ack = True
+ elif waited > self.timeout:
+ self.timeout_ack = True
+
+class EventLoop:
+ poll_funcs = []
+ gloop = None
+ gctx = None
+ deferred_handling = None
+
+ def __init__(self):
+ self.gloop = GLib.MainLoop()
+ self.gctx = self.gloop.get_context()
+ self.deferred_handling = DeferredHandling()
+
+ def _trigger_cb_func(self, user_data):
+ self.defer(user_data)
+ return True #to retrigger the timeout
+
+ def defer(self, handler, *args, **kwargs):
+ self.deferred_handling.defer(handler, *args, **kwargs)
+
+ def register_poll_func(self, func, timestep=1):
+ id = GObject.timeout_add(timestep*1000, self._trigger_cb_func, func) # in 1/1000th of a sec
+ self.poll_funcs.append((func, id))
+
+ def unregister_poll_func(self, func):
+ for pair in self.poll_funcs:
+ f, id = pair
+ if f == func:
+ GObject.source_remove(id)
+ self.poll_funcs.remove(pair)
+ return
+
+ def poll(self, may_block=False):
+ self.gctx.iteration(may_block)
+ self.deferred_handling.handle_queue()
+
+ def wait_no_raise(self, log_obj, condition, condition_args, condition_kwargs, timeout, timestep):
+ if not timeout or timeout < 0:
+ self = log_obj
+ raise log.Error('wait() *must* time out at some point.', timeout=timeout)
+ if timestep < 0.1:
+ timestep = 0.1
+
+ wait_req = WaitRequest(condition, condition_args, condition_kwargs, timeout, timestep)
+ wait_id = GObject.timeout_add(timestep*1000, self._trigger_cb_func, wait_req.condition_check)
+ while True:
+ self.poll(may_block=True)
+ if wait_req.condition_ack or wait_req.timeout_ack:
+ GObject.source_remove(wait_id)
+ success = wait_req.condition_ack
+ return success
+
+ def wait(self, log_obj, condition, *condition_args, timeout=300, timestep=1, **condition_kwargs):
+ if not self.wait_no_raise(log_obj, condition, condition_args, condition_kwargs, timeout, timestep):
+ log.ctx(log_obj)
+ raise log.Error('Wait timeout')
+
+ def sleep(self, log_obj, seconds):
+ assert seconds > 0.
+ self.wait_no_raise(log_obj, lambda: False, [], {}, timeout=seconds, timestep=seconds)
+
+
+evloop = EventLoop()
def register_poll_func(func):
- global poll_funcs
- poll_funcs.append(func)
+ global evloop
+ evloop.register_poll_func(func)
def unregister_poll_func(func):
- global poll_funcs
- poll_funcs.remove(func)
+ global evloop
+ evloop.unregister_poll_func(func)
def poll():
- global poll_funcs
- for func in poll_funcs:
- func()
+ global evloop
+ evloop.poll()
def wait_no_raise(log_obj, condition, condition_args, condition_kwargs, timeout, timestep):
- if not timeout or timeout < 0:
- self = log_obj
- raise log.Error('wait() *must* time out at some point.', timeout=timeout)
- if timestep < 0.1:
- timestep = 0.1
-
- started = time.time()
- while True:
- poll()
- if condition(*condition_args, **condition_kwargs):
- return True
- waited = time.time() - started
- if waited > timeout:
- return False
- time.sleep(timestep)
+ global evloop
+ evloop.wait_no_raise(log_obj, condition, condition_args, condition_kwargs, timeout, timestep)
def wait(log_obj, condition, *condition_args, timeout=300, timestep=1, **condition_kwargs):
- if not wait_no_raise(log_obj, condition, condition_args, condition_kwargs, timeout, timestep):
- log.ctx(log_obj)
- raise log.Error('Wait timeout')
+ global evloop
+ evloop.wait(log_obj, condition, *condition_args, timeout=timeout, timestep=timestep, **condition_kwargs)
def sleep(log_obj, seconds):
- assert seconds > 0.
- wait_no_raise(log_obj, lambda: False, [], {}, timeout=seconds, timestep=min(seconds, 1))
+ global evloop
+ evloop.sleep(log_obj, seconds)
+
+def defer(handler, *args, **kwargs):
+ global evloop
+ evloop.defer(handler, *args, **kwargs)
# vim: expandtab tabstop=4 shiftwidth=4