| OLD | NEW |
| 1 // Copyright 2014 The Chromium OS Authors. All rights reserved. | 1 // Copyright 2014 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 "volume.h" | 5 #include "volume.h" |
| 6 | 6 |
| 7 #include <cstring> | 7 #include <cstring> |
| 8 #include <sstream> | 8 #include <sstream> |
| 9 | 9 |
| 10 #include "request.h" | 10 #include "request.h" |
| 11 #include "volume_archive_libarchive.h" | 11 #include "volume_archive_minizip.h" |
| 12 #include "volume_reader_javascript_stream.h" | 12 #include "volume_reader_javascript_stream.h" |
| 13 | 13 |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 #define LOG(x) \ | 16 #define LOG(x) \ |
| 17 do { \ | 17 do { \ |
| 18 std::stringstream fmt; \ | 18 std::stringstream fmt; \ |
| 19 fmt << x; \ | 19 fmt << x; \ |
| 20 message_sender_->CONSOLE_LOG(file_system_id_, request_id, fmt.str()); \ | 20 message_sender_->CONSOLE_LOG(file_system_id_, request_id, fmt.str()); \ |
| 21 } while (0) | 21 } while (0) |
| (...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 } | 509 } |
| 510 volume_archive_->MaybeDecompressAhead(); | 510 volume_archive_->MaybeDecompressAhead(); |
| 511 } | 511 } |
| 512 | 512 |
| 513 | 513 |
| 514 void Volume::ClearJob() { | 514 void Volume::ClearJob() { |
| 515 job_lock_.Acquire(); | 515 job_lock_.Acquire(); |
| 516 reader_request_id_ = ""; | 516 reader_request_id_ = ""; |
| 517 job_lock_.Release(); | 517 job_lock_.Release(); |
| 518 } | 518 } |
| OLD | NEW |