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

'nimfix' improvements; FdSet is TFdSet again

Browse source
This commit is contained in:
Araq 2014-09-08 08:46:35 +02:00
commit 7333237be6
11 changed files with 46 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pure/asyncftpclient.nim
View file

@ -1,6 +1,6 @@
#
#
# Nimrod's Runtime Library
# Nim's Runtime Library
# (c) Copyright 2014 Dominik Picheta
# See the file "copying.txt", included in this
# distribution, for details about the copyright.

10
lib/pure/asyncio.nim
View file

@ -91,10 +91,10 @@ import sockets, os
## getSocket(s).accept(client)
when defined(windows):
from winlean import TimeVal, SocketHandle, FdSet, FD_ZERO, FD_SET,
from winlean import TimeVal, SocketHandle, TFdSet, FD_ZERO, FD_SET,
fdSet, FD_ISSET, select
else:
from posix import TimeVal, SocketHandle, FdSet, FD_ZERO, FD_SET,
from posix import TimeVal, SocketHandle, TFdSet, FD_ZERO, FD_SET,
fdSet, FD_ISSET, select
type
@ -551,13 +551,13 @@ proc timeValFromMilliseconds(timeout = 500): Timeval =
result.tv_sec = seconds.int32
result.tv_usec = ((timeout - seconds * 1000) * 1000).int32
proc createFdSet(fd: var FdSet, s: seq[Delegate], m: var int) =
proc createFdSet(fd: var TFdSet, s: seq[Delegate], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i.fd))
fdSet(i.fd, fd)
proc pruneSocketSet(s: var seq[Delegate], fd: var FdSet) =
proc pruneSocketSet(s: var seq[Delegate], fd: var TFdSet) =
var i = 0
var L = s.len
while i < L:
@ -572,7 +572,7 @@ proc select(readfds, writefds, exceptfds: var seq[Delegate],
timeout = 500): int =
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var rd, wr, ex: FdSet
var rd, wr, ex: TFdSet
var m = 0
createFdSet(rd, readfds, m)
createFdSet(wr, writefds, m)

6
lib/pure/osproc.nim
View file

@ -883,13 +883,13 @@ elif not defined(useNimRtl):
else:
result = csystem(command)
proc createFdSet(fd: var FdSet, s: seq[Process], m: var int) =
proc createFdSet(fd: var TFdSet, s: seq[Process], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i.outHandle))
fdSet(cint(i.outHandle), fd)
proc pruneProcessSet(s: var seq[Process], fd: var FdSet) =
proc pruneProcessSet(s: var seq[Process], fd: var TFdSet) =
var i = 0
var L = s.len
while i < L:
@ -905,7 +905,7 @@ elif not defined(useNimRtl):
tv.tv_sec = 0
tv.tv_usec = timeout * 1000
var rd: FdSet
var rd: TFdSet
var m = 0
createFdSet((rd), readfds, m)

8
lib/pure/rawsockets.nim
View file

@ -361,13 +361,13 @@ proc timeValFromMilliseconds(timeout = 500): Timeval =
result.tv_sec = seconds.int32
result.tv_usec = ((timeout - seconds * 1000) * 1000).int32
proc createFdSet(fd: var FdSet, s: seq[SocketHandle], m: var int) =
proc createFdSet(fd: var TFdSet, s: seq[SocketHandle], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i))
fdSet(i, fd)
proc pruneSocketSet(s: var seq[SocketHandle], fd: var FdSet) =
proc pruneSocketSet(s: var seq[SocketHandle], fd: var TFdSet) =
var i = 0
var L = s.len
while i < L:
@ -388,7 +388,7 @@ proc select*(readfds: var seq[SocketHandle], timeout = 500): int =
## be read/written to or has errors (``exceptfds``).
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var rd: FdSet
var rd: TFdSet
var m = 0
createFdSet((rd), readfds, m)
@ -410,7 +410,7 @@ proc selectWrite*(writefds: var seq[SocketHandle],
## an unlimited time.
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var wr: FdSet
var wr: TFdSet
var m = 0
createFdSet((wr), writefds, m)

6
lib/pure/selectors.nim
View file

@ -218,7 +218,7 @@ elif not defined(nimdoc):
result.tv_sec = seconds.int32
result.tv_usec = ((timeout - seconds * 1000) * 1000).int32
proc createFdSet(rd, wr: var FdSet, fds: Table[SocketHandle, SelectorKey],
proc createFdSet(rd, wr: var TFdSet, fds: Table[SocketHandle, SelectorKey],
m: var int) =
FD_ZERO(rd); FD_ZERO(wr)
for k, v in pairs(fds):
@ -229,7 +229,7 @@ elif not defined(nimdoc):
m = max(m, int(k))
FD_SET(k, wr)
proc getReadyFDs(rd, wr: var FdSet, fds: Table[SocketHandle, SelectorKey]):
proc getReadyFDs(rd, wr: var TFdSet, fds: Table[SocketHandle, SelectorKey]):
seq[ReadyInfo] =
result = @[]
for k, v in pairs(fds):
@ -244,7 +244,7 @@ elif not defined(nimdoc):
seq[ReadyInfo] =
var tv {.noInit.}: TimeVal = timeValFromMilliseconds(timeout)
var rd, wr: FdSet
var rd, wr: TFdSet
var m = 0
createFdSet(rd, wr, fds, m)

12
lib/pure/sockets.nim
View file

@ -931,13 +931,13 @@ proc timeValFromMilliseconds(timeout = 500): Timeval =
result.tv_sec = seconds.int32
result.tv_usec = ((timeout - seconds * 1000) * 1000).int32
proc createFdSet(fd: var FdSet, s: seq[Socket], m: var int) =
proc createFdSet(fd: var TFdSet, s: seq[Socket], m: var int) =
FD_ZERO(fd)
for i in items(s):
m = max(m, int(i.fd))
fdSet(i.fd, fd)
proc pruneSocketSet(s: var seq[Socket], fd: var FdSet) =
proc pruneSocketSet(s: var seq[Socket], fd: var TFdSet) =
var i = 0
var L = s.len
while i < L:
@ -987,7 +987,7 @@ proc select*(readfds, writefds, exceptfds: var seq[Socket],
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var rd, wr, ex: FdSet
var rd, wr, ex: TFdSet
var m = 0
createFdSet((rd), readfds, m)
createFdSet((wr), writefds, m)
@ -1010,7 +1010,7 @@ proc select*(readfds, writefds: var seq[Socket],
return buffersFilled
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var rd, wr: FdSet
var rd, wr: TFdSet
var m = 0
createFdSet((rd), readfds, m)
createFdSet((wr), writefds, m)
@ -1034,7 +1034,7 @@ proc selectWrite*(writefds: var seq[Socket],
## an unlimited time.
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var wr: FdSet
var wr: TFdSet
var m = 0
createFdSet((wr), writefds, m)
@ -1052,7 +1052,7 @@ proc select*(readfds: var seq[Socket], timeout = 500): int =
return buffersFilled
var tv {.noInit.}: Timeval = timeValFromMilliseconds(timeout)
var rd: FdSet
var rd: TFdSet
var m = 0
createFdSet((rd), readfds, m)