Public/libcron
1
0
Fork 0
mirror of https://github.com/PerMalmberg/libcron.git synced 2025-04-22 08:23:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid compiler warnings on compilers supporting std::uncaught_exceptions() (#12)

Browse Source 
* Avoid compiler warnings on compilers supporting std::uncaught_exceptions()

* Remove test that is depends on the performance of the CPU.
This commit is contained in:
Per Malmberg 2020-12-04 11:43:18 +01:00 committed by GitHub
parent f3fddf5f19
commit 9edb758ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libcron/CMakeLists.txt
View File

@ -35,6 +35,11 @@ target_include_directories(${PROJECT_NAME}
PRIVATE ${CMAKE_CURRENT_LIST_DIR}/externals/date/include PRIVATE ${CMAKE_CURRENT_LIST_DIR}/externals/date/include
PUBLIC include) PUBLIC include)
if(NOT MSVC)
# Assume a modern compiler (gcc 9.3)
target_compile_definitions (${PROJECT_NAME} PRIVATE -DHAS_UNCAUGHT_EXCEPTIONS)
endif()
set_target_properties(${PROJECT_NAME} PROPERTIES set_target_properties(${PROJECT_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out/${CMAKE_BUILD_TYPE}" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out/${CMAKE_BUILD_TYPE}"
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out/${CMAKE_BUILD_TYPE}" LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out/${CMAKE_BUILD_TYPE}"

7
test/CMakeLists.txt
View File

@ -29,7 +29,14 @@ add_executable(
CronScheduleTest.cpp CronScheduleTest.cpp
CronTest.cpp) CronTest.cpp)
if(NOT MSVC)
target_link_libraries(${PROJECT_NAME} libcron pthread)
# Assume a modern compiler supporting uncaught_exceptions()
target_compile_definitions (${PROJECT_NAME} PRIVATE -DHAS_UNCAUGHT_EXCEPTIONS)
else()
target_link_libraries(${PROJECT_NAME} libcron) target_link_libraries(${PROJECT_NAME} libcron)
endif()
set_target_properties(${PROJECT_NAME} PROPERTIES set_target_properties(${PROJECT_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/out"

195
test/CronTest.cpp
View File

@ -448,198 +448,3 @@ SCENARIO("Tasks can be added and removed from the scheduler")
} }
} }
} }
SCENARIO("Testing CRON-Tick Performance")
{
GIVEN("A Cron instance with no task")
{
using namespace std::chrono_literals;
using clock = std::chrono::high_resolution_clock;
using std::chrono::milliseconds;
using std::chrono::duration_cast;
Cron<TestClock> c1{};
auto& cron_clock1 = c1.get_clock();
Cron<TestClock> c2{};
auto& cron_clock2 = c2.get_clock();
Cron<TestClock> c3{};
auto& cron_clock3 = c3.get_clock();
int count1 = 0;
int count2 = 0;
int count3 = 0;
WHEN("Creating 1000 CronData Objects")
{
std::string cron_job = "* * * * * ?";
auto begin_cron_data = clock::now();
for(int i = 1; i <= 1000; i++)
{
auto cron = CronData::create(cron_job);
}
auto end_cron_data = clock::now();
auto msec_cron_data = duration_cast<milliseconds>(end_cron_data - begin_cron_data);
// Hopefully Creating a lot of Cron Objects does not take more than a second
REQUIRE(msec_cron_data <= 1000ms);
}
WHEN("Adding 1000 Tasks where with an invalid CRON-String with std::map<std::string, std::string>")
{
std::map<std::string, std::string> name_schedule_map;
for(int i = 1; i <= 1000; i++)
{
name_schedule_map["Task-" + std::to_string(i)] = "* * * * * ?";
}
name_schedule_map["Task-1000"] = "invalid";
auto res = c1.add_schedule(name_schedule_map,
[](auto&) { });
REQUIRE_FALSE(std::get<0>(res));
REQUIRE(std::get<1>(res) == "Task-1000");
REQUIRE(std::get<2>(res) == "invalid");
}
WHEN("Adding a std::vector<std::tuple<std::string, std::string>>")
{
std::vector<std::tuple<std::string, std::string>> name_schedule_map;
for(int i = 1; i <= 1000; i++)
{
name_schedule_map.push_back(std::make_tuple("Task-" + std::to_string(i), "* * * * * ?"));
}
auto res = c1.add_schedule(name_schedule_map,
[](auto&) { });
REQUIRE(std::get<0>(res));
}
WHEN("Adding a std::vector<std::pair<std::string, std::string>>")
{
std::vector<std::pair<std::string, std::string>> name_schedule_map;
for(int i = 1; i <= 1000; i++)
{
name_schedule_map.push_back(std::make_pair("Task-" + std::to_string(i), "* * * * * ?"));
}
auto res = c1.add_schedule(name_schedule_map,
[](auto&) { });
REQUIRE(std::get<0>(res));
}
WHEN("Adding a std::unordered_map<std::string, std::string>")
{
std::unordered_map<std::string, std::string> name_schedule_map;
for(int i = 1; i <= 1000; i++)
{
name_schedule_map["Task-" + std::to_string(i)] = "* * * * * ?";
}
auto res = c1.add_schedule(name_schedule_map,
[](auto&) { });
REQUIRE(std::get<0>(res));
}
WHEN("Adding 1000 Tasks to two Cron-Objects expiring after 1 second calling add_schedule")
{
auto begin_add_sequential = clock::now();
for(int i = 1; i <= 1000; i++)
{
REQUIRE(c1.add_schedule("Task-" + std::to_string(i), "* * * * * ?",
[&count1](auto&)
{
count1++;
})
);
REQUIRE(c2.add_schedule("Task-" + std::to_string(i), "* * * * * ?",
[&count2](auto&)
{
count2++;
})
);
}
auto end_add_sequential = clock::now();
std::map<std::string, std::string> name_schedule_map{};
for(int i = 1; i <= 1000; i++)
{
name_schedule_map["Task-" + std::to_string(i)] = "* * * * * ?";
}
auto begin_add_batch = clock::now();
REQUIRE(std::get<0>(c3.add_schedule(name_schedule_map,
[&count3](auto&)
{
count3++;
}))
);
auto end_add_batch = clock::now();
auto time_sequential = duration_cast<milliseconds>(end_add_sequential - begin_add_sequential)/2;
auto time_batch = duration_cast<milliseconds>(end_add_batch - begin_add_batch);
// This should hopefully take only a few second?
REQUIRE(time_sequential < 10000ms);
REQUIRE(time_batch < 5000ms);
REQUIRE(time_batch < time_sequential);
REQUIRE(c1.count() == 1000);
REQUIRE(c2.count() == 1000);
REQUIRE(c3.count() == 1000);
THEN("Execute all Tasks 10 Times")
{
milliseconds msec1;
auto t1 = std::thread([&cron_clock1, &c1, &msec1]() {
auto begin_tick = clock::now();
for(auto i = 0; i < 10; ++i)
{
cron_clock1.add(std::chrono::seconds{1});
c1.tick();
}
auto end_tick = clock::now();
msec1 = duration_cast<milliseconds>(end_tick - begin_tick)/10;
});
milliseconds msec2;
auto t2 = std::thread([&cron_clock2, &c2, &msec2]() {
auto begin_tick = clock::now();
for(auto i = 0; i < 10; ++i)
{
cron_clock2.add(std::chrono::seconds{1});
c2.tick();
}
auto end_tick = clock::now();
msec2 = duration_cast<milliseconds>(end_tick - begin_tick)/10;
});
milliseconds msec3;
auto t3 = std::thread([&cron_clock3, &c3, &msec3]() {
auto begin_tick = clock::now();
for(auto i = 0; i < 10; ++i)
{
cron_clock3.add(std::chrono::seconds{1});
c3.tick();
}
auto end_tick = clock::now();
msec3 = duration_cast<milliseconds>(end_tick - begin_tick)/10;
});
t1.join();
t2.join();
t3.join();
REQUIRE(count1 == 10000);
REQUIRE(count2 == 10000);
REQUIRE(count3 == 10000);
// Hopefully executing a more or less empty task does only take some milliseconds
REQUIRE(msec1 <= 10ms);
REQUIRE(msec2 <= 10ms);
REQUIRE(msec3 <= 10ms);
}
}
}
}