Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/threading/thread_restrictions.h" | 5 #include "base/threading/thread_restrictions.h" |
| 6 | 6 |
| 7 // This entire file is compiled out in Release mode. | 7 // This entire file is compiled out in Release mode. |
| 8 #ifndef NDEBUG | 8 #ifndef NDEBUG |
| 9 | 9 |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 // static | 26 // static |
| 27 bool ThreadRestrictions::SetIOAllowed(bool allowed) { | 27 bool ThreadRestrictions::SetIOAllowed(bool allowed) { |
| 28 bool previous_disallowed = g_io_disallowed.Get().Get(); | 28 bool previous_disallowed = g_io_disallowed.Get().Get(); |
| 29 g_io_disallowed.Get().Set(!allowed); | 29 g_io_disallowed.Get().Set(!allowed); |
| 30 return !previous_disallowed; | 30 return !previous_disallowed; |
| 31 } | 31 } |
| 32 | 32 |
| 33 // static | 33 // static |
| 34 void ThreadRestrictions::AssertIOAllowed() { | 34 void ThreadRestrictions::AssertIOAllowed() { |
| 35 if (g_io_disallowed.Get().Get()) { | 35 if (g_io_disallowed.Get().Get()) { |
| 36 LOG(FATAL) << | 36 LOG(ERROR) << |
|
grt (UTC plus 2)
2011/09/23 04:18:42
uh, obviously this wasn't supposed to be included.
robertshield
2011/09/23 14:22:18
Ok, please remove, I suspect that this would make
| |
| 37 "Function marked as IO-only was called from a thread that " | 37 "Function marked as IO-only was called from a thread that " |
| 38 "disallows IO! If this thread really should be allowed to " | 38 "disallows IO! If this thread really should be allowed to " |
| 39 "make IO calls, adjust the call to " | 39 "make IO calls, adjust the call to " |
| 40 "base::ThreadRestrictions::SetIOAllowed() in this thread's " | 40 "base::ThreadRestrictions::SetIOAllowed() in this thread's " |
| 41 "startup."; | 41 "startup."; |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 | 44 |
| 45 bool ThreadRestrictions::SetSingletonAllowed(bool allowed) { | 45 bool ThreadRestrictions::SetSingletonAllowed(bool allowed) { |
| 46 bool previous_disallowed = g_singleton_disallowed.Get().Get(); | 46 bool previous_disallowed = g_singleton_disallowed.Get().Get(); |
| 47 g_singleton_disallowed.Get().Set(!allowed); | 47 g_singleton_disallowed.Get().Set(!allowed); |
| 48 return !previous_disallowed; | 48 return !previous_disallowed; |
| 49 } | 49 } |
| 50 | 50 |
| 51 // static | 51 // static |
| 52 void ThreadRestrictions::AssertSingletonAllowed() { | 52 void ThreadRestrictions::AssertSingletonAllowed() { |
| 53 if (g_singleton_disallowed.Get().Get()) { | 53 if (g_singleton_disallowed.Get().Get()) { |
| 54 LOG(FATAL) << "LazyInstance/Singleton is not allowed to be used on this " | 54 LOG(FATAL) << "LazyInstance/Singleton is not allowed to be used on this " |
| 55 << "thread. Most likely it's because this thread is not " | 55 << "thread. Most likely it's because this thread is not " |
| 56 << "joinable, so AtExitManager may have deleted the object " | 56 << "joinable, so AtExitManager may have deleted the object " |
| 57 << "on shutdown, leading to a potential shutdown crash."; | 57 << "on shutdown, leading to a potential shutdown crash."; |
| 58 } | 58 } |
| 59 } | 59 } |
| 60 | 60 |
| 61 } // namespace base | 61 } // namespace base |
| 62 | 62 |
| 63 #endif // NDEBUG | 63 #endif // NDEBUG |
| OLD | NEW |