mirror/libcron
2
0
Fork 0
mirror of https://github.com/PerMalmberg/libcron.git synced 2024-11-21 01:10:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compile on Linux again.

Browse Source
This commit is contained in:
Per Malmberg 2018-03-25 10:22:33 +02:00
parent c441da4287
commit 392948cdee
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libcron/Cron.h
View File

@ -45,7 +45,8 @@ namespace libcron
return clock;
}
void get_time_until_expiry_for_tasks(std::vector<std::tuple<std::string, std::chrono::system_clock::duration>>& status) const;
void get_time_until_expiry_for_tasks(
std::vector<std::tuple<std::string, std::chrono::system_clock::duration>>& status) const;
friend std::ostream& operator<<<>(std::ostream& stream, const Cron<ClockType>& c);
@ -93,10 +94,10 @@ namespace libcron
template<typename ClockType>
std::chrono::system_clock::duration Cron<ClockType>::time_until_next() const
{
system_clock::duration d{};
std::chrono::system_clock::duration d{};
if (tasks.empty())
{
d = std::numeric_limits<minutes>::max();
d = std::numeric_limits<std::chrono::minutes>::max();
}
else
{
@ -115,7 +116,7 @@ namespace libcron
{
first_tick = false;
}
else if (now > last_tick && now - last_tick <= hours{3})
else if (now > last_tick && now - last_tick <= std::chrono::hours{3})
{
// Reschedule all tasks.
for (auto& t : tasks.get_tasks())
@ -123,7 +124,7 @@ namespace libcron
t.calculate_next(now);
}
}
else if (now < last_tick && now - last_tick <= -hours{3})
else if (now < last_tick && now - last_tick <= -std::chrono::hours{3})
{
// Reschedule all tasks.
for (auto& t : tasks.get_tasks())
@ -152,6 +153,7 @@ namespace libcron
{
// Must calculate new schedules using second after 'now', otherwise
// we'll run the same task over and over if it takes less than 1s to execute.
using namespace std::chrono_literals;
if (task.calculate_next(now + 1s))
{
tasks.push(task);
@ -161,18 +163,19 @@ namespace libcron
return res;
}
template<typename ClockType>
void Cron<ClockType>::get_time_until_expiry_for_tasks(std::vector<std::tuple<std::string, std::chrono::system_clock::duration>>& status) const
{
auto now = clock.now();
status.clear();
template<typename ClockType>
void Cron<ClockType>::get_time_until_expiry_for_tasks(std::vector<std::tuple<std::string,
std::chrono::system_clock::duration>>& status) const
{
auto now = clock.now();
status.clear();
std::for_each(tasks.get_tasks().cbegin(), tasks.get_tasks().cend(),
[&status, &now](const Task& t)
{
status.emplace_back(t.get_name(), t.time_until_expiry(now));
});
}
std::for_each(tasks.get_tasks().cbegin(), tasks.get_tasks().cend(),
[&status, &now](const Task& t)
{
status.emplace_back(t.get_name(), t.time_until_expiry(now));
});
}
template<typename ClockType>
std::ostream& operator<<(std::ostream& stream, const Cron<ClockType>& c)