Merge pull request #580 from evoskuil/master

Disable troubleshooting code, comments, auto.

Author: evoskuil

include/bitcoin/database/impl/primitives/hashhead.ipp

@@ -172,8 +172,7 @@ inline bool CLASS::push(const Link& current, bytes& next,
         // xcode clang++16 does not support C++20 std::atomic_ref.
         ////const std::atomic_ref<integer> head(unsafe_byte_cast<integer>(raw));
         auto& head = *pointer_cast<std::atomic<integer>>(raw);
-
-        integer top = head.load(std::memory_order_acquire);
+        auto top = head.load(std::memory_order_acquire);
         do
         {
             // Compiler could order this after head.store, which would expose key

include/bitcoin/database/impl/query/archive_write.ipp

@@ -105,22 +105,22 @@ code CLASS::set_code(tx_link& tx_fk, const transaction& tx) NOEXCEPT
     if (tx_fk.is_terminal())
         return error::tx_tx_allocate;
 
-    // Allocate contiguously and store inputs (script & witness).
+    // Allocate contiguously and store inputs.
     input_link in_fk{};
     if (!store_.input.put_link(in_fk, table::input::put_ref{ {}, tx }))
         return error::tx_input_put;
 
-    // Allocate contiguously and store outputs (script, w/parent).
+    // Allocate contiguously and store outputs.
     output_link out_fk{};
     if (!store_.output.put_link(out_fk, table::output::put_ref{ {}, tx_fk, tx }))
         return error::tx_output_put;
 
-    // Allocate and contiguously store input links (first + tx.input sizes, w/parent & seq).
+    // Allocate and contiguously store input links.
     point_link ins_fk{};
     if (!store_.ins.put_link(ins_fk, table::ins::put_ref{ {}, in_fk, tx_fk, tx }))
         return error::tx_ins_put;
 
-    // Allocate and contiguously store output links (first + tx.output sizes).
+    // Allocate and contiguously store output links.
     point_link outs_fk{};
     if (!store_.outs.put_link(outs_fk, table::outs::put_ref{ {}, out_fk, tx }))
         return error::tx_outs_put;

include/bitcoin/database/impl/query/consensus.ipp

@@ -205,25 +205,28 @@ code CLASS::push_spenders(tx_links& out, const point& point,
     auto it = store_.point.it(table::point::compose(point));
     if (!it)
     {
-        const auto key1 = it.key();
-        const auto link1 = it.self();
-        const auto get1 = it.get();
-        it.reset();
-
-        if (key1 != table::point::compose(point))
-            return error::integrity12;
-        if (!link1.is_terminal())
-            return error::integrity13;
-        if (is_null(get1))
-            return error::integrity14;
-
-        table::point::record get{};
-        if (!store_.point.get(self, get))
-            return error::integrity15;
-        if (get.hash != point.hash())
-            return error::integrity16;
-        if (get.index != point.index())
-            return error::integrity17;
+        // This verified that there was a race condition in the intial hashmap
+        // memory fence implementation, manifesting above as not found, where
+        // immediately after (below) the same object was found. Now fixed.
+        ////const auto key1 = it.key();
+        ////const auto link1 = it.self();
+        ////const auto get1 = it.get();
+        ////it.reset();
+        ////
+        ////if (key1 != table::point::compose(point))
+        ////    return error::integrity12;
+        ////if (!link1.is_terminal())
+        ////    return error::integrity13;
+        ////if (is_null(get1))
+        ////    return error::integrity14;
+        ////
+        ////table::point::record get{};
+        ////if (!store_.point.get(self, get))
+        ////    return error::integrity15;
+        ////if (get.hash != point.hash())
+        ////    return error::integrity16;
+        ////if (get.index != point.index())
+        ////    return error::integrity17;
 
         return error::integrity4;
     }