diff options
| author | bptato <nincsnevem662@gmail.com> | 2025-02-11 16:17:09 +0100 |
|---|---|---|
| committer | bptato <nincsnevem662@gmail.com> | 2025-02-26 19:58:08 +0100 |
| commit | 55ffd92756faa3b60e3472404025a18509e0fce2 (patch) | |
| tree | 5ce18a089ad3c657a3270000d01f64f7b5717b6a /src | |
| parent | 7ba1c5de335468f77d891b31ab5d0536f1addd25 (diff) | |
| download | chawan-55ffd92756faa3b60e3472404025a18509e0fce2.tar.gz | |
dynstream: remove exceptions
Now we just pass down the value of n and check errno, plus
readDataLoop/writeDataLoop returns a bool indicating whether it failed.
For now this seems to work OK, but maybe I'll add a better abstraction
in the future.
EOFError is still used for handling failed packets; this is brittle,
and should be replaced once we have a proper buffering mechanism for
them. (That will also let us kill BufStream.)
Unrelated: this also fixes a bug in buffer with cacheId.
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/config.nim | 12 | ||||
| -rw-r--r-- | src/config/cookie.nim | 75 | ||||
| -rw-r--r-- | src/config/history.nim | 41 | ||||
| -rw-r--r-- | src/config/mailcap.nim | 13 | ||||
| -rw-r--r-- | src/html/dom.nim | 10 | ||||
| -rw-r--r-- | src/html/env.nim | 4 | ||||
| -rw-r--r-- | src/html/formdata.nim | 2 | ||||
| -rw-r--r-- | src/html/xmlhttprequest.nim | 11 | ||||
| -rw-r--r-- | src/io/bufreader.nim | 12 | ||||
| -rw-r--r-- | src/io/bufwriter.nim | 7 | ||||
| -rw-r--r-- | src/io/console.nim | 2 | ||||
| -rw-r--r-- | src/io/dynstream.nim | 274 | ||||
| -rw-r--r-- | src/local/container.nim | 24 | ||||
| -rw-r--r-- | src/local/pager.nim | 73 | ||||
| -rw-r--r-- | src/local/term.nim | 14 | ||||
| -rw-r--r-- | src/main.nim | 4 | ||||
| -rw-r--r-- | src/server/buffer.nim | 13 | ||||
| -rw-r--r-- | src/server/forkserver.nim | 2 | ||||
| -rw-r--r-- | src/server/loader.nim | 180 | ||||
| -rw-r--r-- | src/server/response.nim | 21 | ||||
| -rw-r--r-- | src/types/formdata.nim | 9 |
21 files changed, 386 insertions, 417 deletions
diff --git a/src/config/config.nim b/src/config/config.nim index 8f49bc80..3909e46c 100644 --- a/src/config/config.nim +++ b/src/config/config.nim @@ -317,7 +317,7 @@ proc readUserStylesheet(outs: var string; dir, file: string) = raise newException(ValueError, x.error) let ps = newPosixStream(x.get) if ps != nil: - outs &= ps.recvAll() + outs &= ps.readAll() ps.sclose() type ConfigParser = object @@ -667,7 +667,7 @@ proc parseConfigValue(ctx: var ConfigParser; x: var MimeTypes; v: TomlValue; for p in paths: let ps = newPosixStream(p) if ps != nil: - let src = ps.recvAllOrMmap() + let src = ps.readAllOrMmap() x.parseMimeTypes(src.toOpenArray(), DefaultImages) deallocMem(src) ps.sclose() @@ -680,7 +680,7 @@ proc parseConfigValue(ctx: var ConfigParser; x: var Mailcap; v: TomlValue; for p in paths: let ps = newPosixStream(p) if ps != nil: - let src = ps.recvAllOrMmap() + let src = ps.readAllOrMmap() let res = x.parseMailcap(src.toOpenArray()) deallocMem(src) ps.sclose() @@ -699,7 +699,7 @@ proc parseConfigValue(ctx: var ConfigParser; x: var AutoMailcap; x = AutoMailcap(path: path) let ps = newPosixStream(path) if ps != nil: - let src = ps.recvAllOrMmap() + let src = ps.readAllOrMmap() let res = x.entries.parseMailcap(src.toOpenArray()) deallocMem(src) ps.sclose() @@ -717,7 +717,7 @@ proc parseConfigValue(ctx: var ConfigParser; x: var URIMethodMap; v: TomlValue; for p in paths: let ps = newPosixStream(p) if ps != nil: - x.parseURIMethodMap(ps.recvAll()) + x.parseURIMethodMap(ps.readAll()) ps.sclose() x.append(DefaultURIMethodMap) @@ -759,7 +759,7 @@ proc parseConfig(config: Config; dir: string; t: TomlValue; let ps = newPosixStream(s) if ps == nil: return err("include file not found: " & s) - ?config.parseConfig(dir, ps.recvAll(), warnings) + ?config.parseConfig(dir, ps.readAll(), warnings) ps.sclose() warnings.add(ctx.warnings) return ok() diff --git a/src/config/cookie.nim b/src/config/cookie.nim index fc5d50e2..5a3d9243 100644 --- a/src/config/cookie.nim +++ b/src/config/cookie.nim @@ -340,15 +340,11 @@ proc parse(map: CookieJarMap; iq: openArray[char]; warnings: var seq[string]) = # Consumes `ps'. proc parse*(map: CookieJarMap; ps: PosixStream; mtime: int64; warnings: var seq[string]) = - try: - let src = ps.recvAllOrMmap() - map.parse(src.toOpenArray(), warnings) - deallocMem(src) - map.mtime = mtime - except IOError: - discard - finally: - ps.sclose() + let src = ps.readAllOrMmap() + map.parse(src.toOpenArray(), warnings) + deallocMem(src) + map.mtime = mtime + ps.sclose() proc c_rename(oldname, newname: cstring): cint {.importc: "rename", header: "<stdio.h>".} @@ -372,42 +368,41 @@ proc write*(map: CookieJarMap; file: string): bool = let ps = newPosixStream(tmp, O_WRONLY or O_CREAT, 0o600) var i = 0 let time = getTime().toUnix() - try: - if ps != nil: - var buf = """ + if ps != nil: + var buf = """ # Netscape HTTP Cookie file # Autogenerated by Chawan. Manually added cookies are normally # preserved, but comments will be lost. """ - for name, jar in map.jars: - for cookie in jar.cookies: - if cookie.expires <= time or not cookie.persist: - continue # session cookie - if buf.len >= 4096: # flush - ps.sendDataLoop(buf) - buf.setLen(0) - if cookie.httpOnly: - buf &= "#HttpOnly_" - if cookie.domain != name: - buf &= name & "@" - if not cookie.hostOnly: - buf &= '.' - buf &= cookie.domain & '\t' - const BoolMap = [false: "FALSE", true: "TRUE"] - buf &= BoolMap[not cookie.hostOnly] & '\t' # flipped intentionally - buf &= cookie.path & '\t' - buf &= BoolMap[cookie.secure] & '\t' - buf &= $cookie.expires & '\t' - buf &= cookie.name & '\t' - buf &= cookie.value & '\n' - inc i - if buf.len > 0: - ps.sendDataLoop(buf) - except IOError: - return false - finally: - ps.sclose() + for name, jar in map.jars: + for cookie in jar.cookies: + if cookie.expires <= time or not cookie.persist: + continue # session cookie + if buf.len >= 4096: # flush + if not ps.writeDataLoop(buf): + ps.sclose() + return false + buf.setLen(0) + if cookie.httpOnly: + buf &= "#HttpOnly_" + if cookie.domain != name: + buf &= name & "@" + if not cookie.hostOnly: + buf &= '.' + buf &= cookie.domain & '\t' + const BoolMap = [false: "FALSE", true: "TRUE"] + buf &= BoolMap[not cookie.hostOnly] & '\t' # flipped intentionally + buf &= cookie.path & '\t' + buf &= BoolMap[cookie.secure] & '\t' + buf &= $cookie.expires & '\t' + buf &= cookie.name & '\t' + buf &= cookie.value & '\n' + inc i + if buf.len > 0: + if not ps.writeDataLoop(buf): + ps.sclose() + return false if i == 0: discard unlink(cstring(tmp)) discard unlink(cstring(file)) diff --git a/src/config/history.nim b/src/config/history.nim index 34da7762..40cc33aa 100644 --- a/src/config/history.nim +++ b/src/config/history.nim @@ -67,7 +67,7 @@ proc parse(hist: History; iq: openArray[char]) = # Consumes `ps'. proc parse*(hist: History; ps: PosixStream; mtime: int64): bool = try: - let src = ps.recvAllOrMmap() + let src = ps.readAllOrMmap() hist.parse(src.toOpenArray()) hist.mtime = mtime deallocMem(src) @@ -82,26 +82,25 @@ proc c_rename(oldname, newname: cstring): cint {.importc: "rename", # Consumes `ps'. proc write*(hist: History; ps: PosixStream; reverse = false): bool = - try: - var buf = "" - var entry = if reverse: hist.last else: hist.first - while entry != nil: - buf &= entry.s - buf &= '\n' - if buf.len >= 4096: - ps.sendDataLoop(buf) - buf = "" - if reverse: - entry = entry.prev - else: - entry = entry.next - if buf.len > 0: - ps.sendDataLoop(buf) - except IOError: - return false - finally: - ps.sclose() - return true + var buf = "" + var entry = if reverse: hist.last else: hist.first + var res = true + while entry != nil: + buf &= entry.s + buf &= '\n' + if buf.len >= 4096: + if not ps.writeDataLoop(buf): + res = false + break + buf = "" + if reverse: + entry = entry.prev + else: + entry = entry.next + if buf.len > 0 and not ps.writeDataLoop(buf): + res = false + ps.sclose() + return res proc write*(hist: History; file: string): bool = let ps = newPosixStream(file) diff --git a/src/config/mailcap.nim b/src/config/mailcap.nim index 93d1283e..27201753 100644 --- a/src/config/mailcap.nim +++ b/src/config/mailcap.nim @@ -342,11 +342,8 @@ proc saveEntry*(mailcap: var AutoMailcap; entry: MailcapEntry): bool = let ps = newPosixStream(mailcap.path, O_WRONLY or O_APPEND or O_CREAT, 0o644) if ps == nil: return false - try: - ps.sendDataLoop(s) - except IOError: - return false - finally: - ps.sclose() - mailcap.entries.add(entry) - return true + let res = ps.writeDataLoop(s) + if res: + mailcap.entries.add(entry) + ps.sclose() + return res diff --git a/src/html/dom.nim b/src/html/dom.nim index 33718f49..5f236af6 100644 --- a/src/html/dom.nim +++ b/src/html/dom.nim @@ -4307,12 +4307,10 @@ proc loadResource*(window: Window; svg: SVGSVGElement) = if ps == nil: return let cacheId = loader.addCacheFile(svgres.outputId, loader.clientPid) - try: - ps.sendDataLoop(s) - except IOError: - return - finally: + if not ps.writeDataLoop(s): ps.sclose() + return + ps.sclose() let request = newRequest( newURL("img-codec+svg+xml:decode").get, httpMethod = hmPost, @@ -5279,7 +5277,7 @@ proc fetchClassicScript(element: HTMLScriptElement; url: URL; element.onComplete(ScriptResult(t: srtNull)) return response.resume() - let s = response.body.recvAll() + let s = response.body.readAll() let cs = if cs == CHARSET_UNKNOWN: CHARSET_UTF_8 else: cs let source = s.decodeAll(cs) response.body.sclose() diff --git a/src/html/env.nim b/src/html/env.nim index 6c38fdd3..019412c7 100644 --- a/src/html/env.nim +++ b/src/html/env.nim @@ -187,7 +187,7 @@ proc getRandomValues(ctx: JSContext; crypto: var Crypto; array: JSValue): "TypeMismatchError") if view.abuf.len > 65536: return JS_ThrowDOMException(ctx, "Too large array", "QuotaExceededError") - crypto.urandom.recvDataLoop(view.abuf.p, int(view.abuf.len)) + doAssert crypto.urandom.readDataLoop(view.abuf.p, int(view.abuf.len)) return JS_DupValue(ctx, array) proc addNavigatorModule*(ctx: JSContext) = @@ -360,7 +360,7 @@ proc loadJSModule(ctx: JSContext; moduleName: cstringConst; opaque: pointer): JS_ThrowTypeError(ctx, "Failed to load module %s", cstring(moduleName)) return nil response.resume() - let source = response.body.recvAll() + let source = response.body.readAll() response.close() return ctx.finishLoadModule(source, moduleName) diff --git a/src/html/formdata.nim b/src/html/formdata.nim index 7bbd1402..a2e7eb82 100644 --- a/src/html/formdata.nim +++ b/src/html/formdata.nim @@ -17,7 +17,7 @@ proc constructEntryList*(form: HTMLFormElement; submitter: Element = nil; proc generateBoundary(urandom: PosixStream): string = var s {.noinit.}: array[33, uint8] - urandom.recvDataLoop(s) + doAssert urandom.readDataLoop(s) # 33 * 4 / 3 = 44 + prefix string is 22 bytes = 66 bytes return "----WebKitFormBoundary" & btoa(s) diff --git a/src/html/xmlhttprequest.nim b/src/html/xmlhttprequest.nim index 96a2a19c..fc57d531 100644 --- a/src/html/xmlhttprequest.nim +++ b/src/html/xmlhttprequest.nim @@ -241,14 +241,11 @@ proc onReadXHR(response: Response) = while true: let olen = this.received.len this.received.setLen(olen + BufferSize) - try: - let n = response.body.recvData(addr this.received[olen], BufferSize) - this.received.setLen(olen + n) - if n == 0: - break - except ErrorAgain: + let n = response.body.readData(addr this.received[olen], BufferSize) + if n <= 0: this.received.setLen(olen) break + this.received.setLen(olen + n) if this.readyState == xhrsHeadersReceived: this.readyState = xhrsLoading window.fireEvent(satReadystatechange, this) @@ -340,7 +337,7 @@ proc send(ctx: JSContext; this: XMLHttpRequest; body = JS_NULL): JSResult[void] #TODO timeout response.resume() try: - this.received = response.body.recvAll() + this.received = response.body.readAll() #TODO report timing let len = max(response.getContentLength(), 0) response.opaque = XHROpaque(this: this, window: window, len: len) diff --git a/src/io/bufreader.nim b/src/io/bufreader.nim index 203a2e52..271a3671 100644 --- a/src/io/bufreader.nim +++ b/src/io/bufreader.nim @@ -33,15 +33,21 @@ proc initReader*(stream: DynStream; len, auxLen: int): BufferedReader = recvAux: newSeqUninitialized[cint](auxLen), bufIdx: 0 ) - stream.recvDataLoop(reader.buffer) + if not stream.readDataLoop(reader.buffer): + raise newException(EOFError, "end of file") if auxLen > 0: # bufwriter added ancillary data. - SocketStream(stream).recvFds(reader.recvAux) + var dummy {.noinit.}: array[1, uint8] + var numFds = 0 + let n = SocketStream(stream).recvMsg(dummy, reader.recvAux, numFds) + if n < dummy.len or numFds < auxLen: + raise newException(EOFError, "end of file") return reader proc initPacketReader*(stream: DynStream): BufferedReader = var len {.noinit.}: array[2, int] - stream.recvDataLoop(addr len[0], sizeof(len)) + if not stream.readDataLoop(addr len[0], sizeof(len)): + raise newException(EOFError, "end of file") return stream.initReader(len[0], len[1]) template withPacketReader*(stream: DynStream; r, body: untyped) = diff --git a/src/io/bufwriter.nim b/src/io/bufwriter.nim index 89b5345c..3a347a52 100644 --- a/src/io/bufwriter.nim +++ b/src/io/bufwriter.nim @@ -54,10 +54,13 @@ proc flush*(writer: var BufferedWriter) = # subtract the length field's size let len = [writer.bufLen - InitLen, writer.sendAux.len] copyMem(writer.buffer, unsafeAddr len[0], sizeof(len)) - writer.stream.sendDataLoop(writer.buffer, writer.bufLen) + if not writer.stream.writeDataLoop(writer.buffer, writer.bufLen): + raise newException(EOFError, "end of file") if writer.sendAux.len > 0: writer.sendAux.reverse() - SocketStream(writer.stream).sendFds(writer.sendAux) + let n = SocketStream(writer.stream).sendMsg([0u8], writer.sendAux) + if n < 1: + raise newException(EOFError, "end of file") writer.bufLen = 0 proc deinit*(writer: var BufferedWriter) = diff --git a/src/io/console.nim b/src/io/console.nim index 2e61fea3..87260353 100644 --- a/src/io/console.nim +++ b/src/io/console.nim @@ -82,4 +82,4 @@ proc addConsoleModule*(ctx: JSContext) = proc writeException*(ctx: JSContext; s: DynStream) = s.write(ctx.getExceptionMsg()) - s.sflush() + discard s.flush() diff --git a/src/io/dynstream.nim b/src/io/dynstream.nim index 240f9ac2..5fce2bfe 100644 --- a/src/io/dynstream.nim +++ b/src/io/dynstream.nim @@ -5,80 +5,104 @@ type isend*: bool closed: bool -# Semantics of this function are those of POSIX read(3): that is, it may return -# a result that is lower than `len`, and that does not mean the stream is -# finished. -# isend must be set by implementations when the end of the stream is reached. -# An exception should be raised if recvData is called with the 'isend' flag set -# to true. -method recvData*(s: DynStream; buffer: pointer; len: int): int {.base.} = +# Semantics of this function are those of POSIX read(3): that is, it +# may return a result that is lower than `len`, and that does not mean +# the stream is finished. +# isend must be set by implementations when the end of the stream is +# reached. +# An exception should be raised if readData is called with the 'isend' +# flag set to true. (TODO just assert...) +method readData*(s: DynStream; buffer: pointer; len: int): int {.base.} = doAssert false # See above, but with write(2) -method sendData*(s: DynStream; buffer: pointer; len: int): int {.base.} = +method writeData*(s: DynStream; buffer: pointer; len: int): int {.base.} = doAssert false -method seek*(s: DynStream; off: int) {.base.} = +method seek*(s: DynStream; off: int64): int64 {.base.} = doAssert false method sclose*(s: DynStream) {.base.} = doAssert false -method sflush*(s: DynStream) {.base.} = - discard +method flush*(s: DynStream): bool {.base.} = + true -proc recvData*(s: DynStream; buffer: var openArray[uint8]): int {.inline.} = - return s.recvData(addr buffer[0], buffer.len) +proc readData*(s: DynStream; buffer: var openArray[uint8]): int {.inline.} = + return s.readData(addr buffer[0], buffer.len) -proc recvData*(s: DynStream; buffer: var openArray[char]): int {.inline.} = - return s.recvData(addr buffer[0], buffer.len) +proc readData*(s: DynStream; buffer: var openArray[char]): int {.inline.} = + return s.readData(addr buffer[0], buffer.len) -proc sendData*(s: DynStream; buffer: openArray[char]): int {.inline.} = - return s.sendData(unsafeAddr buffer[0], buffer.len) +proc writeData*(s: DynStream; buffer: openArray[char]): int {.inline.} = + return s.writeData(unsafeAddr buffer[0], buffer.len) -proc sendData*(s: DynStream; buffer: openArray[uint8]): int {.inline.} = - return s.sendData(unsafeAddr buffer[0], buffer.len) +proc writeData*(s: DynStream; buffer: openArray[uint8]): int {.inline.} = + return s.writeData(unsafeAddr buffer[0], buffer.len) -proc sendDataLoop*(s: DynStream; buffer: pointer; len: int) = +proc readDataLoop*(s: DynStream; buffer: pointer; len: int): bool = var n = 0 - while true: - n += s.sendData(addr cast[ptr UncheckedArray[uint8]](buffer)[n], len - n) - if n == len: - break + while n < len: + let m = s.readData(addr cast[ptr UncheckedArray[uint8]](buffer)[n], len - n) + if m <= 0: + return false + n += m + return true + +proc readDataLoop*(s: DynStream; buffer: var openArray[uint8]): bool + {.inline.} = + if buffer.len == 0: + return true + return s.readDataLoop(addr buffer[0], buffer.len) + +proc readDataLoop*(s: DynStream; buffer: var openArray[char]): bool {.inline.} = + if buffer.len == 0: + return true + return s.readDataLoop(addr buffer[0], buffer.len) -proc sendDataLoop*(s: DynStream; buffer: openArray[uint8]) {.inline.} = +proc writeDataLoop*(s: DynStream; buffer: pointer; len: int): bool = + var n = 0 + while n < len: + let p = addr cast[ptr UncheckedArray[uint8]](buffer)[n] + let m = s.writeData(p, len - n) + if m <= 0: + return false + n += m + return true + +proc writeDataLoop*(s: DynStream; buffer: openArray[uint8]): bool {.inline.} = if buffer.len > 0: - s.sendDataLoop(unsafeAddr buffer[0], buffer.len) + return s.writeDataLoop(unsafeAddr buffer[0], buffer.len) + return true -proc sendDataLoop*(s: DynStream; buffer: openArray[char]) {.inline.} = +proc writeDataLoop*(s: DynStream; buffer: openArray[char]): bool {.inline.} = if buffer.len > 0: - s.sendDataLoop(unsafeAddr buffer[0], buffer.len) + return s.writeDataLoop(unsafeAddr buffer[0], buffer.len) + return true proc write*(s: DynStream; buffer: openArray[char]) {.inline.} = - s.sendDataLoop(buffer) + discard s.writeDataLoop(buffer) proc write*(s: DynStream; c: char) {.inline.} = - s.sendDataLoop(unsafeAddr c, 1) - -proc recvDataLoop*(s: DynStream; buffer: pointer; len: int) = - var n = 0 - while n < len: - n += s.recvData(addr cast[ptr UncheckedArray[uint8]](buffer)[n], len - n) + s.write([c]) -proc recvDataLoop*(s: DynStream; buffer: var openArray[uint8]) {.inline.} = - if buffer.len > 0: - s.recvDataLoop(addr buffer[0], buffer.len) +proc setEnd(s: DynStream) = + if unlikely(s.isend): + raise newException(EOFError, "end of file") + s.isend = true -proc recvDataLoop*(s: DynStream; buffer: var openArray[char]) {.inline.} = - if buffer.len > 0: - s.recvDataLoop(addr buffer[0], buffer.len) +type + PosixStream* = ref object of DynStream + fd*: cint + blocking*: bool -proc recvAll*(s: DynStream): string = +proc readAll*(s: PosixStream): string = + assert s.blocking var buffer = newString(4096) var idx = 0 while true: - let n = s.recvData(addr buffer[idx], buffer.len - idx) - if n == 0: + let n = s.readData(addr buffer[idx], buffer.len - idx) + if n <= 0: break idx += n if idx == buffer.len: @@ -86,46 +110,8 @@ proc recvAll*(s: DynStream): string = buffer.setLen(idx) return buffer -proc setEnd(s: DynStream) = - if unlikely(s.isend): - raise newException(EOFError, "eof") - s.isend = true - -type - PosixStream* = ref object of DynStream - fd*: cint - blocking*: bool - - ErrorAgain* = object of IOError - ErrorBadFD* = object of IOError - ErrorFault* = object of IOError - ErrorInterrupted* = object of IOError - ErrorInvalid* = object of IOError - ErrorConnectionReset* = object of IOError - ErrorBrokenPipe* = object of IOError - -proc raisePosixIOError() = - # In the nim stdlib, these are only constants on linux amd64, so we - # can't use a switch. - if errno == EAGAIN or errno == EWOULDBLOCK: - raise newException(ErrorAgain, "eagain") - elif errno == EBADF: - raise newException(ErrorBadFD, "bad fd") - elif errno == EFAULT: - raise newException(ErrorFault, "fault") - elif errno == EINVAL: - raise newException(ErrorInvalid, "invalid") - elif errno == ECONNRESET: - raise newException(ErrorConnectionReset, "connection reset by peer") - elif errno == EPIPE: - raise newException(ErrorBrokenPipe, "broken pipe") - else: - raise newException(IOError, $strerror(errno)) - -method recvData*(s: PosixStream; buffer: pointer; len: int): int = +method readData*(s: PosixStream; buffer: pointer; len: int): int = let n = read(s.fd, buffer, len) - if n < 0: - raisePosixIOError() if n == 0: s.setEnd() return n @@ -134,11 +120,8 @@ proc readChar*(s: PosixStream): char = let n = read(s.fd, addr result, 1) assert n == 1 -method sendData*(s: PosixStream; buffer: pointer; len: int): int = - let n = write(s.fd, buffer, len) - if n < 0: - raisePosixIOError() - return n +method writeData*(s: PosixStream; buffer: pointer; len: int): int = + return write(s.fd, buffer, len) method setBlocking*(s: PosixStream; blocking: bool) {.base.} = s.blocking = blocking @@ -148,9 +131,8 @@ method setBlocking*(s: PosixStream; blocking: bool) {.base.} = else: discard fcntl(s.fd, F_SETFL, ofl or O_NONBLOCK) -method seek*(s: PosixStream; off: int) = - if lseek(s.fd, Off(off), SEEK_SET) == -1: - raisePosixIOError() +method seek*(s: PosixStream; off: int64): int64 = + return int64(lseek(s.fd, Off(off), SEEK_SET)) method sclose*(s: PosixStream) = assert not s.closed @@ -249,13 +231,14 @@ proc mmap*(ps: PosixStream): MaybeMappedMemory = # Read data of size "len", or mmap it if the stream is a file. # This may return nil. -proc recvDataLoopOrMmap*(ps: PosixStream; ilen: int): MaybeMappedMemory = +proc readDataLoopOrMmap*(ps: PosixStream; ilen: int): MaybeMappedMemory = var stats: Stat if fstat(ps.fd, stats) != -1 and S_ISREG(stats.st_mode): return ps.mmap(stats, ilen) let res = create(MaybeMappedMemoryObj) let p = cast[ptr UncheckedArray[uint8]](alloc(ilen)) - ps.recvDataLoop(p, ilen) + if not ps.readDataLoop(p, ilen): + return nil res[] = MaybeMappedMemoryObj( t: mmmtAlloc, p0: p, @@ -265,9 +248,9 @@ proc recvDataLoopOrMmap*(ps: PosixStream; ilen: int): MaybeMappedMemory = ) return res -# Try to mmap the file, and fall back to recvAll if it fails. +# Try to mmap the file, and fall back to readAll if it fails. # This never returns nil. -proc recvAllOrMmap*(ps: PosixStream): MaybeMappedMemory = +proc readAllOrMmap*(ps: PosixStream): MaybeMappedMemory = var stats: Stat if fstat(ps.fd, stats) != -1 and S_ISREG(stats.st_mode): let res = ps.mmap(stats, -1) @@ -275,7 +258,7 @@ proc recvAllOrMmap*(ps: PosixStream): MaybeMappedMemory = return res let res = create(MaybeMappedMemoryObj) let s = new(string) - s[] = ps.recvAll() + s[] = ps.readAll() GC_ref(s) let p = if s[].len > 0: cast[ptr UncheckedArray[uint8]](addr s[][0]) @@ -293,10 +276,9 @@ proc recvAllOrMmap*(ps: PosixStream): MaybeMappedMemory = proc maybeMmapForSend*(ps: PosixStream; len: int): MaybeMappedMemory = var stats: Stat if fstat(0, stats) != -1 and S_ISREG(stats.st_mode): - try: - ps.seek(len - 1) - ps.sendDataLoop([char(0)]) - except IOError: + if ps.seek(len - 1) < 0: + return nil + if not ps.writeDataLoop([char(0)]): return nil let p0 = mmap(nil, len, PROT_WRITE, MAP_SHARED, ps.fd, 0) if p0 == MAP_FAILED: @@ -324,10 +306,11 @@ proc maybeMmapForSend*(ps: PosixStream; len: int): MaybeMappedMemory = template toOpenArray*(mem: MaybeMappedMemory): openArray[char] = cast[ptr UncheckedArray[char]](mem.p).toOpenArray(0, mem.len - 1) -proc sendDataLoop*(ps: PosixStream; mem: MaybeMappedMemory) = +proc writeDataLoop*(ps: PosixStream; mem: MaybeMappedMemory): bool = # only send if not mmapped; otherwise everything is already where it should be if mem.t != mmmtMmap: - ps.sendDataLoop(mem.toOpenArray()) + return ps.writeDataLoop(mem.toOpenArray()) + return true template dealloc*(mem: MaybeMappedMemory) {.error: "use deallocMem".} = discard @@ -343,10 +326,7 @@ proc deallocMem*(mem: MaybeMappedMemory) = proc drain*(ps: PosixStream) = assert not ps.blocking var buffer {.noinit.}: array[4096, uint8] - try: - while true: - discard ps.recvData(addr buffer[0], buffer.len) - except ErrorAgain: + while ps.readData(buffer) > 0: discard proc setCloseOnExec*(ps: PosixStream) = @@ -357,10 +337,8 @@ type SocketStream* = ref object of PosixStream proc sendMsg*(s: SocketStream; buffer: openArray[uint8]; sendAux: openArray[cint]): int = - var dummy = 0u8 - var iov = IOVec(iov_base: addr dummy, iov_len: 1) - if buffer.len > 0: - iov = IOVec(iov_base: unsafeAddr buffer[0], iov_len: csize_t(buffer.len)) + assert buffer.len > 0 + var iov = IOVec(iov_base: unsafeAddr buffer[0], iov_len: csize_t(buffer.len)) let sendAuxSize = sizeof(cint) * sendAux.len let controlLen = CMSG_SPACE(csize_t(sendAuxSize)) var cmsgBuf = newSeqUninitialized[uint8](controlLen) @@ -376,19 +354,12 @@ proc sendMsg*(s: SocketStream; buffer: openArray[uint8]; cmsg.cmsg_type = SCM_RIGHTS if sendAux.len > 0: copyMem(CMSG_DATA(cmsg), unsafeAddr sendAux[0], sendAuxSize) - let n = sendmsg(SocketHandle(s.fd), addr hdr, 0) - if n < 0: - raisePosixIOError() - if n == 0: - s.setEnd() - return n + return sendmsg(SocketHandle(s.fd), addr hdr, 0) proc recvMsg*(s: SocketStream; buffer: var openArray[uint8]; fdbuf: var openArray[cint]; numFds: out int): int = - var dummy {.noinit.}: uint8 - var iov = IOVec(iov_base: addr dummy, iov_len: 1) - if buffer.len > 0: - iov = IOVec(iov_base: addr buffer[0], iov_len: csize_t(buffer.len)) + assert buffer.len > 0 + var iov = IOVec(iov_base: addr buffer[0], iov_len: csize_t(buffer.len)) let fdbufSize = sizeof(cint) * fdbuf.len let controlLen = CMSG_SPACE(csize_t(fdbufSize)) var cmsgBuf = newSeqUninitialized[uint8](controlLen) @@ -399,10 +370,8 @@ proc recvMsg*(s: SocketStream; buffer: var openArray[uint8]; msg_controllen: SockLen(controlLen) ) let n = recvmsg(SocketHandle(s.fd), addr hdr, 0) - if n < 0: - raisePosixIOError() - if n < buffer.len: - raise newException(EOFError, "eof") + if n <= 0: + return n numFds = 0 var cmsg = CMSG_FIRSTHDR(addr hdr) while cmsg != nil: @@ -413,20 +382,13 @@ proc recvMsg*(s: SocketStream; buffer: var openArray[uint8]; copyMem(addr fdbuf[numFds], data, size) numFds += size div sizeof(cint) else: - #TODO may want to add an OOB mechanism to signal malformed messages + #TODO we could just return -2 here, but I'm not sure if it can + # ever happen assert false cmsg = CMSG_NXTHDR(addr hdr, cmsg) + return n -proc sendFds*(s: SocketStream; fds: openArray[cint]) = - discard s.sendMsg([], fds) - -proc recvFds*(s: SocketStream; fds: var openArray[cint]) = - var dummy {.noinit.}: array[1, uint8] - var numFds: int - discard s.recvMsg(dummy, fds, numFds) - assert fds.len == numFds - -method seek*(s: SocketStream; off: int) = +method seek*(s: SocketStream; off: int64): int64 = doAssert false proc newSocketStream*(fd: cint): SocketStream = @@ -439,20 +401,20 @@ type registered: bool writeBuffer: string -method recvData*(s: BufStream; buffer: pointer; len: int): int = - s.source.recvData(buffer, len) +method readData*(s: BufStream; buffer: pointer; len: int): int = + s.source.readData(buffer, len) -method sendData*(s: BufStream; buffer: pointer; len: int): int = +method writeData*(s: BufStream; buffer: pointer; len: int): int = s.source.setBlocking(false) block nobuf: var n: int if not s.registered: - try: - n = s.source.sendData(buffer, len) - if n == len: - break nobuf - except ErrorAgain: - discard + n = s.source.writeData(buffer, len) + if n == len: + break nobuf + let e = errno + if n == -1 and e != EAGAIN and e != EWOULDBLOCK: + return -1 s.registerFun(s.source.fd) s.registered = true let olen = s.writeBuffer.len @@ -469,7 +431,9 @@ method sclose*(s: BufStream) = proc flushWrite*(s: BufStream): bool = s.source.setBlocking(false) - let n = s.source.sendData(s.writeBuffer) + let n = s.source.writeData(s.writeBuffer) + if n == -1: + return false s.source.setBlocking(true) if n == s.writeBuffer.len: s.writeBuffer = "" @@ -478,9 +442,8 @@ proc flushWrite*(s: BufStream): bool = s.writeBuffer = s.writeBuffer.substr(n) return false -method sflush*(s: BufStream) = - if s.writeBuffer.len > 0: - s.source.sendDataLoop(s.writeBuffer) +method flush*(s: BufStream): bool = + return s.source.writeDataLoop(s.writeBuffer) proc newBufStream*(s: SocketStream; registerFun: proc(fd: int)): BufStream = return BufStream(source: s, registerFun: registerFun) @@ -489,25 +452,28 @@ type DynFileStream* = ref object of DynStream file*: File -method recvData*(s: DynFileStream; buffer: pointer; len: int): int = +method readData*(s: DynFileStream; buffer: pointer; len: int): int = let n = s.file.readBuffer(buffer, len) if n == 0: s.setEnd() return n -method sendData*(s: DynFileStream; buffer: pointer; len: int): int = +method writeData*(s: DynFileStream; buffer: pointer; len: int): int = return s.file.writeBuffer(buffer, len) -method seek*(s: DynFileStream; off: int) = - s.file.setFilePos(int64(off)) +method seek*(s: DynFileStream; off: int64): int64 = + s.file.setFilePos(off) + return off method sclose*(s: DynFileStream) = assert not s.closed s.file.close() s.closed = true -method sflush*(s: DynFileStream) = - s.file.flushFile() +proc c_fflush(f: File): cint {.importc: "fflush", header: "<stdio.h>".} + +method flush*(s: DynFileStream): bool = + return c_fflush(s.file) == 0 proc newDynFileStream*(file: File): DynFileStream = return DynFileStream(file: file) diff --git a/src/local/container.nim b/src/local/container.nim index 0039197d..980e95bc 100644 --- a/src/local/container.nim +++ b/src/local/container.nim @@ -1596,7 +1596,7 @@ proc readCanceled*(container: Container) = proc readSuccess*(container: Container; s: string; fd: cint = -1) = let p = container.iface.readSuccess(s, fd != -1) if fd != -1: - container.iface.stream.sflush() + doAssert container.iface.stream.flush() container.iface.stream.source.withPacketWriter w: w.sendAux.add(fd) p.then(proc(res: Request) = @@ -1707,11 +1707,14 @@ func hoverImage(container: Container): string {.jsfget.} = func hoverCachedImage(container: Container): string {.jsfget.} = return container.hoverText[htCachedImage] -proc handleCommand(container: Container) = +# Returns false on I/O error. +proc handleCommand(container: Container): bool = var packet {.noinit.}: array[3, int] # 0 len, 1 auxLen, 2 packetid - container.iface.stream.recvDataLoop(addr packet[0], sizeof(packet)) + if not container.iface.stream.readDataLoop(addr packet[0], sizeof(packet)): + return false assert packet[1] == 0 # no ancillary data possible for BufStream container.iface.resolve(packet[2], packet[0] - sizeof(packet[2]), packet[1]) + return true proc startLoad(container: Container) = if container.config.headless == hmFalse: @@ -1755,7 +1758,9 @@ proc onReadLine(container: Container; w: Slice[int]; return newResolvedPromise() # Synchronously read all lines in the buffer. -proc readLines*(container: Container; handle: proc(line: SimpleFlexibleLine)) = +# Returns false on I/O error. +proc readLines*(container: Container; handle: proc(line: SimpleFlexibleLine)): + bool = # load succeded let w = 0 .. 23 container.iface.getLines(w).then(proc(res: GetLinesResult): EmptyPromise = @@ -1772,7 +1777,9 @@ proc readLines*(container: Container; handle: proc(line: SimpleFlexibleLine)) = ) while container.iface.hasPromises: # fulfill all promises - container.handleCommand() + if not container.handleCommand(): + return false + return true proc drawLines*(container: Container; display: var FixedGrid; hlcolor: CellColor) = let bgcolor = container.bgcolor @@ -1864,11 +1871,14 @@ func findCachedImage*(container: Container; image: PosBitmap; return it return nil -proc handleEvent*(container: Container) = - container.handleCommand() +# Returns false on I/O error. +proc handleEvent*(container: Container): bool = + if not container.handleCommand(): + return false if container.needslines: container.requestLines() container.needslines = false + return true proc addContainerModule*(ctx: JSContext) = ctx.registerType(Highlight) diff --git a/src/local/pager.nim b/src/local/pager.nim index 457cde8d..ca067c3d 100644 --- a/src/local/pager.nim +++ b/src/local/pager.nim @@ -968,9 +968,9 @@ proc drawBufferAdvance(s: openArray[char]; bgcolor: CellColor; oi, ox: var int; ox = x return move(ls) -proc drawBuffer*(pager: Pager; container: Container; ofile: File) = +proc drawBuffer*(pager: Pager; container: Container; ofile: File): bool = var format = Format() - container.readLines(proc(line: SimpleFlexibleLine) = + let res = container.readLines(proc(line: SimpleFlexibleLine) = var x = 0 var w = -1 var i = 0 @@ -997,6 +997,7 @@ proc drawBuffer*(pager: Pager; container: Container; ofile: File) = ofile.writeLine(s) ) ofile.flushFile() + res proc redraw(pager: Pager) {.jsfunc.} = pager.term.clearCanvas() @@ -2431,10 +2432,13 @@ proc writeToFile(istream: PosixStream; outpath: string): bool = return false var buffer {.noinit.}: array[4096, uint8] while true: - let n = istream.recvData(buffer) + let n = istream.readData(buffer) + if n < 0: + return false if n == 0: break - ps.sendDataLoop(buffer.toOpenArray(0, n - 1)) + if not ps.writeDataLoop(buffer.toOpenArray(0, n - 1)): + break ps.sclose() true @@ -3020,8 +3024,7 @@ proc openMenu(pager: Pager; x = -1; y = -1) {.jsfunc.} = pager.menu = newSelect(options, -1, x, y, pager.bufWidth, pager.bufHeight, menuFinish, pager) -proc handleEvent0(pager: Pager; container: Container; event: ContainerEvent): - bool = +proc handleEvent0(pager: Pager; container: Container; event: ContainerEvent) = case event.t of cetLoaded: dec pager.numload @@ -3101,23 +3104,18 @@ proc handleEvent0(pager: Pager; container: Container; event: ContainerEvent): pager.refreshAllowed.incl($url) pager.metaRefresh(container, n, url) ) - return true proc handleEvents(pager: Pager; container: Container) = while (let event = container.popEvent(); event != nil): - if not pager.handleEvent0(container, event): - break + pager.handleEvent0(container, event) proc handleEvents(pager: Pager) = if pager.container != nil: pager.handleEvents(pager.container) proc handleEvent(pager: Pager; container: Container) = - try: - container.handleEvent() + if container.handleEvent(): pager.handleEvents(container) - except IOError: - discard proc runCommand(pager: Pager) = if pager.scommand != "": @@ -3152,30 +3150,27 @@ proc handleStderr(pager: Pager) = let estream = pager.forkserver.estream var hadlf = true while true: - try: - let n = estream.recvData(buffer) - if n == 0: - break - var i = 0 - while i < n: - var j = n - var found = false - for k in i ..< n: - if buffer[k] == '\n': - j = k + 1 - found = true - break - if hadlf: - pager.console.err.write(prefix) - if j - i > 0: - pager.console.err.write(buffer.toOpenArray(i, j - 1)) - i = j - hadlf = found - except ErrorAgain: + let n = estream.readData(buffer) + if n <= 0: break + var i = 0 + while i < n: + var j = n + var found = false + for k in i ..< n: + if buffer[k] == '\n': + j = k + 1 + found = true + break + if hadlf: + pager.console.err.write(prefix) + if j - i > 0: + pager.console.err.write(buffer.toOpenArray(i, j - 1)) + i = j + hadlf = found if not hadlf: pager.console.err.write('\n') - pager.console.err.sflush() + discard pager.console.err.flush() proc handleRead(pager: Pager; fd: int) = if pager.term.istream != nil and fd == pager.term.istream.fd: @@ -3250,10 +3245,7 @@ proc setupSigwinch(pager: Pager): PosixStream = gwriter = writer onSignal SIGWINCH: discard sig - try: - gwriter.sendDataLoop([0u8]) - except ErrorAgain: - discard + discard gwriter.writeData([0u8]) let reader = newPosixStream(pipefd[0]) reader.setCloseOnExec() reader.setBlocking(false) @@ -3333,10 +3325,9 @@ proc headlessLoop(pager: Pager) = proc dumpBuffers(pager: Pager) = pager.headlessLoop() for container in pager.containers: - try: - pager.drawBuffer(container, stdout) + if pager.drawBuffer(container, stdout): pager.handleEvents(container) - except IOError: + else: pager.console.error("Error in buffer", $container.url) # check for errors pager.handleRead(pager.forkserver.estream.fd) diff --git a/src/local/term.nim b/src/local/term.nim index 3aff214d..236599f2 100644 --- a/src/local/term.nim +++ b/src/local/term.nim @@ -245,9 +245,14 @@ when TermcapFound: func cap(term: Terminal; c: TermcapCap): lent string = return term.tc.caps[c] +proc write0(term: Terminal; buffer: openArray[char]) = + if not term.ostream.writeDataLoop(buffer): + stderr.writeLine("Error writing to stdout") + quit(1) + proc flush*(term: Terminal) = if term.obufLen > 0: - term.ostream.sendDataLoop(term.obuf.toOpenArray(0, term.obufLen - 1)) + term.write0(term.obuf.toOpenArray(0, term.obufLen - 1)) term.obufLen = 0 proc write(term: Terminal; s: openArray[char]) = @@ -255,7 +260,7 @@ proc write(term: Terminal; s: openArray[char]) = if s.len + term.obufLen > term.obuf.len: term.flush() if s.len > term.obuf.len: - term.ostream.sendDataLoop(s) + term.write0(s) else: copyMem(addr term.obuf[term.obufLen], unsafeAddr s[0], s.len) term.obufLen += s.len @@ -263,7 +268,10 @@ proc write(term: Terminal; s: openArray[char]) = proc readChar*(term: Terminal): char = if term.ibufn == term.ibufLen: term.ibufn = 0 - term.ibufLen = term.istream.recvData(term.ibuf) + term.ibufLen = term.istream.readData(term.ibuf) + if term.ibufLen == -1: + stderr.writeLine("Error reading from stdin") + quit(1) result = term.ibuf[term.ibufn] inc term.ibufn diff --git a/src/main.nim b/src/main.nim index 9fc80997..c4e9c37f 100644 --- a/src/main.nim +++ b/src/main.nim @@ -220,10 +220,10 @@ proc initConfig(ctx: ParamParseContext; config: Config; when defined(debug): if (let ps = newPosixStream(getCurrentDir() / "res/config.toml"); ps != nil): - ?config.parseConfig(getCurrentDir(), ps.recvAll(), warnings) + ?config.parseConfig(getCurrentDir(), ps.readAll(), warnings) ps.sclose() if ps != nil: - let src = ps.recvAllOrMmap() + let src = ps.readAllOrMmap() ?config.parseConfig(config.dir, src.toOpenArray(), warnings) deallocMem(src) ps.sclose() diff --git a/src/server/buffer.nim b/src/server/buffer.nim index e7770f08..61642297 100644 --- a/src/server/buffer.nim +++ b/src/server/buffer.nim @@ -919,8 +919,8 @@ proc rewind(buffer: Buffer; data: InputData; offset: int; buffer.loader.unset(data) data.stream.sclose() buffer.loader.put(InputData(stream: response.body)) - data.stream.setBlocking(false) - buffer.pollData.register(data.stream.fd, POLLIN) + response.body.setBlocking(false) + buffer.pollData.register(response.body.fd, POLLIN) buffer.bytesRead = offset return true @@ -1100,9 +1100,8 @@ proc onload(buffer: Buffer; data: InputData) = var n = 0 while true: if not reprocess: - try: - n = data.stream.recvData(iq) - except ErrorAgain: + n = data.stream.readData(iq) + if n < 0: break buffer.bytesRead += n if n != 0: @@ -1864,7 +1863,7 @@ proc handleRead(buffer: Buffer; fd: int): bool = if fd == buffer.pstream.fd: try: buffer.readCommand() - except ErrorConnectionReset, EOFError: + except EOFError: #eprint "EOF error", $buffer.url & "\nMESSAGE:", # getCurrentExceptionMsg() & "\n", # getStackTrace(getCurrentException()) @@ -1954,7 +1953,7 @@ proc launchBuffer*(config: BufferConfig; url: URL; attrs: WindowAttributes; pstream: pstream, url: url, charsetStack: charsetStack, - cacheId: -1, + cacheId: cacheId, outputId: -1 ) buffer.window = newWindow( diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim index fc12b73e..4d69ab4b 100644 --- a/src/server/forkserver.nim +++ b/src/server/forkserver.nim @@ -200,7 +200,7 @@ proc runForkServer(controlStream, loaderStream: SocketStream) = let r = ctx.forkBuffer(r) ctx.stream.withPacketWriter w: w.swrite(r) - except EOFError, ErrorBrokenPipe: + except EOFError: # EOF break ctx.stream.sclose() diff --git a/src/server/loader.nim b/src/server/loader.nim index e76d9fd9..e49ea4af 100644 --- a/src/server/loader.nim +++ b/src/server/loader.nim @@ -63,7 +63,7 @@ type CachedItem = ref object id: int refc: int - offset: int + offset: int64 path: string LoaderBuffer = ref object @@ -263,9 +263,9 @@ proc sendHeaders(handle: InputHandle; headers: Headers) = w.swrite(headers) handle.output.stream.setBlocking(blocking) -proc sendData(ps: PosixStream; buffer: LoaderBuffer; si = 0): int {.inline.} = +proc writeData(ps: PosixStream; buffer: LoaderBuffer; si = 0): int {.inline.} = assert buffer.len - si > 0 - return ps.sendData(addr buffer.page[si], buffer.len - si) + return ps.writeData(addr buffer.page[si], buffer.len - si) proc iclose(handle: InputHandle) = if handle.stream != nil: @@ -274,16 +274,13 @@ proc iclose(handle: InputHandle) = assert handle.outputs.len == 1 # not an ideal solution, but better than silently eating malformed # headers - try: - if handle.rstate == rsBeforeStatus: - handle.sendStatus(500) - if handle.rstate == rsBeforeHeaders: - handle.sendHeaders(newHeaders()) - handle.output.stream.setBlocking(true) - const msg = "Error: malformed header in CGI script" - discard handle.output.stream.sendData(msg) - except ErrorBrokenPipe: - discard # receiver is dead + if handle.rstate == rsBeforeStatus: + handle.sendStatus(500) + if handle.rstate == rsBeforeHeaders: + handle.sendHeaders(newHeaders()) + handle.output.stream.setBlocking(true) + const msg = "Error: malformed header in CGI script" + discard handle.output.stream.writeData(msg) handle.stream.sclose() handle.stream = nil @@ -413,14 +410,17 @@ proc pushBuffer(ctx: var LoaderContext; output: OutputHandle; output.buffers.addLast(buffer) elif output.currentBuffer == nil: var n = si - try: - let m = output.stream.sendData(buffer, si) + let m = output.stream.writeData(buffer, si) + if m < 0: + let e = errno + if e == EAGAIN or e == EWOULDBLOCK: + discard + else: + assert e == EPIPE, $strerror(e) + return pbrUnregister + else: output.bytesSent += uint64(m) n += m - except ErrorAgain: - discard - except ErrorBrokenPipe: - return pbrUnregister if n < buffer.len: output.currentBuffer = buffer output.currentBufferIdx = n @@ -441,26 +441,23 @@ proc redirectToFile(ctx: var LoaderContext; output: OutputHandle; let ps = newPosixStream(targetPath, O_CREAT or O_WRONLY or O_TRUNC, 0o600) if ps == nil: return false - try: - if output.currentBuffer != nil: - #TODO I suspect this is wrong... at least we should loop until n - # is 0 or -1 (exception). - let n = ps.sendData(output.currentBuffer, output.currentBufferIdx) + if output.currentBuffer != nil: + #TODO I suspect this is wrong... at least we should loop until n + # is 0 or -1. + let n = ps.writeData(output.currentBuffer, output.currentBufferIdx) + if n > 0: osent += uint64(n) - if unlikely(n < output.currentBuffer.len - output.currentBufferIdx): - ps.sclose() - return false - for buffer in output.buffers: - #TODO ditto - let n = ps.sendData(buffer) + if unlikely(n < output.currentBuffer.len - output.currentBufferIdx): + ps.sclose() + return false + for buffer in output.buffers: + #TODO ditto + let n = ps.writeData(buffer) + if n > 0: osent += uint64(n) - if unlikely(n < buffer.len): - ps.sclose() - return false - except ErrorBrokenPipe: - # ps is dead; give up. - ps.sclose() - return false + if unlikely(n < buffer.len): + ps.sclose() + return false if output.istreamAtEnd: ps.sclose() elif output.parent != nil: @@ -505,8 +502,8 @@ proc openCachedItem(client: ClientHandle; id: int): (PosixStream, int) = client.cacheMap.del(n) return (nil, -1) assert item.offset != -1 - ps.seek(item.offset) - return (ps, n) + if ps.seek(item.offset) >= 0: + return (ps, n) return (nil, -1) proc put(ctx: var LoaderContext; handle: LoaderHandle) = @@ -655,7 +652,7 @@ proc parseHeaders(handle: InputHandle; buffer: LoaderBuffer): int = return handle.parseHeaders0(['\n']) let p = cast[ptr UncheckedArray[char]](addr buffer.page[0]) return handle.parseHeaders0(p.toOpenArray(0, buffer.len - 1)) - except ErrorBrokenPipe: + except EOFError: handle.parser = nil return -1 @@ -665,15 +662,16 @@ proc finishParse(handle: InputHandle) = let ps = newPosixStream(handle.cacheRef.path, O_RDONLY, 0) if ps != nil: var buffer {.noinit.}: array[4096, char] - var off = 0 + var off = 0i64 while true: - let n = ps.recvData(buffer) - if n == 0: + let n = ps.readData(buffer) + if n <= 0: + assert n == 0 or errno != EBADF break let pn = handle.parseHeaders0(buffer.toOpenArray(0, n - 1)) if pn == -1: break - off += pn + off += int64(pn) if pn < n: handle.parser = nil break @@ -693,40 +691,42 @@ proc handleRead(ctx: var LoaderContext; handle: InputHandle; let maxUnregs = handle.outputs.len while true: let buffer = newLoaderBuffer() - try: - let n = handle.stream.recvData(buffer.page) - if n == 0: # EOF - return hrrUnregister - buffer.len = n - var si = 0 - if handle.parser != nil: - si = handle.parseHeaders(buffer) - if si == -1: # died while parsing headers; unregister - return hrrUnregister - if si == n: # parsed the entire buffer as headers; skip output handling - continue - else: - handle.bytesSeen += uint64(n) - #TODO stop reading if Content-Length exceeded - for output in handle.outputs: - if output.dead: - # do not push to unregWrite candidates - continue - case ctx.pushBuffer(output, buffer, si) - of pbrUnregister: - output.dead = true - unregWrite.add(output) - inc unregs - of pbrDone: discard - if unregs == maxUnregs: - # early return: no more outputs to write to + let n = handle.stream.readData(buffer.page) + if n < 0: + let e = errno + if e == EAGAIN or e == EWOULDBLOCK: # retry later break - if n < buffer.cap: - break - except ErrorAgain: # retry later + else: # sender died; stop streaming + assert e == EPIPE, $strerror(e) + return hrrBrokenPipe + if n == 0: # EOF + return hrrUnregister + buffer.len = n + var si = 0 + if handle.parser != nil: + si = handle.parseHeaders(buffer) + if si == -1: # died while parsing headers; unregister + return hrrUnregister + if si == n: # parsed the entire buffer as headers; skip output handling + continue + else: + handle.bytesSeen += uint64(n) + #TODO stop reading if Content-Length exceeded + for output in handle.outputs: + if output.dead: + # do not push to unregWrite candidates + continue + case ctx.pushBuffer(output, buffer, si) + of pbrUnregister: + output.dead = true + unregWrite.add(output) + inc unregs + of pbrDone: discard + if unregs == maxUnregs: + # early return: no more outputs to write to + break + if n < buffer.cap: break - except ErrorBrokenPipe: # sender died; stop streaming - return hrrBrokenPipe hrrDone # stream is a regular file, so we can't select on it. @@ -1031,11 +1031,11 @@ proc loadStream(ctx: var LoaderContext; client: ClientHandle; proc loadFromCache(ctx: var LoaderContext; client: ClientHandle; handle: InputHandle; request: Request) = let id = parseInt32(request.url.pathname).get(-1) - let startFrom = parseInt32(request.url.search.substr(1)).get(0) + let startFrom = parseInt64(request.url.search.substr(1)).get(0) let (ps, n) = client.openCachedItem(id) if ps != nil: if startFrom != 0: - ps.seek(startFrom) + discard ps.seek(startFrom) handle.stream = ps if ps == nil: handle.rejectHandle(ceFileNotInCache) @@ -1637,7 +1637,7 @@ proc readCommand(ctx: var LoaderContext; client: ClientHandle) = of lcResume: ctx.resume(stream, client, r) assert r.empty() - except ErrorBrokenPipe, EOFError: + except EOFError: # Receiving end died while reading, or sent less bytes than they # promised. Give up. ctx.unregClient.add(client) @@ -1658,18 +1658,20 @@ proc handleWrite(ctx: var LoaderContext; output: OutputHandle; unregWrite: var seq[OutputHandle]) = while output.currentBuffer != nil: let buffer = output.currentBuffer - try: - let n = output.stream.sendData(buffer, output.currentBufferIdx) - output.bytesSent += uint64(n) - output.currentBufferIdx += n - if output.currentBufferIdx < buffer.len: + let n = output.stream.writeData(buffer, output.currentBufferIdx) + if n < 0: + let e = errno + if e == EAGAIN or e == EWOULDBLOCK: # never mind break - output.bufferCleared() # swap out buffer - except ErrorAgain: # never mind - break - except ErrorBrokenPipe: # receiver died; stop streaming - unregWrite.add(output) + else: # receiver died; stop streaming + assert e == EPIPE, $strerror(e) + unregWrite.add(output) + break + output.bytesSent += uint64(n) + output.currentBufferIdx += n + if output.currentBufferIdx < buffer.len: break + output.bufferCleared() # swap out buffer if output.isEmpty: if output.istreamAtEnd: # after EOF, no need to send anything more here diff --git a/src/server/response.nim b/src/server/response.nim index a6a2c235..f4e104ce 100644 --- a/src/server/response.nim +++ b/src/server/response.nim @@ -1,3 +1,4 @@ +import std/posix import std/strutils import std/tables @@ -149,18 +150,16 @@ type BlobOpaque = ref object of RootObj proc onReadBlob(response: Response) = let opaque = BlobOpaque(response.opaque) while true: - try: - if opaque.len + BufferSize > opaque.size: - opaque.size *= 2 - opaque.p = realloc(opaque.p, opaque.size) - let p = cast[ptr UncheckedArray[uint8]](opaque.p) - let diff = opaque.size - opaque.len - let n = response.body.recvData(addr p[opaque.len], diff) - opaque.len += n - if n == 0: - break - except ErrorAgain: + if opaque.len + BufferSize > opaque.size: + opaque.size *= 2 + opaque.p = realloc(opaque.p, opaque.size) + let p = cast[ptr UncheckedArray[uint8]](opaque.p) + let diff = opaque.size - opaque.len + let n = response.body.readData(addr p[opaque.len], diff) + if n <= 0: + assert n != -1 or errno != EBADF break + opaque.len += n proc onFinishBlob(response: Response; success: bool) = let opaque = BlobOpaque(response.opaque) diff --git a/src/types/formdata.nim b/src/types/formdata.nim index 75be9750..da6def70 100644 --- a/src/types/formdata.nim +++ b/src/types/formdata.nim @@ -104,14 +104,13 @@ proc writeEntry*(stream: DynStream; entry: FormDataEntry; boundary: string) = if ps != nil: var buf {.noinit.}: array[4096, uint8] while true: - let n = ps.recvData(buf) - if n == 0: + let n = ps.readData(buf) + if n <= 0: break - stream.sendDataLoop(addr buf[0], n) - if n < buf.len: + if not stream.writeDataLoop(buf.toOpenArray(0, n - 1)): break else: - stream.sendDataLoop(blob.buffer, blob.size) + discard stream.writeDataLoop(blob.buffer, blob.size) stream.write("\r\n") proc writeEnd*(stream: DynStream; boundary: string) = |