marcelb/asynco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/timers' into refactor

Browse Source
This commit is contained in:
marcelb 2024-03-25 19:59:41 +01:00
commit 8eff5ef1ea
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/rotor.hpp
View File

@ -22,6 +22,12 @@ int64_t rtime_ms() {
.count(); .count();
} }
int64_t rtime_us() {
return chrono::duration_cast<chrono::microseconds>(chrono::system_clock::now()
.time_since_epoch())
.count();
}
/** /**
* Intern class for timer async loop * Intern class for timer async loop
*/ */
@ -38,7 +44,7 @@ class timer_core {
* Timer constructor, receives a callback function and time * Timer constructor, receives a callback function and time
*/ */
timer_core( function<void()> _callback, int64_t _time, bool _repeat): timer_core( function<void()> _callback, int64_t _time, bool _repeat):
callback(_callback), init(rtime_ms()), time(_time), repeat(_repeat), stop(false) { callback(_callback), init(rtime_us()), time(_time*1000), repeat(_repeat), stop(false) {
} }
/** /**
@ -83,7 +89,7 @@ class rotor {
else if (expired(tcores[i])) { else if (expired(tcores[i])) {
_asyncon.put_task(tcores[i]->callback); _asyncon.put_task(tcores[i]->callback);
if (tcores[i]->repeat) { if (tcores[i]->repeat) {
tcores[i]->init = rtime_ms(); tcores[i]->init = rtime_us();
} }
else { else {
remove(i); remove(i);
@ -91,7 +97,7 @@ class rotor {
} }
} }
} }
this_thread::sleep_for(chrono::milliseconds(sampling)); this_thread::sleep_for(chrono::microseconds(sampling));
} }
} }
@ -99,7 +105,7 @@ class rotor {
* The method checks whether the time event has expired * The method checks whether the time event has expired
*/ */
bool expired(shared_ptr<timer_core> tcore) { bool expired(shared_ptr<timer_core> tcore) {
return rtime_ms() - tcore->init >= tcore->time; return rtime_us() - tcore->init >= tcore->time;
} }
/** /**

28
test/test.cpp
View File

@ -65,22 +65,26 @@ int main () {
* Init interval and timeout; clear interval and timeout * Init interval and timeout; clear interval and timeout
*/ */
// interval( [&] () { interval( [&] () {
// cout << "interval " << rtime_ms() - start << endl; cout << "interval 1: " << rtime_ms() - start << endl;
// }, 200); }, 50);
// interval( [&] () { interval( [&] () {
// cout << "interval " << rtime_ms() - start << endl; cout << "interval 1: " << rtime_ms() - start << endl;
// }, 200); }, 100);
// interval( [&] () { interval( [&] () {
// cout << "interval " << rtime_ms() - start << endl; cout << "interval 2: " << rtime_ms() - start << endl;
// }, 200); }, 200);
interval( [&] () {
cout << "interval 3: " << rtime_ms() - start << endl;
}, 300);
// interval( [&] () { interval( [&] () {
// cout << "interval " << rtime_ms() - start << endl; cout << "interval 4: " << rtime_ms() - start << endl;
// }, 200); }, 400);
// interval inter1 ([&]() { // interval inter1 ([&]() {
// cout << "interval prvi " << rtime_ms() - start << endl; // cout << "interval prvi " << rtime_ms() - start << endl;