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

Less likely to overload struct timeval

Browse source
This commit is contained in:
Eric Doughty-Papassideris 2012-01-21 17:51:58 +01:00
commit 42e74aaf8e
1 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/pure/sockets.nim
View file

@ -428,6 +428,11 @@ proc connectAsync*(socket: TSocket, name: string, port = TPort(0),
if not success: OSError() if not success: OSError()
proc timeValFromMilliseconds(timeout = 500): TTimeVal =
if timeout != -1:
var seconds = timeout div 1000
result.tv_sec = seconds
result.tv_usec = (timeout - seconds * 1000) * 1000
#proc recvfrom*(s: TWinSocket, buf: cstring, len, flags: cint, #proc recvfrom*(s: TWinSocket, buf: cstring, len, flags: cint,
# fromm: ptr TSockAddr, fromlen: ptr cint): cint # fromm: ptr TSockAddr, fromlen: ptr cint): cint
@ -460,9 +465,7 @@ proc select*(readfds, writefds, exceptfds: var seq[TSocket],
## You can determine whether a socket is ready by checking if it's still ## You can determine whether a socket is ready by checking if it's still
## in one of the TSocket sequences. ## in one of the TSocket sequences.
var tv: TTimeVal var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
tv.tv_sec = 0
tv.tv_usec = timeout * 1000
var rd, wr, ex: TFdSet var rd, wr, ex: TFdSet
var m = 0 var m = 0
@ -480,10 +483,8 @@ proc select*(readfds, writefds, exceptfds: var seq[TSocket],
pruneSocketSet(exceptfds, (ex)) pruneSocketSet(exceptfds, (ex))
proc select*(readfds, writefds: var seq[TSocket], proc select*(readfds, writefds: var seq[TSocket],
timeout = 500): int = timeout = 500): int =
var tv: TTimeVal var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
tv.tv_sec = 0
tv.tv_usec = timeout * 1000
var rd, wr: TFdSet var rd, wr: TFdSet
var m = 0 var m = 0
@ -499,10 +500,8 @@ proc select*(readfds, writefds: var seq[TSocket],
pruneSocketSet(writefds, (wr)) pruneSocketSet(writefds, (wr))
proc selectWrite*(writefds: var seq[TSocket], proc selectWrite*(writefds: var seq[TSocket],
timeout = 500): int = timeout = 500): int =
var tv: TTimeVal var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
tv.tv_sec = 0
tv.tv_usec = timeout * 1000
var wr: TFdSet var wr: TFdSet
var m = 0 var m = 0
@ -515,11 +514,8 @@ proc selectWrite*(writefds: var seq[TSocket],
pruneSocketSet(writefds, (wr)) pruneSocketSet(writefds, (wr))
proc select*(readfds: var seq[TSocket], timeout = 500): int =
proc select*(readfds: var seq[TSocket], timeout = 500): int = var tv {.noInit.}: TTimeVal = timeValFromMilliseconds(timeout)
var tv: TTimeVal
tv.tv_sec = 0
tv.tv_usec = timeout * 1000
var rd: TFdSet var rd: TFdSet
var m = 0 var m = 0