mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-22 03:30:22 +02:00
Code Activity

Change `sendfile' to loop until everything has been sent.

Browse source 
* libguile/filesys.c (scm_sendfile)[HAVE_SYS_SENDFILE_H &&
  HAVE_SENDFILE]: Compare RESULT with C_COUNT.  Loop until C_COUNT bytes
  have been sent.
* doc/ref/posix.texi (File System): Update the description.  Explain the
  new semantics.
* test-suite/tests/filesys.test ("sendfile"): Rewrite using
  `pass-if-equal'.  Check the return value for all the tests.
  ["file with offset past the end", "file with offset near the end"]:
  New tests.
This commit is contained in:
Ludovic Courtès 2013-04-07 23:43:21 +02:00
parent 254d313a21
commit e0886e0780
3 changed files with 111 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

124
test-suite/tests/filesys.test
View file

@ -130,70 +130,82 @@
(with-test-prefix "sendfile"
(pass-if "file"
(let ((file (search-path %load-path "ice-9/boot-9.scm")))
(let* ((file (search-path %load-path "ice-9/boot-9.scm"))
(len (stat:size (stat file)))
(ref (call-with-input-file file get-bytevector-all)))
(pass-if-equal "file" (cons len ref)
(cons (call-with-input-file file
(lambda (input)
(call-with-output-file (test-file)
(lambda (output)
(sendfile output input len 0)))))
(call-with-input-file (test-file) get-bytevector-all)))
(pass-if-equal "file with offset"
(cons (- len 777) (call-with-input-file file
(lambda (input)
(seek input 777 SEEK_SET)
(get-bytevector-all input))))
(cons (call-with-input-file file
(lambda (input)
(call-with-output-file (test-file)
(lambda (output)
(sendfile output input (- len 777) 777)))))
(call-with-input-file (test-file) get-bytevector-all)))
(pass-if-equal "file with offset past the end" (- len 777)
(call-with-input-file file
(lambda (input)
(let ((len (stat:size (stat input))))
(call-with-output-file (test-file)
(lambda (output)
(sendfile output input len 0))))))
(let ((ref (call-with-input-file file get-bytevector-all))
(out (call-with-input-file (test-file) get-bytevector-all)))
(bytevector=? ref out))))
(call-with-output-file (test-file)
(lambda (output)
(sendfile output input len 777))))))
(pass-if "file with offset"
(let ((file (search-path %load-path "ice-9/boot-9.scm")))
(pass-if-equal "file with offset near the end" 77
(call-with-input-file file
(lambda (input)
(let ((len (stat:size (stat input))))
(call-with-output-file (test-file)
(lambda (output)
(sendfile output input (- len 777) 777))))))
(let ((ref (call-with-input-file file
(lambda (input)
(seek input 777 SEEK_SET)
(get-bytevector-all input))))
(out (call-with-input-file (test-file) get-bytevector-all)))
(bytevector=? ref out))))
(call-with-output-file (test-file)
(lambda (output)
(sendfile output input len (- len 77)))))))
(pass-if "pipe"
(if (provided? 'threads)
(let* ((file (search-path %load-path "ice-9/boot-9.scm"))
(in+out (pipe))
(child (call-with-new-thread
(lambda ()
(call-with-input-file file
(lambda (input)
(let ((len (stat:size (stat input))))
(sendfile (cdr in+out) (fileno input) len 0)
(close-port (cdr in+out)))))))))
(let ((ref (call-with-input-file file get-bytevector-all))
(out (get-bytevector-all (car in+out))))
(close-port (car in+out))
(bytevector=? ref out)))
(throw 'unresolved)))
(pass-if-equal "pipe" (cons len ref)
(if (provided? 'threads)
(let* ((in+out (pipe))
(child (call-with-new-thread
(lambda ()
(call-with-input-file file
(lambda (input)
(let ((result (sendfile (cdr in+out)
(fileno input)
len 0)))
(close-port (cdr in+out))
result)))))))
(let ((out (get-bytevector-all (car in+out))))
(close-port (car in+out))
(cons (join-thread child) out)))
(throw 'unresolved)))
(pass-if "pipe with offset"
(if (provided? 'threads)
(let* ((file (search-path %load-path "ice-9/boot-9.scm"))
(in+out (pipe))
(child (call-with-new-thread
(lambda ()
(call-with-input-file file
(pass-if-equal "pipe with offset"
(cons (- len 777) (call-with-input-file file
(lambda (input)
(let ((len (stat:size (stat input))))
(sendfile (cdr in+out) (fileno input)
(- len 777) 777)
(close-port (cdr in+out)))))))))
(let ((ref (call-with-input-file file
(lambda (input)
(seek input 777 SEEK_SET)
(get-bytevector-all input))))
(out (get-bytevector-all (car in+out))))
(close-port (car in+out))
(bytevector=? ref out)))
(throw 'unresolved))))
(seek input 777 SEEK_SET)
(get-bytevector-all input))))
(if (provided? 'threads)
(let* ((in+out (pipe))
(child (call-with-new-thread
(lambda ()
(call-with-input-file file
(lambda (input)
(let ((result (sendfile (cdr in+out)
(fileno input)
(- len 777)
777)))
(close-port (cdr in+out))
result)))))))
(let ((out (get-bytevector-all (car in+out))))
(close-port (car in+out))
(cons (join-thread child) out)))
(throw 'unresolved)))))
(delete-file (test-file))
(delete-file (test-symlink))