diff options
| -rw-r--r-- | timer/include/timer.h | 2 | ||||
| -rw-r--r-- | timer/src/timer.c | 2 | ||||
| -rw-r--r-- | timer/test/timer_test.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/timer/include/timer.h b/timer/include/timer.h index 75ae367..05f6009 100644 --- a/timer/include/timer.h +++ b/timer/include/timer.h | |||
| @@ -57,7 +57,7 @@ time_delta time_diff(time_point start, time_point end); | |||
| 57 | double time_delta_to_sec(time_delta dt); | 57 | double time_delta_to_sec(time_delta dt); |
| 58 | 58 | ||
| 59 | /// Convert the time elapsed in seconds to a time delta. | 59 | /// Convert the time elapsed in seconds to a time delta. |
| 60 | time_delta sec_to_time_delta(double seconds); | 60 | time_delta time_delta_from_sec(double seconds); |
| 61 | 61 | ||
| 62 | /// Convert the time point to nanoseconds. | 62 | /// Convert the time point to nanoseconds. |
| 63 | uint64_t time_point_to_ns(time_point); | 63 | uint64_t time_point_to_ns(time_point); |
diff --git a/timer/src/timer.c b/timer/src/timer.c index c934077..b845491 100644 --- a/timer/src/timer.c +++ b/timer/src/timer.c | |||
| @@ -83,7 +83,7 @@ double time_delta_to_sec(time_delta dt) { | |||
| 83 | #endif | 83 | #endif |
| 84 | } | 84 | } |
| 85 | 85 | ||
| 86 | time_delta sec_to_time_delta(double seconds) { | 86 | time_delta time_delta_from_sec(double seconds) { |
| 87 | #ifdef _WIN32 | 87 | #ifdef _WIN32 |
| 88 | return (time_delta)(seconds / seconds_per_count); | 88 | return (time_delta)(seconds / seconds_per_count); |
| 89 | #else | 89 | #else |
diff --git a/timer/test/timer_test.c b/timer/test/timer_test.c index a220ead..7fa102a 100644 --- a/timer/test/timer_test.c +++ b/timer/test/timer_test.c | |||
| @@ -9,7 +9,7 @@ TEST_CASE(sleep) { | |||
| 9 | const double sleep_time_sec = 0.1; | 9 | const double sleep_time_sec = 0.1; |
| 10 | 10 | ||
| 11 | const time_point start = time_now(); | 11 | const time_point start = time_now(); |
| 12 | time_sleep(sec_to_time_delta(sleep_time_sec)); | 12 | time_sleep(time_delta_from_sec(sleep_time_sec)); |
| 13 | const time_point end = time_now(); | 13 | const time_point end = time_now(); |
| 14 | 14 | ||
| 15 | TEST_TRUE(time_delta_to_sec(time_diff(start, end)) >= sleep_time_sec); | 15 | TEST_TRUE(time_delta_to_sec(time_diff(start, end)) >= sleep_time_sec); |
| @@ -28,7 +28,7 @@ TEST_CASE(tick_updates_last_tick_time) { | |||
| 28 | const double sleep_time_sec = 0.1; | 28 | const double sleep_time_sec = 0.1; |
| 29 | 29 | ||
| 30 | Timer timer = timer_make(); | 30 | Timer timer = timer_make(); |
| 31 | time_sleep(sec_to_time_delta(sleep_time_sec)); | 31 | time_sleep(time_delta_from_sec(sleep_time_sec)); |
| 32 | timer_tick(&timer); | 32 | timer_tick(&timer); |
| 33 | 33 | ||
| 34 | TEST_TRUE(time_delta_to_sec(time_diff(timer.start_time, timer.last_tick)) >= | 34 | TEST_TRUE(time_delta_to_sec(time_diff(timer.start_time, timer.last_tick)) >= |
| @@ -40,7 +40,7 @@ TEST_CASE(tick_updates_delta_time) { | |||
| 40 | const double sleep_time_sec = 0.1; | 40 | const double sleep_time_sec = 0.1; |
| 41 | 41 | ||
| 42 | Timer timer = timer_make(); | 42 | Timer timer = timer_make(); |
| 43 | time_sleep(sec_to_time_delta(sleep_time_sec)); | 43 | time_sleep(time_delta_from_sec(sleep_time_sec)); |
| 44 | timer_tick(&timer); | 44 | timer_tick(&timer); |
| 45 | 45 | ||
| 46 | TEST_TRUE(time_delta_to_sec(timer.delta_time) >= sleep_time_sec); | 46 | TEST_TRUE(time_delta_to_sec(timer.delta_time) >= sleep_time_sec); |
| @@ -50,7 +50,7 @@ TEST_CASE(tick_updates_delta_time) { | |||
| 50 | TEST_CASE(tick_does_not_change_start_time) { | 50 | TEST_CASE(tick_does_not_change_start_time) { |
| 51 | Timer timer = timer_make(); | 51 | Timer timer = timer_make(); |
| 52 | const time_point start_time = timer.start_time; | 52 | const time_point start_time = timer.start_time; |
| 53 | time_sleep(sec_to_time_delta(0.1)); | 53 | time_sleep(time_delta_from_sec(0.1)); |
| 54 | timer_tick(&timer); | 54 | timer_tick(&timer); |
| 55 | TEST_TRUE(time_delta_to_sec(time_diff(start_time, timer.start_time)) == 0.0); | 55 | TEST_TRUE(time_delta_to_sec(time_diff(start_time, timer.start_time)) == 0.0); |
| 56 | } | 56 | } |
| @@ -60,7 +60,7 @@ TEST_CASE(start_restarts_start_time) { | |||
| 60 | const double sleep_time_seconds = 0.1; | 60 | const double sleep_time_seconds = 0.1; |
| 61 | Timer timer = timer_make(); | 61 | Timer timer = timer_make(); |
| 62 | const time_point start_time = timer.start_time; | 62 | const time_point start_time = timer.start_time; |
| 63 | time_sleep(sec_to_time_delta(sleep_time_seconds)); | 63 | time_sleep(time_delta_from_sec(sleep_time_seconds)); |
| 64 | timer_start(&timer); | 64 | timer_start(&timer); |
| 65 | TEST_TRUE(time_delta_to_sec(time_diff(start_time, timer.start_time)) >= | 65 | TEST_TRUE(time_delta_to_sec(time_diff(start_time, timer.start_time)) >= |
| 66 | sleep_time_seconds); | 66 | sleep_time_seconds); |
| @@ -75,7 +75,7 @@ TEST_CASE(count) { | |||
| 75 | { | 75 | { |
| 76 | while (time_delta_to_sec(timer.running_time) <= 1.0) { | 76 | while (time_delta_to_sec(timer.running_time) <= 1.0) { |
| 77 | hundred_seconds++; | 77 | hundred_seconds++; |
| 78 | time_sleep(sec_to_time_delta(0.1)); | 78 | time_sleep(time_delta_from_sec(0.1)); |
| 79 | timer_tick(&timer); | 79 | timer_tick(&timer); |
| 80 | TEST_TRUE(time_delta_to_sec(timer.delta_time) >= 0.1); | 80 | TEST_TRUE(time_delta_to_sec(timer.delta_time) >= 0.1); |
| 81 | } | 81 | } |
