Index: remoting/host/win/wts_session_process_launcher.h |
diff --git a/remoting/host/win/wts_session_process_launcher.h b/remoting/host/win/wts_session_process_launcher.h |
index 3bde4c1c3fdf6c67e51eb08277a9d3ac97e71113..e85412e4fc3c58161249818d6576b06bf43abbab 100644 |
--- a/remoting/host/win/wts_session_process_launcher.h |
+++ b/remoting/host/win/wts_session_process_launcher.h |
@@ -11,6 +11,7 @@ |
#include "base/compiler_specific.h" |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
+#include "base/message_loop.h" |
#include "base/process.h" |
#include "base/time.h" |
#include "base/timer.h" |
@@ -35,7 +36,8 @@ class SasInjector; |
class WtsConsoleMonitor; |
class WtsSessionProcessLauncher |
- : public Stoppable, |
+ : public base::MessagePumpForIO::IOHandler, |
+ public Stoppable, |
public WorkerProcessLauncher::Delegate, |
public WtsConsoleObserver { |
public: |
@@ -51,6 +53,11 @@ class WtsSessionProcessLauncher |
virtual ~WtsSessionProcessLauncher(); |
Wez
2012/08/14 01:08:59
You're using base::Unretained in PostTask() on thi
alexeypa (please no reviews)
2012/08/14 05:43:22
Added CHECKs to ~Stoppable and ~WtsSessionProcessL
|
+ // base::MessagePumpForIO::IOHandler implementation. |
+ virtual void OnIOCompleted(base::MessagePumpForIO::IOContext* context, |
+ DWORD bytes_transfered, |
+ DWORD error) OVERRIDE; |
+ |
// WorkerProcessLauncher::Delegate implementation. |
virtual bool DoLaunchProcess( |
const std::string& channel_name, |
@@ -67,6 +74,20 @@ class WtsSessionProcessLauncher |
// Stoppable implementation. |
virtual void DoStop() OVERRIDE; |
+ // Drains the completion port queue to make sure that all job object |
Wez
2012/08/14 01:08:59
nit: Clarify that you're referring to the Windows
alexeypa (please no reviews)
2012/08/14 05:43:22
Searching Chromium tree reveals that the terms "co
|
+ // notifications has been received. |
+ void DrainJobNotifications(); |
+ |
+ // Notifies that the completion port queue has been drained. |
+ void DrainJobNotificationsCompleted(); |
+ |
+ // Creates and initializes the job object that will sandbox the launched child |
+ // processes. |
+ void InitializeJob(); |
+ |
+ // Notifies that the job object initialization is complete. |
+ void InitializeJobCompleted(scoped_ptr<base::win::ScopedHandle> job); |
+ |
private: |
// Attempts to launch the host process in the current console session. |
// Schedules next launch attempt if creation of the process fails for any |
@@ -103,6 +124,22 @@ class WtsSessionProcessLauncher |
scoped_ptr<WorkerProcessLauncher> launcher_; |
+ // The job object used to control the lifetime of child processes. |
+ base::win::ScopedHandle job_; |
+ |
+ // A waiting handle that becomes signalled once all process associated with |
+ // the job have been terminated. |
+ base::win::ScopedHandle process_exit_event_; |
+ |
+ enum JobState { |
+ kJobUninitialized, |
+ kJobRunning, |
+ kJobStopping, |
+ kJobStopped |
+ }; |
+ |
+ JobState job_state_; |
+ |
base::win::ScopedHandle worker_process_; |
// The token to be used to launch a process in a different session. |