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

Side by Side Diff: src/platform/update_engine/extent_writer.cc

Issue 891002: AU: Delta Diff Generator (Closed)
Patch Set: fixes for review Created 10 years, 8 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "update_engine/extent_writer.h" 5 #include "update_engine/extent_writer.h"
6 #include <errno.h> 6 #include <errno.h>
7 #include <unistd.h> 7 #include <unistd.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include "update_engine/utils.h"
9 10
10 using std::min; 11 using std::min;
11 12
12 namespace chromeos_update_engine { 13 namespace chromeos_update_engine {
13 14
14 namespace {
15 // Returns true on success.
16 bool WriteAll(int fd, const void *buf, size_t count) {
17 const char* c_buf = reinterpret_cast<const char*>(buf);
18 ssize_t bytes_written = 0;
19 while (bytes_written < static_cast<ssize_t>(count)) {
20 ssize_t rc = write(fd, c_buf + bytes_written, count - bytes_written);
21 TEST_AND_RETURN_FALSE_ERRNO(rc >= 0);
22 bytes_written += rc;
23 }
24 return true;
25 }
26 }
27
28 bool DirectExtentWriter::Write(const void* bytes, size_t count) { 15 bool DirectExtentWriter::Write(const void* bytes, size_t count) {
29 if (count == 0) 16 if (count == 0)
30 return true; 17 return true;
31 const char* c_bytes = reinterpret_cast<const char*>(bytes); 18 const char* c_bytes = reinterpret_cast<const char*>(bytes);
32 size_t bytes_written = 0; 19 size_t bytes_written = 0;
33 while (count - bytes_written > 0) { 20 while (count - bytes_written > 0) {
34 TEST_AND_RETURN_FALSE(next_extent_index_ < extents_.size()); 21 TEST_AND_RETURN_FALSE(next_extent_index_ < extents_.size());
35 uint64 bytes_remaining_next_extent = 22 uint64 bytes_remaining_next_extent =
36 extents_[next_extent_index_].num_blocks() * block_size_ - 23 extents_[next_extent_index_].num_blocks() * block_size_ -
37 extent_bytes_written_; 24 extent_bytes_written_;
38 CHECK_NE(bytes_remaining_next_extent, 0); 25 CHECK_NE(bytes_remaining_next_extent, 0);
39 size_t bytes_to_write = 26 size_t bytes_to_write =
40 static_cast<size_t>(min(static_cast<uint64>(count - bytes_written), 27 static_cast<size_t>(min(static_cast<uint64>(count - bytes_written),
41 bytes_remaining_next_extent)); 28 bytes_remaining_next_extent));
42 TEST_AND_RETURN_FALSE(bytes_to_write > 0); 29 TEST_AND_RETURN_FALSE(bytes_to_write > 0);
43 30
44 if (extents_[next_extent_index_].start_block() != kSparseHole) { 31 if (extents_[next_extent_index_].start_block() != kSparseHole) {
45 const off64_t offset = 32 const off64_t offset =
46 extents_[next_extent_index_].start_block() * block_size_ + 33 extents_[next_extent_index_].start_block() * block_size_ +
47 extent_bytes_written_; 34 extent_bytes_written_;
48 TEST_AND_RETURN_FALSE_ERRNO(lseek64(fd_, offset, SEEK_SET) != 35 TEST_AND_RETURN_FALSE_ERRNO(lseek64(fd_, offset, SEEK_SET) !=
49 static_cast<off64_t>(-1)); 36 static_cast<off64_t>(-1));
50 TEST_AND_RETURN_FALSE( 37 TEST_AND_RETURN_FALSE(
51 WriteAll(fd_, c_bytes + bytes_written, bytes_to_write)); 38 utils::WriteAll(fd_, c_bytes + bytes_written, bytes_to_write));
52 } 39 }
53 bytes_written += bytes_to_write; 40 bytes_written += bytes_to_write;
54 extent_bytes_written_ += bytes_to_write; 41 extent_bytes_written_ += bytes_to_write;
55 if (bytes_remaining_next_extent == bytes_to_write) { 42 if (bytes_remaining_next_extent == bytes_to_write) {
56 // We filled this extent 43 // We filled this extent
57 CHECK_EQ(extent_bytes_written_, 44 CHECK_EQ(extent_bytes_written_,
58 extents_[next_extent_index_].num_blocks() * block_size_); 45 extents_[next_extent_index_].num_blocks() * block_size_);
59 // move to next extent 46 // move to next extent
60 extent_bytes_written_ = 0; 47 extent_bytes_written_ = 0;
61 next_extent_index_++; 48 next_extent_index_++;
62 } 49 }
63 } 50 }
64 return true; 51 return true;
65 } 52 }
66 53
67 } // namespace chromeos_update_engine 54 } // namespace chromeos_update_engine
OLDNEW
« no previous file with comments | « src/platform/update_engine/extent_mapper_unittest.cc ('k') | src/platform/update_engine/filesystem_copier_action_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698