Minor updates to fd_file.h
* Add a static IsOpenFd() method for checking if fd is open.
* File::IsOpened() now checks when underlying FD is open (not just valid)
* Centralize a definition for kInvalidFd in art projects.
Test: art_libartbase_tests
Change-Id: Ic5db8b6c80e184308c6ad8979ed31585120eb89f
diff --git a/profman/profman.cc b/profman/profman.cc
index b2fabb2..4eae557 100644
--- a/profman/profman.cc
+++ b/profman/profman.cc
@@ -72,10 +72,8 @@
return android::base::Join(command, ' ');
}
-static constexpr int kInvalidFd = -1;
-
static bool FdIsValid(int fd) {
- return fd != kInvalidFd;
+ return fd != File::kInvalidFd;
}
static void UsageErrorV(const char* fmt, va_list ap) {
@@ -273,12 +271,12 @@
class ProfMan final {
public:
ProfMan() :
- reference_profile_file_fd_(kInvalidFd),
+ reference_profile_file_fd_(File::kInvalidFd),
dump_only_(false),
dump_classes_and_methods_(false),
generate_boot_image_profile_(false),
generate_boot_profile_(false),
- dump_output_to_fd_(kInvalidFd),
+ dump_output_to_fd_(File::kInvalidFd),
test_profile_num_dex_(kDefaultTestProfileNumDex),
test_profile_method_percerntage_(kDefaultTestProfileMethodPercentage),
test_profile_class_percentage_(kDefaultTestProfileClassPercentage),
@@ -706,7 +704,7 @@
}
}
for (const std::string& profile_file : profile_files_) {
- int ret = DumpOneProfile(kOrdinaryProfile, profile_file, kInvalidFd, &dex_files, &dump);
+ int ret = DumpOneProfile(kOrdinaryProfile, profile_file, File::kInvalidFd, &dex_files, &dump);
if (ret != 0) {
return ret;
}
@@ -725,7 +723,7 @@
if (!reference_profile_file_.empty()) {
int ret = DumpOneProfile(kReferenceProfile,
reference_profile_file_,
- kInvalidFd,
+ File::kInvalidFd,
&dex_files,
&dump);
if (ret != 0) {
@@ -1249,7 +1247,7 @@
fd = open(reference_profile_file_.c_str(), flags, 0644);
if (fd < 0) {
PLOG(ERROR) << "Cannot open " << reference_profile_file_;
- return kInvalidFd;
+ return File::kInvalidFd;
}
}
return fd;