Backed out changeset ea9041ce2280

[folly.git] / folly / io / async / Request.cpp

diff --git a/folly/io/async/Request.cpp b/folly/io/async/Request.cpp
index a3bd7382facfd63a756ef470e6af17a3e97b670f..11894b5d04eac9067ec1d3c243cc24ef624e08f0 100644 (file)
--- a/folly/io/async/Request.cpp
+++ b/folly/io/async/Request.cpp
@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/io/async/Request.h>
 
-#include <algorithm>
-#include <stdexcept>
-#include <utility>
+#include <folly/io/async/Request.h>
+#include <folly/tracing/StaticTracepoint.h>
 
 #include <glog/logging.h>
 
 #include <folly/MapUtil.h>
 #include <folly/SingletonThreadLocal.h>
-#include <folly/tracing/StaticTracepoint.h>
 
 namespace folly {
 
@@ -118,50 +115,19 @@ std::shared_ptr<RequestContext> RequestContext::setContext(
   return ctx;
 }
 
-RequestContext::Provider& RequestContext::requestContextProvider() {
-  class DefaultProvider {
-   public:
-    constexpr DefaultProvider() = default;
-    DefaultProvider(const DefaultProvider&) = delete;
-    DefaultProvider& operator=(const DefaultProvider&) = delete;
-    DefaultProvider(DefaultProvider&&) = default;
-    DefaultProvider& operator=(DefaultProvider&&) = default;
-
-    std::shared_ptr<RequestContext>& operator()() {
-      return context;
-    }
-
-   private:
-    std::shared_ptr<RequestContext> context;
-  };
-
-  static SingletonThreadLocal<Provider> providerSingleton(
-      []() { return new Provider(DefaultProvider()); });
-  return providerSingleton.get();
-}
-
 std::shared_ptr<RequestContext>& RequestContext::getStaticContext() {
-  auto& provider = requestContextProvider();
-  return provider();
+  using SingletonT = SingletonThreadLocal<std::shared_ptr<RequestContext>>;
+  static SingletonT singleton;
+
+  return singleton.get();
 }
 
 RequestContext* RequestContext::get() {
-  auto& context = getStaticContext();
+  auto context = getStaticContext();
   if (!context) {
     static RequestContext defaultContext;
     return std::addressof(defaultContext);
   }
   return context.get();
 }
-
-RequestContext::Provider RequestContext::setRequestContextProvider(
-    RequestContext::Provider newProvider) {
-  if (!newProvider) {
-    throw std::runtime_error("RequestContext provider must be non-empty");
-  }
-
-  auto& provider = requestContextProvider();
-  std::swap(provider, newProvider);
-  return newProvider;
-}
 }