From 056261eb833b833e8b5edb90f37207c4c622a40d Mon Sep 17 00:00:00 2001 From: Yedidya Feldblum Date: Mon, 30 Oct 2017 17:57:54 -0700 Subject: [PATCH] Move folly/experimental/AsymmetricMemoryBarrier.h Summary: [Folly] Move `folly/experimental/AsymmetricMemoryBarrier.h` to `folly/synchronization/AsymmetricMemoryBarrier.h`. Reviewed By: Orvid Differential Revision: D6180676 fbshipit-source-id: f4833318cd365181e202d5f379815e728fba168b --- folly/Makefile.am | 4 ++-- folly/experimental/TLRefCount.h | 2 +- folly/experimental/hazptr/hazptr-impl.h | 2 +- .../AsymmetricMemoryBarrier.cpp | 0 .../AsymmetricMemoryBarrier.h | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename folly/{experimental => synchronization}/AsymmetricMemoryBarrier.cpp (100%) rename folly/{experimental => synchronization}/AsymmetricMemoryBarrier.h (100%) diff --git a/folly/Makefile.am b/folly/Makefile.am index d535a3b6..a351f990 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -126,7 +126,6 @@ nobase_follyinclude_HEADERS = \ Expected.h \ concurrency/AtomicSharedPtr.h \ concurrency/detail/AtomicSharedPtr-detail.h \ - experimental/AsymmetricMemoryBarrier.h \ experimental/AutoTimer.h \ experimental/ThreadedRepeatingFunctionRunner.h \ experimental/Bits.h \ @@ -423,6 +422,7 @@ nobase_follyinclude_HEADERS = \ stats/MultiLevelTimeSeries.h \ stats/TimeseriesHistogram-defs.h \ stats/TimeseriesHistogram.h \ + synchronization/AsymmetricMemoryBarrier.h \ synchronization/CallOnce.h \ synchronization/detail/AtomicUtils.h \ system/MemoryMapping.h \ @@ -609,6 +609,7 @@ libfolly_la_SOURCES = \ stats/Histogram.cpp \ stats/MultiLevelTimeSeries.cpp \ stats/TimeseriesHistogram.cpp \ + synchronization/AsymmetricMemoryBarrier.cpp \ system/MemoryMapping.cpp \ system/Shell.cpp \ system/ThreadName.cpp \ @@ -617,7 +618,6 @@ libfolly_la_SOURCES = \ TimeoutQueue.cpp \ Try.cpp \ Uri.cpp \ - experimental/AsymmetricMemoryBarrier.cpp \ experimental/ThreadedRepeatingFunctionRunner.cpp \ experimental/bser/Dump.cpp \ experimental/bser/Load.cpp \ diff --git a/folly/experimental/TLRefCount.h b/folly/experimental/TLRefCount.h index 3e099ea8..e8baf26e 100644 --- a/folly/experimental/TLRefCount.h +++ b/folly/experimental/TLRefCount.h @@ -16,7 +16,7 @@ #pragma once #include -#include +#include namespace folly { diff --git a/folly/experimental/hazptr/hazptr-impl.h b/folly/experimental/hazptr/hazptr-impl.h index 82734d6f..a9f4c20b 100644 --- a/folly/experimental/hazptr/hazptr-impl.h +++ b/folly/experimental/hazptr/hazptr-impl.h @@ -59,8 +59,8 @@ #endif #include -#include #include +#include #include // for thread caching #include // for hash set in bulk reclamation diff --git a/folly/experimental/AsymmetricMemoryBarrier.cpp b/folly/synchronization/AsymmetricMemoryBarrier.cpp similarity index 100% rename from folly/experimental/AsymmetricMemoryBarrier.cpp rename to folly/synchronization/AsymmetricMemoryBarrier.cpp diff --git a/folly/experimental/AsymmetricMemoryBarrier.h b/folly/synchronization/AsymmetricMemoryBarrier.h similarity index 100% rename from folly/experimental/AsymmetricMemoryBarrier.h rename to folly/synchronization/AsymmetricMemoryBarrier.h -- 2.34.1