OLD | NEW |
---|---|
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
Yusuke Sato
2016/06/02 21:50:11
Comment to the CL description:
I think you should
Hsu-Cheng
2016/06/29 10:33:57
Done.
Yusuke Sato
2016/06/30 19:46:51
Not yet done?
| |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_PROCESS_SERVICE_H_ | 5 #ifndef CHROME_BROWSER_CHROMEOS_ARC_ARC_PROCESS_SERVICE_H_ |
6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_PROCESS_SERVICE_H_ | 6 #define CHROME_BROWSER_CHROMEOS_ARC_ARC_PROCESS_SERVICE_H_ |
7 | 7 |
8 #include <map> | 8 #include <map> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/callback.h" | 11 #include "base/callback.h" |
12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
14 #include "base/process/process_iterator.h" | |
14 #include "base/threading/sequenced_worker_pool.h" | 15 #include "base/threading/sequenced_worker_pool.h" |
15 #include "base/threading/thread_checker.h" | 16 #include "base/threading/thread_checker.h" |
16 #include "chrome/browser/chromeos/arc/arc_process.h" | 17 #include "chrome/browser/chromeos/arc/arc_process.h" |
17 #include "components/arc/arc_bridge_service.h" | 18 #include "components/arc/arc_bridge_service.h" |
18 #include "components/arc/arc_service.h" | 19 #include "components/arc/arc_service.h" |
19 | 20 |
20 namespace arc { | 21 namespace arc { |
21 | 22 |
22 // A single global entry to get a list of ARC processes. | 23 // A single global entry to get a list of ARC processes. |
23 // | 24 // |
24 // Call RequestProcessList() on the main UI thread to get a list of all ARC | 25 // Call RequestAppProcessList() / RequestSystemProcessList on the main UI |
cylee1
2016/06/02 20:58:45
nit: RequestSystemProcessList()
Hsu-Cheng
2016/06/29 10:33:57
Done.
| |
25 // processes. It returns vector<arc::ArcProcess>, which includes pid <-> nspid | 26 // thread to get a list of all ARC app / system processes. It returns |
26 // mapping. | 27 // vector<arc::ArcProcess>, which includes pid <-> nspid mapping. |
27 // Example: | 28 // Example: |
28 // void OnUpdateProcessList(const vector<arc::ArcProcess>&) {...} | 29 // void OnUpdateProcessList(const vector<arc::ArcProcess>&) {...} |
29 // | 30 // |
30 // arc::ArcProcessService* arc_process_service = | 31 // arc::ArcProcessService* arc_process_service = |
31 // arc::ArcProcessService::Get(); | 32 // arc::ArcProcessService::Get(); |
32 // if (!arc_process_service || | 33 // if (!arc_process_service || |
33 // !arc_process_service->RequestProcessList( | 34 // !arc_process_service->RequestAppProcessList( |
34 // base::Bind(&OnUpdateProcessList)) { | 35 // base::Bind(&OnUpdateProcessList)) { |
35 // LOG(ERROR) << "ARC process instance not ready."; | 36 // LOG(ERROR) << "ARC process instance not ready."; |
36 // } | 37 // } |
37 class ArcProcessService : public ArcService, | 38 class ArcProcessService : public ArcService, |
38 public ArcBridgeService::Observer { | 39 public ArcBridgeService::Observer { |
39 public: | 40 public: |
40 using RequestProcessListCallback = | 41 using RequestProcessListCallback = |
41 base::Callback<void(const std::vector<ArcProcess>&)>; | 42 base::Callback<void(const std::vector<ArcProcess>&)>; |
42 | 43 |
43 explicit ArcProcessService(ArcBridgeService* bridge_service); | 44 explicit ArcProcessService(ArcBridgeService* bridge_service); |
44 ~ArcProcessService() override; | 45 ~ArcProcessService() override; |
45 | 46 |
46 // Returns nullptr before the global instance is ready. | 47 // Returns nullptr before the global instance is ready. |
47 static ArcProcessService* Get(); | 48 static ArcProcessService* Get(); |
48 | 49 |
49 // ArcBridgeService::Observer overrides. | 50 // ArcBridgeService::Observer overrides. |
50 void OnProcessInstanceReady() override; | 51 void OnProcessInstanceReady() override; |
51 | 52 |
52 // Returns true if ARC IPC is ready for process list request, | 53 // Returns true if ARC IPC is ready for process list request, |
53 // otherwise false. | 54 // otherwise false. |
54 bool RequestProcessList(RequestProcessListCallback callback); | 55 bool RequestAppProcessList(RequestProcessListCallback callback); |
56 bool RequestSystemProcessList(RequestProcessListCallback callback); | |
cylee1
2016/06/02 20:58:45
Have you measured how much time does the function
Hsu-Cheng
2016/06/29 10:33:57
I didn't test it with stress scenario. The time ne
| |
55 | 57 |
56 private: | 58 private: |
57 void Reset(); | 59 void Reset(); |
58 | 60 |
61 void FetchAndReturnSystemProcessList(std::vector<ArcProcess>* ret_processes); | |
62 | |
63 base::ProcessId GetArcInitProcessId( | |
Yusuke Sato
2016/06/02 21:50:11
can be static
Hsu-Cheng
2016/06/29 10:33:57
Done.
| |
64 const base::ProcessIterator::ProcessEntries& entry_list); | |
65 | |
59 void OnReceiveProcessList( | 66 void OnReceiveProcessList( |
60 const RequestProcessListCallback& callback, | 67 const RequestProcessListCallback& callback, |
61 mojo::Array<arc::mojom::RunningAppProcessInfoPtr> mojo_processes); | 68 mojo::Array<arc::mojom::RunningAppProcessInfoPtr> mojo_processes); |
62 | 69 |
63 void CallbackRelay( | 70 void CallbackRelay( |
64 const RequestProcessListCallback& callback, | 71 const RequestProcessListCallback& callback, |
65 const std::vector<ArcProcess>* ret_processes); | 72 const std::vector<ArcProcess>* ret_processes); |
66 | 73 |
67 void UpdateAndReturnProcessList( | 74 void UpdateAndReturnProcessList( |
68 const std::vector<arc::mojom::RunningAppProcessInfoPtr>* raw_processes, | 75 const std::vector<arc::mojom::RunningAppProcessInfoPtr>* raw_processes, |
(...skipping 18 matching lines...) Expand all Loading... | |
87 // Always keep this the last member of this class to make sure it's the | 94 // Always keep this the last member of this class to make sure it's the |
88 // first thing to be destructed. | 95 // first thing to be destructed. |
89 base::WeakPtrFactory<ArcProcessService> weak_ptr_factory_; | 96 base::WeakPtrFactory<ArcProcessService> weak_ptr_factory_; |
90 | 97 |
91 DISALLOW_COPY_AND_ASSIGN(ArcProcessService); | 98 DISALLOW_COPY_AND_ASSIGN(ArcProcessService); |
92 }; | 99 }; |
93 | 100 |
94 } // namespace arc | 101 } // namespace arc |
95 | 102 |
96 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_PROCESS_SERVICE_H_ | 103 #endif // CHROME_BROWSER_CHROMEOS_ARC_ARC_PROCESS_SERVICE_H_ |
OLD | NEW |