| OLD | NEW |
| 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/utility/run_loop.h" | 12 #include "mojo/public/cpp/utility/run_loop.h" |
| 13 | 13 |
| 14 namespace mojo { | 14 namespace mojo { |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 const MojoAsyncWaiter* g_default_async_waiter = nullptr; | 18 const MojoAsyncWaiter* g_default_async_waiter = nullptr; |
| 19 const MojoLogger* g_default_logger = nullptr; | 19 const MojoLogger* g_default_logger = nullptr; |
| 20 | 20 |
| 21 void Init(const MojoAsyncWaiter* default_async_waiter, | 21 void Init(const MojoAsyncWaiter* default_async_waiter, |
| 22 const MojoLogger* default_logger) { | 22 const MojoLogger* default_logger) { |
| 23 g_default_async_waiter = default_async_waiter | 23 g_default_async_waiter = default_async_waiter |
| 24 ? default_async_waiter | 24 ? default_async_waiter |
| 25 : &internal::kDefaultAsyncWaiter; | 25 : &internal::kDefaultAsyncWaiter; |
| 26 g_default_logger = | 26 g_default_logger = |
| 27 default_logger ? default_logger : &internal::kDefaultLogger; | 27 default_logger ? default_logger : &internal::kDefaultLogger; |
| 28 | |
| 29 RunLoop::SetUp(); | |
| 30 } | 28 } |
| 31 | 29 |
| 32 } // namespace | 30 } // namespace |
| 33 | 31 |
| 34 Environment::Environment() { | 32 Environment::Environment() { |
| 35 Init(nullptr, nullptr); | 33 Init(nullptr, nullptr); |
| 36 } | 34 } |
| 37 | 35 |
| 38 Environment::Environment(const MojoAsyncWaiter* default_async_waiter, | 36 Environment::Environment(const MojoAsyncWaiter* default_async_waiter, |
| 39 const MojoLogger* default_logger) { | 37 const MojoLogger* default_logger) { |
| 40 Init(default_async_waiter, default_logger); | 38 Init(default_async_waiter, default_logger); |
| 41 } | 39 } |
| 42 | 40 |
| 43 Environment::~Environment() { | 41 Environment::~Environment() { |
| 44 RunLoop::TearDown(); | |
| 45 | |
| 46 // TODO(vtl): Maybe we should allow nesting, and restore previous default | 42 // TODO(vtl): Maybe we should allow nesting, and restore previous default |
| 47 // async waiters and loggers? | 43 // async waiters and loggers? |
| 48 g_default_async_waiter = nullptr; | 44 g_default_async_waiter = nullptr; |
| 49 g_default_logger = nullptr; | 45 g_default_logger = nullptr; |
| 50 } | 46 } |
| 51 | 47 |
| 52 // static | 48 // static |
| 53 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() { | 49 const MojoAsyncWaiter* Environment::GetDefaultAsyncWaiter() { |
| 54 assert(g_default_async_waiter); // Fails if not "inside" |Environment|. | 50 assert(g_default_async_waiter); // Fails if not "inside" |Environment|. |
| 55 return g_default_async_waiter; | 51 return g_default_async_waiter; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 77 } | 73 } |
| 78 | 74 |
| 79 // static | 75 // static |
| 80 void Environment::DestroyDefaultRunLoop() { | 76 void Environment::DestroyDefaultRunLoop() { |
| 81 assert(RunLoop::current()); | 77 assert(RunLoop::current()); |
| 82 delete RunLoop::current(); | 78 delete RunLoop::current(); |
| 83 assert(!RunLoop::current()); | 79 assert(!RunLoop::current()); |
| 84 } | 80 } |
| 85 | 81 |
| 86 } // namespace mojo | 82 } // namespace mojo |
| OLD | NEW |