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

Unified Diff: base/process/kill_posix.cc

Issue 659513004: Non-SFI Mode: Build base/ library by PNaCL toolchain for nacl_helper_nonsfi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: base/process/kill_posix.cc
diff --git a/base/process/kill_posix.cc b/base/process/kill_posix.cc
index d4ca72696bf0f664cd33d04ea2f6cf3437d6ec3d..f68dfb892b71316a6775dbc136e336e9815e0175 100644
--- a/base/process/kill_posix.cc
+++ b/base/process/kill_posix.cc
@@ -22,6 +22,7 @@ namespace base {
namespace {
+#if !defined(__native_client_nonsfi__)
bool WaitpidWithTimeout(ProcessHandle handle,
int* status,
base::TimeDelta wait) {
@@ -83,6 +84,7 @@ bool WaitpidWithTimeout(ProcessHandle handle,
return ret_pid > 0;
}
+#endif // !defined(__native_client_nonsfi__)
TerminationStatus GetTerminationStatusImpl(ProcessHandle handle,
bool can_block,
@@ -130,6 +132,7 @@ TerminationStatus GetTerminationStatusImpl(ProcessHandle handle,
} // namespace
+#if !defined(__native_client_nonsfi__)
// Attempts to kill the process identified by the given process
// entry structure. Ignores specified exit_code; posix can't force that.
// Returns true if this is successful, false otherwise.
@@ -191,6 +194,7 @@ bool KillProcessGroup(ProcessHandle process_group_id) {
DPLOG(ERROR) << "Unable to terminate process group " << process_group_id;
return result;
}
+#endif // !defined(__native_client_nonsfi__)
TerminationStatus GetTerminationStatus(ProcessHandle handle, int* exit_code) {
return GetTerminationStatusImpl(handle, false /* can_block */, exit_code);
@@ -206,6 +210,7 @@ TerminationStatus GetKnownDeadTerminationStatus(ProcessHandle handle,
return GetTerminationStatusImpl(handle, true /* can_block */, exit_code);
}
+#if !defined(__native_client_nonsfi__)
bool WaitForExitCode(ProcessHandle handle, int* exit_code) {
int status;
if (HANDLE_EINTR(waitpid(handle, &status, 0)) == -1) {
@@ -478,5 +483,6 @@ void EnsureProcessGetsReaped(ProcessHandle process) {
}
#endif // !defined(OS_MACOSX)
+#endif // !defined(__native_client_nonsfi__)
} // namespace base

Powered by Google App Engine
This is Rietveld 408576698