From 54bdd9a15d2e130c76f76ca322af56b306d02078 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Wed, 9 Nov 2011 11:52:14 +0100
Subject: Implement blocking calls for sendfile

Move sendfile data to invoke data instead of file_descr.
Remove usage of ready_output when doing a send.
If told to send 0 bytes, file_sendfile now sends the entire file
for linux.
---
 erts/preloaded/src/prim_file.erl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'erts/preloaded/src')

diff --git a/erts/preloaded/src/prim_file.erl b/erts/preloaded/src/prim_file.erl
index 0767067682..6bdf5f6e2e 100644
--- a/erts/preloaded/src/prim_file.erl
+++ b/erts/preloaded/src/prim_file.erl
@@ -547,12 +547,13 @@ write_file(_, _) ->
 sendfile(#file_descriptor{module = ?MODULE, data = {Port, _}},
 	 DestFD, Offset, Bytes, ChunkSize, Headers, Trailers,
 	 Nodiskio, MNowait, Sync) ->
-
-    drv_command(Port, <<?FILE_SENDFILE, DestFD:32, Offset:64, Bytes:64,
-			ChunkSize:64,
+    drv_command(Port, <<?FILE_SENDFILE, DestFD:32,
 			(get_bit(Nodiskio)):1,
 			(get_bit(MNowait)):1,
 			(get_bit(Sync)):1,0:5,
+			Offset:64/unsigned,
+			Bytes:64/unsigned,
+			ChunkSize:64,
 			(encode_hdtl(Headers))/binary,
 			(encode_hdtl(Trailers))/binary>>).
 
-- 
cgit v1.2.3