Commit 106c1b95 authored by Kirill Smelkov's avatar Kirill Smelkov

time: Rename things imported at Py level * -> py*

e.g. go -> pygo, select -> pyselect, etc. This will make the followup
transition to non-py mode more clear.
parent 0e838833
...@@ -26,7 +26,7 @@ from golang cimport sync ...@@ -26,7 +26,7 @@ from golang cimport sync
from libc.math cimport INFINITY from libc.math cimport INFINITY
from cython cimport final from cython cimport final
from golang import go, select, default, nilchan, panic from golang import go as pygo, select as pyselect, default as pydefault, nilchan as pynilchan, panic as pypanic
def pynow(): # -> t def pynow(): # -> t
...@@ -46,7 +46,7 @@ def pysleep(double dt): ...@@ -46,7 +46,7 @@ def pysleep(double dt):
# Note: for dt <= 0, contrary to Ticker, tick returns nilchan instead of panicking. # Note: for dt <= 0, contrary to Ticker, tick returns nilchan instead of panicking.
def tick(dt): # -> chan time def tick(dt): # -> chan time
if dt <= 0: if dt <= 0:
return nilchan return pynilchan
return Ticker(dt).c return Ticker(dt).c
# after returns channel connected to dt timer. # after returns channel connected to dt timer.
...@@ -77,11 +77,11 @@ cdef class Ticker: ...@@ -77,11 +77,11 @@ cdef class Ticker:
def __init__(self, dt): def __init__(self, dt):
if dt <= 0: if dt <= 0:
panic("ticker: dt <= 0") pypanic("ticker: dt <= 0")
self.c = pychan(1) # 1-buffer -- same as in Go self.c = pychan(1) # 1-buffer -- same as in Go
self._dt = dt self._dt = dt
self._stop = False self._stop = False
go(self._tick) pygo(self._tick)
# stop cancels the ticker. # stop cancels the ticker.
# #
...@@ -107,8 +107,8 @@ cdef class Ticker: ...@@ -107,8 +107,8 @@ cdef class Ticker:
# send from under ._mu so that .stop can be sure there is no # send from under ._mu so that .stop can be sure there is no
# ongoing send while it drains the channel. # ongoing send while it drains the channel.
select( pyselect(
default, pydefault,
(self.c.send, pynow()), (self.c.send, pynow()),
) )
self._mu.unlock() self._mu.unlock()
...@@ -131,7 +131,7 @@ cdef class Timer: ...@@ -131,7 +131,7 @@ cdef class Timer:
def __init__(self, dt, f=None): def __init__(self, dt, f=None):
self._f = f self._f = f
self.c = pychan(1) if f is None else nilchan self.c = pychan(1) if f is None else pynilchan
self._dt = INFINITY self._dt = INFINITY
self._ver = 0 self._ver = 0
self.reset(dt) self.reset(dt)
...@@ -173,10 +173,10 @@ cdef class Timer: ...@@ -173,10 +173,10 @@ cdef class Timer:
self._mu.lock() self._mu.lock()
if self._dt != INFINITY: if self._dt != INFINITY:
self._mu.unlock() self._mu.unlock()
panic("Timer.reset: the timer is armed; must be stopped or expired") pypanic("Timer.reset: the timer is armed; must be stopped or expired")
self._dt = dt self._dt = dt
self._ver += 1 self._ver += 1
go(self._fire, dt, self._ver) pygo(self._fire, dt, self._ver)
self._mu.unlock() self._mu.unlock()
......
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