Merge commit '9692d581953d553b9bf2055d9bb89f960fd07739'

This commit is contained in:
Andrea Cavalli 2020-11-10 16:35:27 +01:00
commit bf60b37eda

View File

@ -407,7 +407,7 @@ int main(int argc, char *argv[]) {
} }
sched.start(); sched.start();
double last_cron_time = start_time; double next_cron_time = start_time;
double last_dump_time = start_time - 1000.0; double last_dump_time = start_time - 1000.0;
double last_tqueue_gc_time = start_time - 1000.0; double last_tqueue_gc_time = start_time - 1000.0;
td::int64 tqueue_deleted_events = 0; td::int64 tqueue_deleted_events = 0;
@ -416,7 +416,7 @@ int main(int argc, char *argv[]) {
std::atomic_bool can_quit{false}; std::atomic_bool can_quit{false};
ServerCpuStat::instance(); // create ServerCpuStat instance ServerCpuStat::instance(); // create ServerCpuStat instance
while (true) { while (true) {
sched.run_main(1); sched.run_main(next_cron_time - td::Time::now());
if (!need_rotate_log.test_and_set()) { if (!need_rotate_log.test_and_set()) {
td::log_interface->rotate(); td::log_interface->rotate();
@ -462,8 +462,8 @@ int main(int argc, char *argv[]) {
} }
double now = td::Time::now(); double now = td::Time::now();
if (now > last_cron_time + 1.0) { if (now >= next_cron_time) {
last_cron_time = now; next_cron_time += 1.0;
ServerCpuStat::update(now); ServerCpuStat::update(now);
} }