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

Deprecated asyncio module. Fixed old tests.

Browse source
This commit is contained in:
Dominik Picheta 2014-12-26 19:21:34 +00:00
commit f972b464cb
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pure/asyncio.nim
View file

@ -10,6 +10,11 @@ include "system/inclrtl"
import sockets, os
##
## **Warning:** This module is deprecated since version 0.10.2.
## Use the brand new `asyncdispatch <asyncdispatch.html>`_ module together
## with the `asyncnet <asyncnet.html>`_ module.
## This module implements an asynchronous event loop together with asynchronous
## sockets which use this event loop.
## It is akin to Python's asyncore module. Many modules that use sockets
@ -90,6 +95,8 @@ import sockets, os
## var client: Socket
## getSocket(s).accept(client)
{.deprecated.}
when defined(windows):
from winlean import TimeVal, SocketHandle, FD_SET, FD_ZERO, TFdSet,
FD_ISSET, select

4
tests/async/tasynciossl.nim
View file

@ -47,7 +47,7 @@ proc serverAccept(s: PAsyncSocket) =
proc launchSwarm(disp: var PDispatcher, port: TPort, count: int,
buffered = true, useSSL = false) =
for i in 1..count:
var client = AsyncSocket()
var client = asyncSocket()
when defined(ssl):
if useSSL:
ctx1.wrapSocket(client)
@ -56,7 +56,7 @@ proc launchSwarm(disp: var PDispatcher, port: TPort, count: int,
client.connect("localhost", port)
proc createSwarm(port: TPort, buffered = true, useSSL = false) =
var server = AsyncSocket()
var server = asyncSocket()
when defined(ssl):
if useSSL:
ctx.wrapSocket(server)

6
tests/async/tasyncudp.nim
View file

@ -42,14 +42,14 @@ proc swarmConnect(s: PAsyncSocket) =
proc createClient(disp: var PDispatcher, port: TPort,
buffered = true) =
currentClient.inc()
var client = AsyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
var client = asyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
buffered = buffered)
client.handleConnect = swarmConnect
disp.register(client)
client.connect("localhost", port)
proc createServer(port: TPort, buffered = true) =
var server = AsyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
var server = asyncSocket(typ = SOCK_DGRAM, protocol = IPPROTO_UDP,
buffered = buffered)
server.handleRead = serverRead
disp.register(server)
@ -75,4 +75,4 @@ while true:
break
assert msgCount == messagesToSend * serverCount * swarmSize
echo(msgCount)
echo(msgCount)