Commit d0956208 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook Github Bot

Remove folly/detail/UncaughtExceptionCounter.h

Summary:
[Folly] Remove `folly/detail/UncaughtExceptionCounter.h`.

It's a thin and unnecessary shell around `folly/UncaughtExceptions.h`.

Reviewed By: Orvid

Differential Revision: D6636260

fbshipit-source-id: cdf6fa5fefc9fd69586c1c4c1a8443c5e8543b1c
parent 3b8919b3
...@@ -86,7 +86,6 @@ nobase_follyinclude_HEADERS = \ ...@@ -86,7 +86,6 @@ nobase_follyinclude_HEADERS = \
detail/ThreadLocalDetail.h \ detail/ThreadLocalDetail.h \
detail/TypeList.h \ detail/TypeList.h \
detail/TurnSequencer.h \ detail/TurnSequencer.h \
detail/UncaughtExceptionCounter.h \
executors/Async.h \ executors/Async.h \
executors/CPUThreadPoolExecutor.h \ executors/CPUThreadPoolExecutor.h \
executors/Codel.h \ executors/Codel.h \
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <folly/Portability.h> #include <folly/Portability.h>
#include <folly/Preprocessor.h> #include <folly/Preprocessor.h>
#include <folly/detail/UncaughtExceptionCounter.h> #include <folly/UncaughtExceptions.h>
namespace folly { namespace folly {
...@@ -204,25 +204,19 @@ namespace detail { ...@@ -204,25 +204,19 @@ namespace detail {
* *
* Used to implement SCOPE_FAIL and SCOPE_SUCCESS below. * Used to implement SCOPE_FAIL and SCOPE_SUCCESS below.
*/ */
template <typename FunctionType, bool executeOnException> template <typename FunctionType, bool ExecuteOnException>
class ScopeGuardForNewException { class ScopeGuardForNewException {
public: public:
explicit ScopeGuardForNewException(const FunctionType& fn) explicit ScopeGuardForNewException(const FunctionType& fn) : function_(fn) {}
: function_(fn) {
}
explicit ScopeGuardForNewException(FunctionType&& fn) explicit ScopeGuardForNewException(FunctionType&& fn)
: function_(std::move(fn)) { : function_(std::move(fn)) {}
}
ScopeGuardForNewException(ScopeGuardForNewException&& other) ScopeGuardForNewException(ScopeGuardForNewException&& other) = default;
: function_(std::move(other.function_))
, exceptionCounter_(std::move(other.exceptionCounter_)) {
}
~ScopeGuardForNewException() noexcept(executeOnException) { ~ScopeGuardForNewException() noexcept(ExecuteOnException) {
if (executeOnException == exceptionCounter_.isNewUncaughtException()) { if (ExecuteOnException == (exceptionCounter_ < uncaught_exceptions())) {
if (executeOnException) { if (ExecuteOnException) {
ScopeGuardImplBase::runAndWarnAboutToCrashOnException(function_); ScopeGuardImplBase::runAndWarnAboutToCrashOnException(function_);
} else { } else {
function_(); function_();
...@@ -236,7 +230,7 @@ class ScopeGuardForNewException { ...@@ -236,7 +230,7 @@ class ScopeGuardForNewException {
void* operator new(std::size_t) = delete; void* operator new(std::size_t) = delete;
FunctionType function_; FunctionType function_;
UncaughtExceptionCounter exceptionCounter_; int exceptionCounter_{uncaught_exceptions()};
}; };
/** /**
......
/*
* Copyright 2017 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#pragma once
#include <exception>
#include <folly/UncaughtExceptions.h>
namespace folly { namespace detail {
/**
* Used to check if a new uncaught exception was thrown by monitoring the
* number of uncaught exceptions.
*
* Usage:
* - create a new UncaughtExceptionCounter object
* - call isNewUncaughtException() on the new object to check if a new
* uncaught exception was thrown since the object was created
*/
class UncaughtExceptionCounter {
public:
UncaughtExceptionCounter() noexcept
: exceptionCount_(folly::uncaught_exceptions()) {}
UncaughtExceptionCounter(const UncaughtExceptionCounter& other) noexcept
: exceptionCount_(other.exceptionCount_) {}
bool isNewUncaughtException() noexcept {
return folly::uncaught_exceptions() > exceptionCount_;
}
private:
int exceptionCount_;
};
} // namespace detail
} // namespace folly
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment