Eliminate platform-specific interlocked routines

src/autonet/AutoNetServerImpl.cpp

@@ -200,7 +200,7 @@ void AutoNetServerImpl::NewObject(CoreContext& ctxt, const CoreObjectDescriptor&
     // Add slots for this object
     {
       Json::array slots;
-      for(auto slot = object.stump->pHead; slot; slot = slot->pFlink) {
+      for(const SlotInformation* slot = object.stump->pHead; slot; slot = slot->pFlink) {
         slots.push_back(Json::object{
             {"id", autowiring::demangle(slot->type)},
             {"autoRequired", slot->autoRequired},

src/autowiring/CMakeLists.txt

@@ -123,7 +123,6 @@ set(Autowiring_SRCS
   HeteroBlock.h
   HeteroBlock.cpp
   index_tuple.h
-  InterlockedExchange.h
   is_any.h
   is_shared_ptr.h
   ManualThreadPool.h
@@ -215,7 +214,6 @@ add_windows_sources(Autowiring_SRCS
   SystemThreadPoolWinXP.hpp
   SystemThreadPoolWinLH.cpp
   SystemThreadPoolWinLH.hpp
-  InterlockedExchangeWin.cpp
   thread_specific_ptr_win.cpp
 )
 
@@ -226,7 +224,6 @@ add_mac_sources(Autowiring_SRCS
 
 add_unix_sources(Autowiring_SRCS
   CreationRulesUnix.cpp
-  InterlockedExchangeUnix.cpp
   thread_specific_ptr_unix.cpp
 )
 
@@ -236,16 +233,6 @@ set(Autowiring_Linux_SRCS
 
 add_conditional_sources(Autowiring_SRCS "NOT MSVC" GROUP_NAME "Non-Windows Source" FILES ${Autowiring_Unix_SRCS})
 
-add_conditional_sources(
-  Autowiring_SRCS "WIN32 AND standard_BUILD_ARCHITECTURES EQUAL x86"
-  GROUP_NAME "ASMx86 Source"
-  FILES interlocked.asm
-)
-
-if(WIN32 AND standard_BUILD_ARCHITECTURES EQUAL "x86")
-  enable_language(ASM_MASM)
-endif()
-
 add_conditional_sources(
   Autowiring_SRCS
   "NOT WIN32 AND NOT APPLE"

src/autowiring/CoreContext.cpp

@@ -102,7 +102,7 @@ CoreContext::~CoreContext(void) {
       uint8_t* pBase = (uint8_t*)ccType.value.ptr();
 
       // Enumerate all slots and unlink them one at a time
-      for (auto cur = ccType.stump->pHead; cur; cur = cur->pFlink) {
+      for (const SlotInformation* cur = ccType.stump->pHead; cur; cur = cur->pFlink) {
         if (cur->autoRequired)
           // Only unlink slots that were Autowired.  AutoRequired slots will never participate
           // in a cycle (because we would wind up with constructive chaos) so we don't really

src/autowiring/SlotInformation.cpp

@@ -2,7 +2,6 @@
 #include "stdafx.h"
 #include "SlotInformation.h"
 #include "AutowirableSlot.h"
-#include "InterlockedExchange.h"
 #include "thread_specific_ptr.h"
 #include MEMORY_HEADER
 
@@ -20,23 +19,19 @@ SlotInformationStackLocation::SlotInformationStackLocation(SlotInformationStumpB
   tss.reset(this);
 }
 
-template<class T>
-void UpdateOrCascadeDelete(T* ptr, const T*& dest) {
-  if(!compare_exchange<T>(&dest, ptr, nullptr))
-    // Exchange passed, the destination now owns this pointer
-    return;
-
-  // Failed the exchange, return here
-  std::unique_ptr<const T> prior;
-  for(const auto* cur = ptr; cur; cur = cur->pFlink)
-    prior.reset(cur);
-}
-
 SlotInformationStackLocation::~SlotInformationStackLocation(void) {
   // Replace the prior stack location, we were pushed
   tss.reset(&prior);
 
-  UpdateOrCascadeDelete(m_pCur, stump.pHead);
+  const SlotInformation* p = nullptr;
+  if (!stump.pHead.compare_exchange_strong(p, m_pCur, std::memory_order_acquire)) {
+    // Failed the exchange, destroy
+    std::unique_ptr<SlotInformation> prior;
+    for (const auto* cur = m_pCur; cur; cur = cur->pFlink)
+      prior.reset(m_pCur);
+  }
+  ///else
+    // Exchange passed, the destination now owns this pointer
 
   // Unconditionally update to true, no CAS needed
   stump.bInitialized = true;

src/autowiring/SlotInformation.h

@@ -2,6 +2,7 @@
 #pragma once
 #include "auto_id.h"
 #include "TypeUnifier.h"
+#include <atomic>
 #include <typeinfo>
 #include MEMORY_HEADER
 
@@ -39,7 +40,9 @@ struct SlotInformation {
 struct SlotInformationStumpBase {
   SlotInformationStumpBase(const std::type_info& ti) :
     ti(ti)
-  {}
+  {
+    pHead = nullptr;
+  }
 
   // RTTI to which this stump pertains
   const std::type_info& ti;
@@ -48,7 +51,7 @@ struct SlotInformationStumpBase {
   bool bInitialized = false;
 
   // Current slot information:
-  const SlotInformation* pHead = nullptr;
+  std::atomic<const SlotInformation*> pHead;
 };
 
 /// <summary>

src/autowiring/TeardownNotifier.cpp

@@ -1,12 +1,13 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #include "stdafx.h"
 #include "TeardownNotifier.h"
-#include "InterlockedExchange.h"
 
 using namespace autowiring;
 
 TeardownNotifier::TeardownNotifier(void)
-{}
+{
+  m_pFirstTeardownListener = nullptr;
+}
 
 TeardownNotifier::~TeardownNotifier(void) {
   // Notify all teardown listeners, this will be our last opportunity to do so:
@@ -15,7 +16,7 @@ TeardownNotifier::~TeardownNotifier(void) {
 
 void TeardownNotifier::NotifyTeardownListeners(void) {
   EntryBase* next;
-  for (auto cur = m_pFirstTeardownListener; cur; cur = next) {
+  for (EntryBase* cur = m_pFirstTeardownListener; cur; cur = next) {
     next = cur->pFlink;
     (*cur)();
     delete cur;
@@ -25,9 +26,7 @@ void TeardownNotifier::NotifyTeardownListeners(void) {
 }
 
 void TeardownNotifier::AddTeardownListenerInternal(EntryBase* listener) {
-  EntryBase* pResult;
-  do {
-    listener->pFlink = m_pFirstTeardownListener;
-    pResult = compare_exchange<EntryBase>(&m_pFirstTeardownListener, listener, listener->pFlink);
-  } while (pResult != listener->pFlink);
+  EntryBase* priorHead = m_pFirstTeardownListener;
+  while (!m_pFirstTeardownListener.compare_exchange_weak(priorHead, listener))
+    listener->pFlink = priorHead;
 }

src/autowiring/TeardownNotifier.h

@@ -1,6 +1,7 @@
 // Copyright (C) 2012-2015 Leap Motion, Inc. All rights reserved.
 #pragma once
 #include "C++11/cpp11.h"
+#include <atomic>
 #include RVALUE_HEADER
 
 namespace autowiring {
@@ -38,7 +39,7 @@ class TeardownNotifier
   };
 
   // Teardown listeners, invoked in sequence when the context is tearing down
-  EntryBase* m_pFirstTeardownListener = nullptr;
+  std::atomic<EntryBase*> m_pFirstTeardownListener;
 
   /// <summary>
   /// May be invoked prospectively by a derived instance to prematurely notify teardown listeners

src/autowiring/test/CMakeLists.txt

@@ -47,7 +47,6 @@ set(AutowiringTest_SRCS
   GlobalInitTest.hpp
   GlobalInitTest.cpp
   HeteroBlockTest.cpp
-  InterlockedRoutinesTest.cpp
   MarshallerTest.cpp
   MultiInheritTest.cpp
   ObjectPoolTest.cpp

src/autowiring/test/ContextMemberTest.cpp

@@ -59,7 +59,7 @@ TEST_F(ContextMemberTest, VerifyDetectedMembers)
   // Validate all pointers are what we expect to find, and in the right order
   size_t ct = 0;
 
-  for(auto cur = SlotInformationStump<HasAFewSlots>::s_stump.pHead; cur; cur = cur->pFlink) {
+  for(const SlotInformation* cur = SlotInformationStump<HasAFewSlots>::s_stump.pHead; cur; cur = cur->pFlink) {
     // Validate slot types:
     ASSERT_EQ(expected[ct].type, cur->type) << "Slot number " << ct << " had a mismatched type";
     ASSERT_EQ(expected[ct].slotOffset, cur->slotOffset) << "Slot number " << ct << " had a mismatched offset";
@@ -81,14 +81,14 @@ TEST_F(ContextMemberTest, RecursiveRelationshipNoContextMember) {
 
   // Now verify that we only get the type we expect, and none of the transitive types:
   size_t ct = 0;
-  for(auto cur = SlotInformationStump<AutoRequiresSomething>::s_stump.pHead; cur; cur = cur->pFlink)
+  for(const SlotInformation* cur = SlotInformationStump<AutoRequiresSomething>::s_stump.pHead; cur; cur = cur->pFlink)
     ct++;
   ASSERT_LE(1UL, ct) << "Recursive construction of an AutoRequired type incorrectly mapped in slots in a created field";
   ASSERT_GE(ct, 1UL) << "Recursive construction failed to map a type after an AutoRequired field was constructed";
 
   // Descendant type should also be correctly initialized:
   ct = 0;
-  for(auto cur = SlotInformationStump<HasAFewSlots>::s_stump.pHead; cur; cur = cur->pFlink)
+  for(const SlotInformation* cur = SlotInformationStump<HasAFewSlots>::s_stump.pHead; cur; cur = cur->pFlink)
     ct++;
   ASSERT_EQ(3UL, ct) << "Recursively AutoRequired type did not enumerate all of the expected slots upon reflection";
 }
@@ -109,7 +109,7 @@ TEST_F(ContextMemberTest, TransientAutowiring) {
   AutoRequired<AutowiresInCtor> aictor;
 
   size_t ct = 0;
-  for(auto cur = SlotInformationStump<AutowiresInCtor>::s_stump.pHead; cur; cur = cur->pFlink)
+  for(const SlotInformation* cur = SlotInformationStump<AutowiresInCtor>::s_stump.pHead; cur; cur = cur->pFlink)
     ct++;
 
   ASSERT_EQ(1UL, ct) << "An autowirable slot declared on the stack was incorrectly detected as being a type member";