Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(695)

Unified Diff: runtime/bin/file_linux.cc

Issue 99583008: Add fallback-implementation for sendfile on linux and android. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix write bailout on writing too few bytes. Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« runtime/bin/file_android.cc ('K') | « runtime/bin/file_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/file_linux.cc
diff --git a/runtime/bin/file_linux.cc b/runtime/bin/file_linux.cc
index 40b73c91f995c4c4f7c7abd8b977f6d1dee0d835..3114d01c0be8aba4161a2881c513190526393cc0 100644
--- a/runtime/bin/file_linux.cc
+++ b/runtime/bin/file_linux.cc
@@ -239,13 +239,25 @@ bool File::Copy(const char* old_path, const char* new_path) {
return false;
}
off64_t offset = 0;
- int bytes = 1;
- while (bytes > 0) {
+ int result = 1;
+ while (result > 0) {
// Loop to ensure we copy everything, and not only up to 2GB.
- bytes = TEMP_FAILURE_RETRY(
+ result = TEMP_FAILURE_RETRY(
sendfile64(new_fd, old_fd, &offset, kMaxUint32));
}
Søren Gjesse 2013/12/16 08:01:52 So this is not Android only?
Anders Johnsen 2013/12/16 08:52:56 No, the actual failure that lead to this was on li
- if (bytes < 0) {
+ if (result < 0 && (errno == EINVAL || errno == ENOSYS)) {
+ const intptr_t kBufferSize = 8 * 1024;
+ uint8_t buffer[kBufferSize];
+ while ((result = TEMP_FAILURE_RETRY(
+ read(old_fd, buffer, kBufferSize))) > 0) {
+ int wrote = TEMP_FAILURE_RETRY(write(new_fd, buffer, result));
+ if (wrote != result) {
+ result = -1;
+ break;
+ }
+ }
+ }
+ if (result < 0) {
int e = errno;
VOID_TEMP_FAILURE_RETRY(close(old_fd));
VOID_TEMP_FAILURE_RETRY(close(new_fd));
« runtime/bin/file_android.cc ('K') | « runtime/bin/file_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698