mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

FIXME: refactor and remove usage of ScopedAllowIO where possible

Browse source
This commit is contained in:
deepak1556 2017-12-10 22:58:06 +05:30 committed by Cheng Zhao
parent 90acb22a58
commit 1d95241185
3 changed files with 36 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/common/api/atom_api_native_image.cc
View file

@ -15,6 +15,7 @@
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/strings/pattern.h" #include "base/strings/pattern.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/threading/thread_restrictions.h"
#include "native_mate/object_template_builder.h" #include "native_mate/object_template_builder.h"
#include "net/base/data_url.h" #include "net/base/data_url.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
@ -130,8 +131,11 @@ bool AddImageSkiaRep(gfx::ImageSkia* image,
const base::FilePath& path, const base::FilePath& path,
double scale_factor) { double scale_factor) {
std::string file_contents; std::string file_contents;
if (!asar::ReadFileToString(path, &file_contents)) {
return false; base::ThreadRestrictions::ScopedAllowIO allow_io;
if (!asar::ReadFileToString(path, &file_contents))
return false;
}
const unsigned char* data = const unsigned char* data =
reinterpret_cast<const unsigned char*>(file_contents.data()); reinterpret_cast<const unsigned char*>(file_contents.data());

33
atom/common/asar/archive.cc
View file

@ -14,6 +14,8 @@
#include "base/logging.h" #include "base/logging.h"
#include "base/pickle.h" #include "base/pickle.h"
#include "base/strings/string_number_conversions.h" #include "base/strings/string_number_conversions.h"
#include "base/task_scheduler/post_task.h"
#include "base/threading/thread_restrictions.h"
#include "base/values.h" #include "base/values.h"
#if defined(OS_WIN) #if defined(OS_WIN)
@ -115,17 +117,19 @@ bool FillFileInfoWithNode(Archive::FileInfo* info,
} // namespace } // namespace
Archive::Archive(const base::FilePath& path) Archive::Archive(const base::FilePath& path)
: path_(path), : path_(path), file_(base::File::FILE_OK), header_size_(0) {
file_(path_, base::File::FLAG_OPEN | base::File::FLAG_READ), {
base::ThreadRestrictions::ScopedAllowIO allow_io;
file_.Initialize(path_, base::File::FLAG_OPEN | base::File::FLAG_READ);
#if defined(OS_WIN) #if defined(OS_WIN)
fd_(_open_osfhandle( fd_ =
reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0)), _open_osfhandle(reinterpret_cast<intptr_t>(file_.GetPlatformFile()), 0);
#elif defined(OS_POSIX) #elif defined(OS_POSIX)
fd_(file_.GetPlatformFile()), fd_ = file_.GetPlatformFile();
#else #else
fd_(-1), fd_ = -1;
#endif #endif
header_size_(0) { }
} }
Archive::~Archive() { Archive::~Archive() {
@ -136,6 +140,11 @@ Archive::~Archive() {
file_.TakePlatformFile(); file_.TakePlatformFile();
} }
#endif #endif
base::PostTaskWithTraits(
FROM_HERE,
{base::MayBlock(), base::TaskPriority::BACKGROUND,
base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
base::Bind([](base::File file) { file.Close(); }, Passed(&file_)));
} }
bool Archive::Init() { bool Archive::Init() {
@ -151,7 +160,10 @@ bool Archive::Init() {
int len; int len;
buf.resize(8); buf.resize(8);
len = file_.ReadAtCurrentPos(buf.data(), buf.size()); {
base::ThreadRestrictions::ScopedAllowIO allow_io;
len = file_.ReadAtCurrentPos(buf.data(), buf.size());
}
if (len != static_cast<int>(buf.size())) { if (len != static_cast<int>(buf.size())) {
PLOG(ERROR) << "Failed to read header size from " << path_.value(); PLOG(ERROR) << "Failed to read header size from " << path_.value();
return false; return false;
@ -165,7 +177,10 @@ bool Archive::Init() {
} }
buf.resize(size); buf.resize(size);
len = file_.ReadAtCurrentPos(buf.data(), buf.size()); {
base::ThreadRestrictions::ScopedAllowIO allow_io;
len = file_.ReadAtCurrentPos(buf.data(), buf.size());
}
if (len != static_cast<int>(buf.size())) { if (len != static_cast<int>(buf.size())) {
PLOG(ERROR) << "Failed to read header from " << path_.value(); PLOG(ERROR) << "Failed to read header from " << path_.value();
return false; return false;

8
atom/common/crash_reporter/crash_reporter_mac.mm
View file

@ -13,6 +13,7 @@
#include "base/strings/string_piece.h" #include "base/strings/string_piece.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h" #include "base/strings/sys_string_conversions.h"
#include "base/threading/thread_restrictions.h"
#include "vendor/crashpad/client/crashpad_client.h" #include "vendor/crashpad/client/crashpad_client.h"
#include "vendor/crashpad/client/crashpad_info.h" #include "vendor/crashpad/client/crashpad_info.h"
#include "vendor/crashpad/client/settings.h" #include "vendor/crashpad/client/settings.h"
@ -139,8 +140,11 @@ std::vector<CrashReporter::UploadReportResult>
CrashReporterMac::GetUploadedReports(const base::FilePath& crashes_dir) { CrashReporterMac::GetUploadedReports(const base::FilePath& crashes_dir) {
std::vector<CrashReporter::UploadReportResult> uploaded_reports; std::vector<CrashReporter::UploadReportResult> uploaded_reports;
if (!base::PathExists(crashes_dir)) { {
return uploaded_reports; base::ThreadRestrictions::ScopedAllowIO allow_io;
if (!base::PathExists(crashes_dir)) {
return uploaded_reports;
}
} }
// Load crashpad database. // Load crashpad database.
std::unique_ptr<crashpad::CrashReportDatabase> database = std::unique_ptr<crashpad::CrashReportDatabase> database =