jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

asyndispatch: removed deprecated setEvent proc

Browse source
This commit is contained in:
Araq 2019-09-20 20:15:25 +02:00 • committed by Andreas Rumpf
commit 908b553215
3 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pure/asyncdispatch.nim
View file

@ -304,6 +304,7 @@ when defined(windows) or defined(nimdoc):
proc verifyPresence(fd: AsyncFD) = proc verifyPresence(fd: AsyncFD) =
## Ensures that file descriptor has been registered with the dispatcher. ## Ensures that file descriptor has been registered with the dispatcher.
## Raises ValueError if `fd` has not been registered.
let p = getGlobalDispatcher() let p = getGlobalDispatcher()
if fd notin p.handles: if fd notin p.handles:
raise newException(ValueError, raise newException(ValueError,
@ -1872,8 +1873,3 @@ proc waitFor*[T](fut: Future[T]): T =
poll() poll()
fut.read fut.read
proc setEvent*(ev: AsyncEvent) {.deprecated:
"Deprecated since v0.18.0: Use 'trigger' instead.".} =
## Set event ``ev`` to signaled state.
ev.trigger()

6
tests/async/tioselectors.nim
View file

@ -128,9 +128,9 @@ elif not defined(windows):
var event = newSelectEvent() var event = newSelectEvent()
selector.registerEvent(event, 1) selector.registerEvent(event, 1)
var rc0 = selector.select(0) var rc0 = selector.select(0)
event.setEvent() event.trigger()
var rc1 = selector.select(0) var rc1 = selector.select(0)
event.setEvent() event.trigger()
var rc2 = selector.select(0) var rc2 = selector.select(0)
var rc3 = selector.select(0) var rc3 = selector.select(0)
assert(len(rc0) == 0 and len(rc1) == 1 and len(rc2) == 1 and len(rc3) == 0) assert(len(rc0) == 0 and len(rc1) == 1 and len(rc2) == 1 and len(rc3) == 0)
@ -452,7 +452,7 @@ elif not defined(windows):
selector.registerHandle(sock, {Event.Read}, 1) selector.registerHandle(sock, {Event.Read}, 1)
discard selector.select(500) discard selector.select(500)
selector.unregister(sock) selector.unregister(sock)
event.setEvent() event.trigger()
joinThreads(thr) joinThreads(thr)
assert(counter == 1) assert(counter == 1)
result = true result = true

8
tests/async/tupcoming_async.nim
View file

@ -10,7 +10,7 @@ when defined(upcoming):
proc delayedSet(ev: AsyncEvent, timeout: int): Future[void] {.async.} = proc delayedSet(ev: AsyncEvent, timeout: int): Future[void] {.async.} =
await sleepAsync(timeout) await sleepAsync(timeout)
ev.setEvent() ev.trigger()
proc waitEvent(ev: AsyncEvent, closeEvent = false): Future[void] = proc waitEvent(ev: AsyncEvent, closeEvent = false): Future[void] =
var retFuture = newFuture[void]("waitEvent") var retFuture = newFuture[void]("waitEvent")
@ -39,7 +39,7 @@ when defined(upcoming):
let e = newAsyncEvent() let e = newAsyncEvent()
addEvent(e) do (fd: AsyncFD) -> bool: addEvent(e) do (fd: AsyncFD) -> bool:
assert(not unregistered) assert(not unregistered)
e.setEvent() e.trigger()
e.unregister() e.unregister()
unregistered = true unregistered = true
poll() poll()
@ -52,7 +52,7 @@ when defined(upcoming):
addEvent(e) do (fd: AsyncFD) -> bool: addEvent(e) do (fd: AsyncFD) -> bool:
eventReceived = true eventReceived = true
return true return true
e.setEvent() e.trigger()
while not eventReceived: while not eventReceived:
poll() poll()
try: try:
@ -69,7 +69,7 @@ when defined(upcoming):
addEvent(e) do (fd: AsyncFD) -> bool: addEvent(e) do (fd: AsyncFD) -> bool:
e.unregister() e.unregister()
e.close() e.close()
e.setEvent() e.trigger()
poll() poll()
when ioselSupportedPlatform or defined(windows): when ioselSupportedPlatform or defined(windows):