Changeset 181a6af

Timestamp:

Mar 20, 2019, 1:53:02 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

114bde6

Parents:

42f1279c

Message:

Walk back history changes to persistent map

File:

• src/Common/PersistentMap.h (modified) (8 diffs)

src/Common/PersistentMap.h

@@ -114 +114 @@
         }
 
-        /// check if this is the only reference to itself
-        /// NOTE: optimizations employing this function are not thread-safe
-        bool is_shared(long local_ptrs = 0) const {
-                // 2 accounts for both the pointer which owns "this" and the one created for its use_count
-                return (this->shared_from_this().use_count() - local_ptrs) > 2;
-        }
-
 public:
         using key_type = typename Base::key_type;
@@ -154 +147 @@
                 // remove map from base
                 Base base_map = base->take_as<Base>();
+                base->reset_as_base();
 
                 // switch base to inverse of self and mutate base map
@@ -161 +155 @@
                                 auto it = base_map.find( self.key );
 
-                                if ( base->is_shared( 1 ) ) {
-                                        base->reset_as_base();
-                                        base->init<Ins>( 
+                                base->init<Ins>( 
                                                 mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
-                                        base->mode = INS;
-                                }
+                                base->mode = INS;
 
                                 base_map.erase( it );
@@ -174 +165 @@
                                 Ins& self = mut_this->as<Ins>();
 
-                                if ( base->is_shared( 1 ) ) {
-                                        base->reset_as_base();
-                                        base->init<Rem>( mut_this->shared_from_this(), self.key );
-                                        base->mode = REM;
-                                }
+                                base->init<Rem>( mut_this->shared_from_this(), self.key );
+                                base->mode = REM;
 
                                 base_map.emplace( std::move(self.key), std::move(self.val) );
@@ -187 +175 @@
                                 auto it = base_map.find( self.key );
 
-                                if ( base->is_shared( 1 ) ) {
-                                        base->reset_as_base();
-                                        base->init<Ins>( 
+                                base->init<Ins>( 
                                                 mut_this->shared_from_this(), std::move(self.key), std::move(it->second) );
-                                        base->mode = UPD;
-                                }
+                                base->mode = UPD;
 
                                 it->second = std::move(self.val);
@@ -257 +242 @@
                 // transfer map to new node
                 Ptr ret = std::make_shared<Self>( take_as<Base>() );
+                reset_as_base();
                 Base& base_map = ret->as<Base>();
 
@@ -262 +248 @@
                 auto it = base_map.find( k );
                 if ( it == base_map.end() ) {
-                        if ( is_shared() ) {
-                                // set self to REM node and insert into base
-                                reset_as_base();
-                                init<Rem>( ret, k );
-                                mode = REM;
-                        }
+                        // set self to REM node and insert into base
+                        init<Rem>( ret, k );
+                        mode = REM;
 
                         base_map.emplace_hint( it, std::forward<K>(k), std::forward<V>(v) );
                 } else {
-                        if ( is_shared() ) {
-                                // set self to UPD node and modify base
-                                reset_as_base();
-                                init<Ins>( ret, std::forward<K>(k), std::move(it->second) );
-                                mode = UPD;
-                        }
+                        // set self to UPD node and modify base
+                        init<Ins>( ret, std::forward<K>(k), std::move(it->second) );
+                        mode = UPD;
 
                         it->second = std::forward<V>(v);
@@ -293 +273 @@
                 // transfer map to new node
                 Ptr ret = std::make_shared<Self>( take_as<Base>() );
+                reset_as_base();
                 Base& base_map = ret->as<Base>();
 
-                if ( is_shared() ) {
-                        // set self to INS node and remove from base
-                        reset_as_base();
-                        init<Ins>( ret, k, base_map[k] );
-                        mode = INS;
-                }
+                // set self to INS node and remove from base
+                init<Ins>( ret, k, base_map[k] );
+                mode = INS;
 
                 base_map.erase( k );