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

Unified Diff: apps/app_host/operation_launcher.cc

Issue 12674028: Report text output and exit code for command-line operations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Line endings. Created 7 years, 9 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: apps/app_host/operation_launcher.cc
diff --git a/apps/app_host/operation_launcher.cc b/apps/app_host/operation_launcher.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5092c9c68621314259c0c48725093c3e5f0e1172
--- /dev/null
+++ b/apps/app_host/operation_launcher.cc
@@ -0,0 +1,141 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// Creates an anonymous pipe for communicating an exit code from an operation
+// implemented by one or more subprocesses. If the original subprocess exits
+// without writing its result and without duplicating its output HANDLE into
+// some other process a failure is assumed to have occurred. Otherwise the
+// client closes its copy of the output HANDLE and the operation is considered
+// to be in progress until either its result has been read or no more valid
+// output HANDLEs remain.
+
+#include "operation_launcher.h"
+
+#include "base/command_line.h"
+#include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "base/process_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/synchronization/lock.h"
+#include "base/threading/platform_thread.h"
+#include "base/win/scoped_handle.h"
+#include "chrome/common/chrome_switches.h"
+
+namespace app_host {
+
+namespace {
+
+// Implements a background thread to read the exit code of the child process.
+class PipeReader : public base::PlatformThread::Delegate {
gab 2013/03/28 03:06:06 **I have no idea what I'm doing** (never wrote a b
gab 2013/03/28 03:06:06 PipeReader sounds a bit too generic for a class wi
erikwright (departed) 2013/04/18 17:43:04 That's a good warning, but all classes exist to be
+ public:
+ PipeReader(base::win::ScopedHandle exit_code_read)
gab 2013/03/28 03:06:06 "read" feels like the past-tense of "read" (aaah E
+ : success_(false), exit_code_(0) {
+ exit_code_read_ = exit_code_read.Pass();
gab 2013/03/28 03:06:06 Why can't this also be done in the initializer lis
erikwright (departed) 2013/04/18 17:43:04 It doesn't compile. I forget the exact reason why,
+ }
+
+ virtual void ThreadMain() OVERRIDE {
+ DWORD bytes_read = 0;
+ BOOL read_success = ::ReadFile(
+ exit_code_read_, &exit_code_, sizeof(exit_code_), &bytes_read, NULL);
+ if (!read_success || bytes_read != sizeof(exit_code_)) {
+ LOG(ERROR) << "Failed to read exit code.";
+ } else {
+ success_ = true;
+ }
+ }
+
+ // Only call these accessors after the PipeReader thread has completed.
+
+ DWORD exit_code() {
+ return exit_code_;
gab 2013/03/28 03:06:06 Such simple getters are usually written on a singl
erikwright (departed) 2013/04/18 17:43:04 Done.
+ }
+
+ bool success() {
+ return success_;
+ }
+
+ private:
+ bool success_;
+ DWORD exit_code_;
+
+ base::win::ScopedHandle exit_code_read_;
+};
+
+} // namespace
+
+bool LaunchOperation(const CommandLine& command_line,
+ HANDLE output_write,
+ DWORD* exit_code) {
+ base::win::ScopedHandle exit_code_read;
+ base::win::ScopedHandle exit_code_write;
gab 2013/03/28 03:06:06 How about exit_code_in/exit_code_out (see comment
+
+ if (::CreatePipe(exit_code_read.Receive(), exit_code_write.Receive(),
+ NULL, 0) == 0) {
robertshield 2013/03/28 02:38:03 I'm curious: how does this work? I had understood
erikwright (departed) 2013/03/28 02:49:53 They are not inherited. Making them inherited woul
gab 2013/03/28 03:06:06 How about using '!' instead of '== 0' check? Feels
robertshield 2013/03/28 03:39:34 Ah, sorry should have read the other end first ;-)
erikwright (departed) 2013/04/18 17:43:04 I would defer to a senior Windows developer on thi
+ PLOG(ERROR) << "CreatePipe failed.";
gab 2013/03/28 03:06:06 DPLOG (avoids shipping a ton of log strings in the
erikwright (departed) 2013/04/18 17:43:04 Done.
+ return false;
+ }
+
+ CommandLine full_command_line(command_line);
+ full_command_line.AppendSwitchASCII(
+ switches::kTaskOutputHandle,
+ base::UintToString(reinterpret_cast<int>(output_write)));
+ full_command_line.AppendSwitchASCII(
+ switches::kTaskResultHandle,
+ base::UintToString(reinterpret_cast<int>(exit_code_write.Get())));
+ full_command_line.AppendSwitchASCII(
+ switches::kTaskRemoteProcessId,
+ base::UintToString(::GetCurrentProcessId()));
+
+ base::win::ScopedHandle child_process;
+ base::win::ScopedHandle background_thread;
+
+ bool launch_result = base::LaunchProcess(full_command_line,
+ base::LaunchOptions(),
+ child_process.Receive());
+ if (!launch_result) {
+ LOG(INFO) << "Failed to execute "
+ << full_command_line.GetCommandLineString();
+ return false;
+ }
+
+ LOG(INFO) << "Executed " << full_command_line.GetCommandLineString();
+
+ PipeReader pipe_reader(exit_code_read.Pass());
+ base::PlatformThread::Create(0, &pipe_reader, background_thread.Receive());
+
+ HANDLE handles[] = {child_process.Get(), background_thread.Get()};
+ DWORD wait_result = WaitForMultipleObjects(2, handles, FALSE, INFINITE);
+ switch (wait_result) {
+ case WAIT_FAILED:
+ LOG(ERROR) << "Wait for operation failed.";
+ break;
+ case WAIT_OBJECT_0:
+ // The child process exited. If the operation is still in progress
+ // (delegated to a tertiary process) that process is required to have
+ // duplicated the write handles by now; the closing of all outstanding
+ // handles to exit_code_write will be our signal that the operation has
+ // completed.
+ exit_code_write.Close();
robertshield 2013/03/28 02:38:03 Why do we Close() here, rather than doing so when
erikwright (departed) 2013/03/28 02:49:53 We will detect the termination of the operation wh
+ break;
+ case WAIT_OBJECT_0 + 1:
+ // The reader thread has completed. We have read (or permanently failed to
+ // read) the operation exit code. The child process may or may not exit at
+ // this point, but we already have everything we need.
+ break;
+ default:
+ NOTREACHED();
+ return false;
+ break;
gab 2013/03/28 03:06:06 Remove break;, already preceded by a return statem
erikwright (departed) 2013/04/18 17:43:04 Done.
+ }
+
+ // Whether or not the thread is still running, allow Join to do whatever
+ // cleanup is required.
+ base::PlatformThread::Join(background_thread.Take());
+
+ if (pipe_reader.success())
+ *exit_code = pipe_reader.exit_code();
+ return pipe_reader.success();
+}
+
+} // namespace app_host

Powered by Google App Engine
This is Rietveld 408576698