Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Assert Fatal thread behavior#206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
coder137 merged 8 commits intomainfrombetter_assert
Apr 22, 2022
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletionbuildcc/lib/env/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -42,19 +42,22 @@ if (${TESTING})
add_executable(test_storage test/test_storage.cpp)
target_link_libraries(test_storage PRIVATE mock_env)

add_executable(test_assert_fatal test/test_assert_fatal.cpp)
target_link_libraries(test_assert_fatal PRIVATE mock_env)

add_test(NAME test_static_project COMMAND test_static_project)
add_test(NAME test_env_util COMMAND test_env_util)
add_test(NAME test_task_state COMMAND test_task_state)
add_test(NAME test_command COMMAND test_command)
add_test(NAME test_storage COMMAND test_storage)
add_test(NAME test_assert_fatal COMMAND test_assert_fatal)
endif()

set(ENV_SRCS
src/env.cpp
src/assert_fatal.cpp
src/logging.cpp
include/env/assert_fatal.h
include/env/assert_throw.h
include/env/env.h
include/env/logging.h
include/env/util.h
Expand Down
6 changes: 5 additions & 1 deletionbuildcc/lib/env/include/env/assert_fatal.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,11 @@
namespace buildcc::env {

/**
* @brief During Release -> std::terminate
* @brief During Release ->
* NOT THREADED : std::exit
* THREADED : throw std::exception (it is wrong to exit
* when in a threaded state. We want to handle the exception and gracefully
* exit)
* During Unit Test -> throw std::exception
*/
[[noreturn]] void assert_handle_fatal();
Expand Down
69 changes: 0 additions & 69 deletionsbuildcc/lib/env/include/env/assert_throw.h
View file
Open in desktop

This file was deleted.

10 changes: 6 additions & 4 deletionsbuildcc/lib/env/include/env/storage.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -104,19 +104,21 @@ class Storage {

template <typename T, typename... Params>
static T &Add(const std::string &identifier, Params &&...params) {
return internal_->Add<T, Params...>(identifier,
std::forward<Params>(params)...);
return Ref().Add<T, Params...>(identifier, std::forward<Params>(params)...);
}

template <typename T>
static const T &ConstRef(const std::string &identifier) {
returninternal_->ConstRef<T>(identifier);
returnRef().ConstRef<T>(identifier);
}

template <typename T> static T &Ref(const std::string &identifier) {
returninternal_->Ref<T>(identifier);
returnRef().Ref<T>(identifier);
}

private:
static ScopedStorage &Ref();

private:
static std::unique_ptr<ScopedStorage> internal_;
};
Expand Down
23 changes: 22 additions & 1 deletionbuildcc/lib/env/src/assert_fatal.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,9 +17,30 @@
#include "env/assert_fatal.h"

#include <exception>
#include <thread>

namespace {

std::thread::id main_id = std::this_thread::get_id();

bool IsRunningOnThread() {
bool threaded = true;
if (std::this_thread::get_id() == main_id) {
threaded = false;
}
return threaded;
}

} // namespace

namespace buildcc::env {

[[noreturn]] void assert_handle_fatal() { std::terminate(); }
[[noreturn]] void assert_handle_fatal() {
if (!IsRunningOnThread()) {
std::exit(1);
} else {
throw std::exception();
}
}

} // namespace buildcc::env
6 changes: 6 additions & 0 deletionsbuildcc/lib/env/src/storage.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,4 +20,10 @@ namespace buildcc {

std::unique_ptr<ScopedStorage> Storage::internal_;

ScopedStorage &Storage::Ref() {
env::assert_fatal(internal_ != nullptr,
"Initialize Storage using the Storage::Init API");
return *internal_;
}

} // namespace buildcc
72 changes: 72 additions & 0 deletionsbuildcc/lib/env/test/test_assert_fatal.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
#include <thread>

#include "taskflow/taskflow.hpp"

// NOTE, Make sure all these includes are AFTER the system and header includes
#include "CppUTest/CommandLineTestRunner.h"
#include "CppUTest/MemoryLeakDetectorNewMacros.h"
#include "CppUTest/TestHarness.h"
#include "CppUTest/Utest.h"
#include "CppUTestExt/MockSupport.h"

namespace {

std::thread::id my_main_thread = std::this_thread::get_id();

bool IsRunningInThread() {
bool threaded = true;
if (std::this_thread::get_id() == my_main_thread) {
threaded = false;
}
return threaded;
}

void assert_handle_fatal() {
if (IsRunningInThread()) {
mock().actualCall("assert_handle_fatal_threaded");
} else {
mock().actualCall("assert_handle_fatal_main");
}
}

} // namespace

// clang-format off
TEST_GROUP(AssertFatalTestGroup)
{
void teardown() {
mock().clear();
}
};
// clang-format on

TEST(AssertFatalTestGroup, AssertFatal_IsThreadedCheck) {
CHECK_FALSE(IsRunningInThread());

tf::Taskflow tf;
tf.emplace([]() { CHECK_TRUE(IsRunningInThread()); });

tf::Executor ex(1);
ex.run(tf);
ex.wait_for_all();
}

TEST(AssertFatalTestGroup, AssertFatal_Threaded) {
mock().expectOneCall("assert_handle_fatal_threaded");

tf::Taskflow tf;
tf.emplace([]() { assert_handle_fatal(); });

tf::Executor ex(1);
ex.run(tf);
ex.wait_for_all();
}

TEST(AssertFatalTestGroup, AssertFatal_NotThreaded) {
mock().expectOneCall("assert_handle_fatal_main");
assert_handle_fatal();
}

int main(int ac, char **av) {
return CommandLineTestRunner::RunAllTests(ac, av);
}
8 changes: 8 additions & 0 deletionsbuildcc/lib/env/test/test_storage.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -86,6 +86,14 @@ TEST(StorageTestGroup, BasicUsage) {
STRCMP_EQUAL(bigobj2.c_str(), "name2");
}

TEST(StorageTestGroup, UsageWithoutInit) {
buildcc::Storage::Deinit();

CHECK_THROWS(std::exception, buildcc::Storage::Add<int>("integer"));
CHECK_THROWS(std::exception, buildcc::Storage::Ref<int>("integer"));
CHECK_THROWS(std::exception, buildcc::Storage::ConstRef<int>("integer"));
}

int main(int ac, char **av) {
return CommandLineTestRunner::RunAllTests(ac, av);
}
4 changes: 2 additions & 2 deletionsbuildcc/lib/target/src/generator/task.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,7 +52,7 @@ void Generator::GenerateTask() {
auto run_command = [this](const std::string &command) {
try {
bool success = env::Command::Execute(command);
env::assert_throw(success, fmt::format("{} failed", command));
env::assert_fatal(success, fmt::format("{} failed", command));
} catch (...) {
std::lock_guard<std::mutex> guard(task_state_mutex_);
task_state_ = env::TaskState::FAILURE;
Expand DownExpand Up@@ -104,7 +104,7 @@ void Generator::GenerateTask() {
if (dirty_) {
try {
serialization_.UpdateStore(user_);
env::assert_throw(serialization_.StoreToFile(),
env::assert_fatal(serialization_.StoreToFile(),
fmt::format("Store failed for {}", name_));
} catch (...) {
task_state_ = env::TaskState::FAILURE;
Expand Down
6 changes: 3 additions & 3 deletionsbuildcc/lib/target/src/target/friend/compile_pch.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,7 @@ void AggregateToFile(const fs::path &filename,
});
bool success = buildcc::env::save_file(
buildcc::path_as_string(filename).c_str(), constructed_output, false);
buildcc::env::assert_throw(success, "Could not save pch file");
buildcc::env::assert_fatal(success, "Could not save pch file");
}

} // namespace
Expand DownExpand Up@@ -108,10 +108,10 @@ void CompilePch::BuildCompile() {
const std::string p = fmt::format("{}", source_path_);
const bool save =
env::save_file(p.c_str(), {"//Generated by BuildCC"}, false);
env::assert_throw(save, fmt::format("Could not save {}", p));
env::assert_fatal(save, fmt::format("Could not save {}", p));
}
bool success = env::Command::Execute(command_);
env::assert_throw(success, "Failed to compile pch");
env::assert_fatal(success, "Failed to compile pch");
}
}

Expand Down
2 changes: 1 addition & 1 deletionbuildcc/lib/target/src/target/friend/link_target.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -98,7 +98,7 @@ void LinkTarget::BuildLink() {

if (target_.dirty_) {
bool success = env::Command::Execute(command_);
env::assert_throw(success, "Failed to link target");
env::assert_fatal(success, "Failed to link target");
target_.serialization_.UpdateTargetCompiled();
}
}
Expand Down
4 changes: 2 additions & 2 deletionsbuildcc/lib/target/src/target/tasks.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -124,7 +124,7 @@ void CompileObject::Task() {
try {
bool success = env::Command::Execute(
GetObjectData(s.GetPathname()).command);
env::assert_throw(success, "Could not compile source");
env::assert_fatal(success, "Could not compile source");
target_.serialization_.AddSource(s);
} catch (...) {
target_.SetTaskStateFailure();
Expand DownExpand Up@@ -170,7 +170,7 @@ void Target::EndTask() {
if (dirty_) {
try {
serialization_.UpdateStore(user_);
env::assert_throw(serialization_.StoreToFile(),
env::assert_fatal(serialization_.StoreToFile(),
fmt::format("Store failed for {}", GetName()));
state_.BuildCompleted();
} catch (...) {
Expand Down
4 changes: 2 additions & 2 deletionsbuildcc/schema/include/schema/path.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,7 @@
#include <unordered_set>

// Env
#include "env/assert_throw.h"
#include "env/assert_fatal.h"

// Third party
#include "fmt/format.h"
Expand All@@ -51,7 +51,7 @@ class Path {
std::filesystem::last_write_time(pathname, errcode)
.time_since_epoch()
.count();
env::assert_throw(errcode.value() == 0,
env::assert_fatal(errcode.value() == 0,
fmt::format("{} not found", pathname));

return Path(pathname, last_write_timestamp);
Expand Down
[8]ページ先頭
©2009-2025 Movatter.jp