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

Side by Side Diff: mojo/public/cpp/environment/lib/environment.cc

Issue 1426843004: Remove the task tracking stuff in the bindings. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
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 #include "mojo/public/cpp/environment/environment.h" 5 #include "mojo/public/cpp/environment/environment.h"
6 6
7 #include <assert.h> 7 #include <assert.h>
8 8
9 #include "mojo/public/c/environment/logger.h" 9 #include "mojo/public/c/environment/logger.h"
10 #include "mojo/public/cpp/environment/lib/default_async_waiter.h" 10 #include "mojo/public/cpp/environment/lib/default_async_waiter.h"
11 #include "mojo/public/cpp/environment/lib/default_logger.h" 11 #include "mojo/public/cpp/environment/lib/default_logger.h"
12 #include "mojo/public/cpp/environment/lib/default_task_tracker.h"
13 #include "mojo/public/cpp/utility/run_loop.h" 12 #include "mojo/public/cpp/utility/run_loop.h"
14 13
15 namespace mojo { 14 namespace mojo {
16 15
17 namespace { 16 namespace {
18 17
19 const MojoAsyncWaiter* g_default_async_waiter = nullptr; 18 const MojoAsyncWaiter* g_default_async_waiter = nullptr;
20 const MojoLogger* g_default_logger = nullptr; 19 const MojoLogger* g_default_logger = nullptr;
21 const TaskTracker* g_default_task_tracker = nullptr;
22 20
23 void Init(const MojoAsyncWaiter* default_async_waiter, 21 void Init(const MojoAsyncWaiter* default_async_waiter,
24 const MojoLogger* default_logger, 22 const MojoLogger* default_logger) {
25 const TaskTracker* default_task_tracker) {
26 g_default_async_waiter = default_async_waiter 23 g_default_async_waiter = default_async_waiter
27 ? default_async_waiter 24 ? default_async_waiter
28 : &internal::kDefaultAsyncWaiter; 25 : &internal::kDefaultAsyncWaiter;
29 g_default_logger = 26 g_default_logger =
30 default_logger ? default_logger : &internal::kDefaultLogger; 27 default_logger ? default_logger : &internal::kDefaultLogger;
31 28
32 g_default_task_tracker = default_task_tracker
33 ? default_task_tracker
34 : &internal::kDefaultTaskTracker;
35
36 RunLoop::SetUp(); 29 RunLoop::SetUp();
37 } 30 }
38 31
39 } // namespace 32 } // namespace
40 33
41 Environment::Environment() { 34 Environment::Environment() {
42 Init(nullptr, nullptr, nullptr); 35 Init(nullptr, nullptr);
43 } 36 }
44 37
45 Environment::Environment(const MojoAsyncWaiter* default_async_waiter, 38 Environment::Environment(const MojoAsyncWaiter* default_async_waiter,
46 const MojoLogger* default_logger, 39 const MojoLogger* default_logger) {
47 const TaskTracker* default_task_tracker) { 40 Init(default_async_waiter, default_logger);
48 Init(default_async_waiter, default_logger, default_task_tracker);
49 } 41 }
50 42
51 Environment::~Environment() { 43 Environment::~Environment() {
52 RunLoop::TearDown(); 44 RunLoop::TearDown();
53 45
54 // TODO(vtl): Maybe we should allow nesting, and restore previous default 46 // TODO(vtl): Maybe we should allow nesting, and restore previous default
55 // async waiters and loggers? 47 // async waiters and loggers?
56 g_default_async_waiter = nullptr; 48 g_default_async_waiter = nullptr;
57 g_default_logger = nullptr; 49 g_default_logger = nullptr;
58 } 50 }
59 51
60 // static 52 // static
61 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() { 53 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() {
62 assert(g_default_async_waiter); // Fails if not "inside" |Environment|. 54 assert(g_default_async_waiter); // Fails if not "inside" |Environment|.
63 return g_default_async_waiter; 55 return g_default_async_waiter;
64 } 56 }
65 57
66 // static 58 // static
67 const MojoLogger* Environment::GetDefaultLogger() { 59 const MojoLogger* Environment::GetDefaultLogger() {
68 assert(g_default_logger); // Fails if not "inside" |Environment|. 60 assert(g_default_logger); // Fails if not "inside" |Environment|.
69 return g_default_logger; 61 return g_default_logger;
70 } 62 }
71 63
72 // static 64 // static
73 const TaskTracker* Environment::GetDefaultTaskTracker() {
74 return g_default_task_tracker;
75 }
76
77 // static
78 void Environment::InstantiateDefaultRunLoop() { 65 void Environment::InstantiateDefaultRunLoop() {
79 assert(!RunLoop::current()); 66 assert(!RunLoop::current());
80 // Not leaked: accessible from |RunLoop::current()|. 67 // Not leaked: accessible from |RunLoop::current()|.
81 RunLoop* run_loop = new RunLoop(); 68 RunLoop* run_loop = new RunLoop();
82 MOJO_ALLOW_UNUSED_LOCAL(run_loop); 69 MOJO_ALLOW_UNUSED_LOCAL(run_loop);
83 assert(run_loop == RunLoop::current()); 70 assert(run_loop == RunLoop::current());
84 } 71 }
85 72
86 // static 73 // static
87 void Environment::DestroyDefaultRunLoop() { 74 void Environment::DestroyDefaultRunLoop() {
88 assert(RunLoop::current()); 75 assert(RunLoop::current());
89 delete RunLoop::current(); 76 delete RunLoop::current();
90 assert(!RunLoop::current()); 77 assert(!RunLoop::current());
91 } 78 }
92 79
93 } // namespace mojo 80 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/environment/lib/default_task_tracker.cc ('k') | mojo/public/cpp/environment/lib/logging_only_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698