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

Unified Diff: base/memory/ref_counted.h

Issue 2783393002: Revert of Assert sequence validity on non-thread-safe RefCount manipulations (2) (Closed)
Patch Set: Created 3 years, 9 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/at_exit.cc ('k') | base/memory/ref_counted.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/memory/ref_counted.h
diff --git a/base/memory/ref_counted.h b/base/memory/ref_counted.h
index e06939d438e7a0768bff062d3b7bf05cc4144efb..503a86a45f02bd5d65c7ad0a2c6912a923eba0d7 100644
--- a/base/memory/ref_counted.h
+++ b/base/memory/ref_counted.h
@@ -16,7 +16,6 @@
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/sequence_checker.h"
#include "base/threading/thread_collision_warner.h"
#include "build/build_config.h"
@@ -29,11 +28,7 @@
bool HasOneRef() const { return ref_count_ == 1; }
protected:
- RefCountedBase() {
-#if DCHECK_IS_ON()
- sequence_checker_.DetachFromSequence();
-#endif
- }
+ RefCountedBase() {}
~RefCountedBase() {
#if DCHECK_IS_ON()
@@ -48,9 +43,6 @@
// DFAKE_SCOPED_LOCK_THREAD_LOCKED(add_release_);
#if DCHECK_IS_ON()
DCHECK(!in_dtor_);
- if (ref_count_ >= 1) {
- DCHECK(CalledOnValidSequence());
- }
#endif
++ref_count_;
@@ -69,26 +61,15 @@
DCHECK(!in_dtor_);
if (ref_count_ == 0)
in_dtor_ = true;
-
- if (ref_count_ >= 1)
- DCHECK(CalledOnValidSequence());
- if (ref_count_ == 1)
- sequence_checker_.DetachFromSequence();
#endif
return ref_count_ == 0;
}
private:
-#if DCHECK_IS_ON()
- bool CalledOnValidSequence() const;
-#endif
-
mutable size_t ref_count_ = 0;
-
#if DCHECK_IS_ON()
mutable bool in_dtor_ = false;
- mutable SequenceChecker sequence_checker_;
#endif
DFAKE_MUTEX(add_release_);
@@ -119,27 +100,6 @@
};
} // namespace subtle
-
-// ScopedAllowCrossThreadRefCountAccess disables the check documented on
-// RefCounted below for rare pre-existing use cases where thread-safety was
-// guaranteed through other means (e.g. explicit sequencing of calls across
-// execution sequences when bouncing between threads in order). New callers
-// should refrain from using this (callsites handling thread-safety through
-// locks should use RefCountedThreadSafe per the overhead of its atomics being
-// negligible compared to locks anyways and callsites doing explicit sequencing
-// should properly std::move() the ref to avoid hitting this check).
-// TODO(tzik): Cleanup existing use cases and remove
-// ScopedAllowCrossThreadRefCountAccess.
-class BASE_EXPORT ScopedAllowCrossThreadRefCountAccess final {
- public:
-#if DCHECK_IS_ON()
- ScopedAllowCrossThreadRefCountAccess();
- ~ScopedAllowCrossThreadRefCountAccess();
-#else
- ScopedAllowCrossThreadRefCountAccess() {}
- ~ScopedAllowCrossThreadRefCountAccess() {}
-#endif
-};
//
// A base class for reference counted classes. Otherwise, known as a cheap
@@ -155,12 +115,6 @@
//
// You should always make your destructor non-public, to avoid any code deleting
// the object accidently while there are references to it.
-//
-// The ref count manipulation to RefCounted is NOT thread safe and has DCHECKs
-// to trap unsafe cross thread usage. A subclass instance of RefCounted can be
-// passed to another execution sequence only when its ref count is 1. If the ref
-// count is more than 1, the RefCounted class verifies the ref updates are made
-// on the same execution sequence as the previous ones.
template <class T>
class RefCounted : public subtle::RefCountedBase {
public:
« no previous file with comments | « base/at_exit.cc ('k') | base/memory/ref_counted.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698