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

Merge branch 'master' of github.com:Araq/Nimrod

Browse source
This commit is contained in:
Araq 2012-08-03 20:33:45 +02:00
commit c34df040be
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pure/asyncio.nim
View file

@ -101,9 +101,10 @@ type
lineBuffer: TaintedString ## Temporary storage for ``recvLine`` lineBuffer: TaintedString ## Temporary storage for ``recvLine``
sslNeedAccept: bool sslNeedAccept: bool
proto: TProtocol
TInfo* = enum TInfo* = enum
SockIdle, SockConnecting, SockConnected, SockListening, SockClosed SockIdle, SockConnecting, SockConnected, SockListening, SockClosed, SockUDPBound
TMode* = enum TMode* = enum
MReadable, MWriteable, MReadWrite MReadable, MWriteable, MReadWrite
@ -136,6 +137,7 @@ proc AsyncSocket*(domain: TDomain = AF_INET, typ: TType = SOCK_STREAM,
userArg: PObject = nil, buffered = true): PAsyncSocket = userArg: PObject = nil, buffered = true): PAsyncSocket =
result = newAsyncSocket(userArg) result = newAsyncSocket(userArg)
result.socket = socket(domain, typ, protocol, buffered) result.socket = socket(domain, typ, protocol, buffered)
result.proto = protocol
if result.socket == InvalidSocket: OSError() if result.socket == InvalidSocket: OSError()
result.socket.setBlocking(false) result.socket.setBlocking(false)
@ -201,6 +203,8 @@ proc close*(sock: PAsyncSocket) =
proc bindAddr*(sock: PAsyncSocket, port = TPort(0), address = "") = proc bindAddr*(sock: PAsyncSocket, port = TPort(0), address = "") =
## Equivalent to ``sockets.bindAddr``. ## Equivalent to ``sockets.bindAddr``.
sock.socket.bindAddr(port, address) sock.socket.bindAddr(port, address)
if sock.proto == IPPROTO_UDP:
sock.info = SockUDPBound
proc listen*(sock: PAsyncSocket) = proc listen*(sock: PAsyncSocket) =
## Equivalent to ``sockets.listen``. ## Equivalent to ``sockets.listen``.
@ -360,7 +364,7 @@ proc poll*(d: PDispatcher, timeout: int = 500): bool =
template deleg: expr = d.delegates[dc] template deleg: expr = d.delegates[dc]
let aSock = deleg.getSocket(deleg.deleVal) let aSock = deleg.getSocket(deleg.deleVal)
if (deleg.mode != MWriteable and aSock.info == SockConnected) or if (deleg.mode != MWriteable and aSock.info == SockConnected) or
aSock.info == SockListening: aSock.info == SockListening or aSock.info == SockUDPBound:
readSocks.add(aSock.sock) readSocks.add(aSock.sock)
if aSock.info == SockConnecting or if aSock.info == SockConnecting or
(aSock.info == SockConnected and deleg.mode != MReadable): (aSock.info == SockConnected and deleg.mode != MReadable):
@ -381,7 +385,8 @@ proc poll*(d: PDispatcher, timeout: int = 500): bool =
if i > len(d.delegates)-1: break # One delegate might've been removed. if i > len(d.delegates)-1: break # One delegate might've been removed.
let deleg = d.delegates[i] let deleg = d.delegates[i]
let sock = deleg.getSocket(deleg.deleVal) let sock = deleg.getSocket(deleg.deleVal)
if sock.info == SockConnected: if sock.info == SockConnected or
sock.info == SockUDPBound:
if deleg.mode != MWriteable and sock.sock notin readSocks: if deleg.mode != MWriteable and sock.sock notin readSocks:
if not (sock.info == SockConnecting): if not (sock.info == SockConnecting):
assert(not (sock.info == SockListening)) assert(not (sock.info == SockListening))