Commit aea0f710 authored by Jordan DeLong's avatar Jordan DeLong

Remove some unnecessary uses of LOG(FATAL) in folly

Summary:
ScopeGuard::execute will already call std::terminate if an
exception is thrown, as it's noexcept, and the case in
ConcurrentSkipList should be a check.

Test Plan:
Ran folly tests.  Will look at phabricator to see if
anything breaks downstream from removing glog/logging.h from
scopeguard.

Reviewed By: chip@fb.com

FB internal diff: D677038
parent 06719763
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -182,9 +182,7 @@ class ConcurrentSkipList { ...@@ -182,9 +182,7 @@ class ConcurrentSkipList {
//=================================================================== //===================================================================
~ConcurrentSkipList() { ~ConcurrentSkipList() {
LOG_IF(FATAL, recycler_.refs() > 0) CHECK_EQ(recycler_.refs(), 0);
<< "number of accessors is not 0, " << recycler_.refs() << " instead!"
<< " This shouldn't have happened!";
while (NodeType* current = head_.load(std::memory_order_relaxed)) { while (NodeType* current = head_.load(std::memory_order_relaxed)) {
NodeType* tmp = current->skip(0); NodeType* tmp = current->skip(0);
NodeType::destroy(current); NodeType::destroy(current);
......
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <cstddef> #include <cstddef>
#include <functional> #include <functional>
#include <new> #include <new>
#include <glog/logging.h>
#include "folly/Preprocessor.h" #include "folly/Preprocessor.h"
...@@ -108,16 +107,7 @@ class ScopeGuardImpl : public ScopeGuardImplBase { ...@@ -108,16 +107,7 @@ class ScopeGuardImpl : public ScopeGuardImplBase {
private: private:
void* operator new(size_t) = delete; void* operator new(size_t) = delete;
void execute() noexcept { void execute() noexcept { function_(); }
try {
function_();
} catch (const std::exception& ex) {
LOG(FATAL) << "ScopeGuard cleanup function threw a " <<
typeid(ex).name() << "exception: " << ex.what();
} catch (...) {
LOG(FATAL) << "ScopeGuard cleanup function threw a non-exception object";
}
}
FunctionType function_; FunctionType function_;
}; };
......
/* /*
* Copyright 2012 Facebook, Inc. * Copyright 2013 Facebook, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <glog/logging.h>
#include <functional> #include <functional>
#include <stdexcept> #include <stdexcept>
......
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