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

Slap u64 on everything time-y (#10984)

master
Lars Müller 2021-02-24 12:05:17 +01:00 committed by GitHub
parent d51d0d77c4
commit b5eda416ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/lua_api.txt
View File

@ -3268,7 +3268,6 @@ Helper functions
* returns true when the passed number represents NaN. * returns true when the passed number represents NaN.
* `minetest.get_us_time()` * `minetest.get_us_time()`
* returns time with microsecond precision. May not return wall time. * returns time with microsecond precision. May not return wall time.
* This value might overflow on certain 32-bit systems!
* `table.copy(table)`: returns a table * `table.copy(table)`: returns a table
* returns a deep copy of `table` * returns a deep copy of `table`
* `table.indexof(list, val)`: returns the smallest numerical index containing * `table.indexof(list, val)`: returns the smallest numerical index containing

6
src/porting.h
View File

@ -234,21 +234,21 @@ inline u64 getTimeMs()
{ {
struct timespec ts; struct timespec ts;
os_get_clock(&ts); os_get_clock(&ts);
return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; return ((u64) ts.tv_sec) * 1000LL + ((u64) ts.tv_nsec) / 1000000LL;
} }
inline u64 getTimeUs() inline u64 getTimeUs()
{ {
struct timespec ts; struct timespec ts;
os_get_clock(&ts); os_get_clock(&ts);
return ts.tv_sec * 1000000 + ts.tv_nsec / 1000; return ((u64) ts.tv_sec) * 1000000LL + ((u64) ts.tv_nsec) / 1000LL;
} }
inline u64 getTimeNs() inline u64 getTimeNs()
{ {
struct timespec ts; struct timespec ts;
os_get_clock(&ts); os_get_clock(&ts);
return ts.tv_sec * 1000000000 + ts.tv_nsec; return ((u64) ts.tv_sec) * 1000000000LL + ((u64) ts.tv_nsec);
} }
#endif #endif