Skip to content

pygolang
pygolang
Commit 32f34607 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

time: Move code to pyx 

In preparation to start migrating, at least partly, time functionality
to nogil mode, move the code from time.py to _time.pyx . This is straight
code movement except

	now	-> pynow, and
	sleep	-> pysleep

replaces, since in _time.pyx now and sleep were already referring to
nogil versions.

We don't move just to time.pyx (note no _ prefix), since we will need to
continue distinguishing pyx/nogil from py objects/functions, e.g.
pyx time.second is C constant, while pyx time.pysecond is pyobject
exported to python world as time.second.
parent bfbdc711
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 144 deletions
golang/_time.pyx
View file @ 32f34607
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
from __future__ import print_function, absolute_import from __future__ import print_function, absolute_import
from golang import go, chan, select, default, nilchan, panic
from golang import _sync # avoid cycle: context -> time -> sync -> context
def pynow(): # -> t def pynow(): # -> t
return now_pyexc() return now_pyexc()
...@@ -30,6 +33,146 @@ def pysleep(double dt): ...@@ -30,6 +33,146 @@ def pysleep(double dt):
sleep_pyexc(dt) sleep_pyexc(dt)
# ---- timers ----
# FIXME timers are implemented very inefficiently - each timer currently consumes a goroutine.
# tick returns channel connected to dt ticker.
#
# Note: there is no way to stop created ticker.
# Note: for dt <= 0, contrary to Ticker, tick returns nilchan instead of panicking.
def tick(dt): # -> chan time
if dt <= 0:
return nilchan
return Ticker(dt).c
# after returns channel connected to dt timer.
#
# Note: with after there is no way to stop/garbage-collect created timer until it fires.
def after(dt): # -> chan time
return Timer(dt).c
# after_func arranges to call f after dt time.
#
# The function will be called in its own goroutine.
# Returned timer can be used to cancel the call.
def after_func(dt, f): # -> Timer
return Timer(dt, f=f)
# Ticker arranges for time events to be sent to .c channel on dt-interval basis.
#
# If the receiver is slow, Ticker does not queue events and skips them.
# Ticking can be canceled via .stop() .
class Ticker(object):
def __init__(self, dt):
if dt <= 0:
panic("ticker: dt <= 0")
self.c = chan(1) # 1-buffer -- same as in Go
self._dt = dt
self._mu = _sync.PyMutex()
self._stop = False
go(self._tick)
# stop cancels the ticker.
#
# It is guaranteed that ticker channel is empty after stop completes.
def stop(self):
with self._mu:
self._stop = True
# drain what _tick could have been queued already
while len(self.c) > 0:
self.c.recv()
def _tick(self):
while 1:
# XXX adjust for accumulated error δ?
pysleep(self._dt)
with self._mu:
if self._stop:
return
# send from under ._mu so that .stop can be sure there is no
# ongoing send while it drains the channel.
select(
default,
(self.c.send, pynow()),
)
# Timer arranges for time event to be sent to .c channel after dt time.
#
# The timer can be stopped (.stop), or reinitialized to another time (.reset).
#
# If func f is provided - when the timer fires f is called in its own goroutine
# instead of event being sent to channel .c .
class Timer(object):
def __init__(self, dt, f=None):
self._f = f
self.c = chan(1) if f is None else nilchan
self._mu = _sync.PyMutex()
self._dt = None # None - stopped, float - armed
self._ver = 0 # current timer was armed by n'th reset
self.reset(dt)
# stop cancels the timer.
#
# It returns:
#
# False: the timer was already expired or stopped,
# True: the timer was armed and canceled by this stop call.
#
# Note: contrary to Go version, there is no need to drain timer channel
# after stop call - it is guaranteed that after stop the channel is empty.
#
# Note: similarly to Go, if Timer is used with function - it is not
# guaranteed that after stop the function is not running - in such case
# the caller must explicitly synchronize with that function to complete.
def stop(self): # -> canceled
with self._mu:
if self._dt is None:
canceled = False
else:
self._dt = None
self._ver += 1
canceled = True
# drain what _fire could have been queued already
while len(self.c) > 0:
self.c.recv()
return canceled
# reset rearms the timer.
#
# the timer must be either already stopped or expired.
def reset(self, dt):
with self._mu:
if self._dt is not None:
panic("Timer.reset: the timer is armed; must be stopped or expired")
self._dt = dt
self._ver += 1
go(self._fire, dt, self._ver)
def _fire(self, dt, ver):
pysleep(dt)
with self._mu:
if self._ver != ver:
return # the timer was stopped/resetted - don't fire it
self._dt = None
# send under ._mu so that .stop can be sure that if it sees
# ._dt = None, there is no ongoing .c send.
if self._f is None:
self.c.send(pynow())
return
# call ._f not from under ._mu not to deadlock e.g. if ._f wants to reset the timer.
self._f()
# ---- misc ---- # ---- misc ----
pysecond = second pysecond = second
pynanosecond = nanosecond pynanosecond = nanosecond
......
golang/time.py
View file @ 32f34607
...@@ -26,9 +26,6 @@ See the following link about Go time package: ...@@ -26,9 +26,6 @@ See the following link about Go time package:
from __future__ import print_function, absolute_import from __future__ import print_function, absolute_import
from golang import go, chan, select, default, nilchan, panic
from golang import _sync # avoid cycle: context -> time -> sync -> context
from golang._time import \ from golang._time import \
pysecond as second, \ pysecond as second, \
pynanosecond as nanosecond, \ pynanosecond as nanosecond, \
...@@ -38,144 +35,10 @@ from golang._time import \ ...@@ -38,144 +35,10 @@ from golang._time import \
pyhour as hour, \ pyhour as hour, \
\ \
pynow as now, \ pynow as now, \
pysleep as sleep \ pysleep as sleep, \
\
tick, \
# ---- timers ---- after, \
# FIXME timers are implemented very inefficiently - each timer currently consumes a goroutine. after_func, \
Ticker, \
# tick returns channel connected to dt ticker. Timer
#
# Note: there is no way to stop created ticker.
# Note: for dt <= 0, contrary to Ticker, tick returns nilchan instead of panicking.
def tick(dt): # -> chan time
if dt <= 0:
return nilchan
return Ticker(dt).c
# after returns channel connected to dt timer.
#
# Note: with after there is no way to stop/garbage-collect created timer until it fires.
def after(dt): # -> chan time
return Timer(dt).c
# after_func arranges to call f after dt time.
#
# The function will be called in its own goroutine.
# Returned timer can be used to cancel the call.
def after_func(dt, f): # -> Timer
return Timer(dt, f=f)
# Ticker arranges for time events to be sent to .c channel on dt-interval basis.
#
# If the receiver is slow, Ticker does not queue events and skips them.
# Ticking can be canceled via .stop() .
class Ticker(object):
def __init__(self, dt):
if dt <= 0:
panic("ticker: dt <= 0")
self.c = chan(1) # 1-buffer -- same as in Go
self._dt = dt
self._mu = _sync.PyMutex()
self._stop = False
go(self._tick)
# stop cancels the ticker.
#
# It is guaranteed that ticker channel is empty after stop completes.
def stop(self):
with self._mu:
self._stop = True
# drain what _tick could have been queued already
while len(self.c) > 0:
self.c.recv()
def _tick(self):
while 1:
# XXX adjust for accumulated error δ?
sleep(self._dt)
with self._mu:
if self._stop:
return
# send from under ._mu so that .stop can be sure there is no
# ongoing send while it drains the channel.
select(
default,
(self.c.send, now()),
)
# Timer arranges for time event to be sent to .c channel after dt time.
#
# The timer can be stopped (.stop), or reinitialized to another time (.reset).
#
# If func f is provided - when the timer fires f is called in its own goroutine
# instead of event being sent to channel .c .
class Timer(object):
def __init__(self, dt, f=None):
self._f = f
self.c = chan(1) if f is None else nilchan
self._mu = _sync.PyMutex()
self._dt = None # None - stopped, float - armed
self._ver = 0 # current timer was armed by n'th reset
self.reset(dt)
# stop cancels the timer.
#
# It returns:
#
# False: the timer was already expired or stopped,
# True: the timer was armed and canceled by this stop call.
#
# Note: contrary to Go version, there is no need to drain timer channel
# after stop call - it is guaranteed that after stop the channel is empty.
#
# Note: similarly to Go, if Timer is used with function - it is not
# guaranteed that after stop the function is not running - in such case
# the caller must explicitly synchronize with that function to complete.
def stop(self): # -> canceled
with self._mu:
if self._dt is None:
canceled = False
else:
self._dt = None
self._ver += 1
canceled = True
# drain what _fire could have been queued already
while len(self.c) > 0:
self.c.recv()
return canceled
# reset rearms the timer.
#
# the timer must be either already stopped or expired.
def reset(self, dt):
with self._mu:
if self._dt is not None:
panic("Timer.reset: the timer is armed; must be stopped or expired")
self._dt = dt
self._ver += 1
go(self._fire, dt, self._ver)
def _fire(self, dt, ver):
sleep(dt)
with self._mu:
if self._ver != ver:
return # the timer was stopped/resetted - don't fire it
self._dt = None
# send under ._mu so that .stop can be sure that if it sees
# ._dt = None, there is no ongoing .c send.
if self._f is None:
self.c.send(now())
return
# call ._f not from under ._mu not to deadlock e.g. if ._f wants to reset the timer.
self._f()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7