ps
/
4coder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slightly cleaner version of linux time_stamp stuff

This commit is contained in:
insofaras 2016-03-12 04:36:55 +00:00
parent db696325c0
commit 89a60b9102
2 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2,7 +2,7 @@ CPP_FILES := $(wildcard *.cpp) $(wildcard **/*.cpp)
H_FILES := $(wildcard *.h) $(wildcard **/*.h) H_FILES := $(wildcard *.h) $(wildcard **/*.h)
WARNINGS := -Wno-write-strings WARNINGS := -Wno-write-strings
PLAT_LINKS := -L/usr/local/lib -lX11 -lpthread -lm -lrt -lGL -ldl -lXfixes PLAT_LINKS := -L/usr/local/lib -lX11 -lpthread -lm -lrt -lGL -ldl -lXfixes
FLAGS := -fPIC -fno-threadsafe-statics -pthread -I../foreign FLAGS := -fPIC -fno-threadsafe-statics -pthread -I../foreign -g
all: ../4ed_app.so ../4ed all: ../4ed_app.so ../4ed

35
linux_4ed.cpp
View File

@ -275,18 +275,10 @@ LinuxStringDup(String* str, void* data, size_t size){
memcpy(str->str, data, size); memcpy(str->str, data, size);
} }
#if (defined(_BSD_SOURCE) || defined(_SVID_SOURCE)) #if defined(_BSD_SOURCE) || defined(_SVID_SOURCE) || _POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700
#define TimeBySt #define OLD_STAT_NANO_TIME 0
#endif
#if (_POSIX_C_SOURCE >= 200809L || _XOPEN_SOURCE >= 700)
#define TimeBySt
#endif
#ifdef TimeBySt
#define nano_mtime_field st_mtim.tv_nsec
#undef TimeBySt
#else #else
#define nano_mtime_field st_mtimensec #define OLD_STAT_NANO_TIME 1
#endif #endif
Sys_File_Time_Stamp_Sig(system_file_time_stamp){ Sys_File_Time_Stamp_Sig(system_file_time_stamp){
@ -298,14 +290,15 @@ Sys_File_Time_Stamp_Sig(system_file_time_stamp){
return 0; return 0;
} }
if (info.st_mtim.tv_nsec != 0){ #if OLD_STAT_NANO_TIME
microsecond_timestamp = microsecond_timestamp =
(info.st_mtim.tv_sec * 1000000ULL) + (info.st_mtime * UINT64_C(100000)) +
(info.st_mtim.tv_nsec / 1000ULL); (info.st_mtimensec / UINT64_C(1000));
} #else
else{ microsecond_timestamp =
microsecond_timestamp = info.st_mtime * 1000000ULL; (info.st_mtim.tv_sec * UINT64_C(1000000)) +
} (info.st_mtim.tv_nsec / UINT64_C(1000));
#endif
LINUX_FN_DEBUG("%s = %" PRIu64, filename, microsecond_timestamp); LINUX_FN_DEBUG("%s = %" PRIu64, filename, microsecond_timestamp);
@ -313,13 +306,13 @@ Sys_File_Time_Stamp_Sig(system_file_time_stamp){
} }
// TODO(allen): DOES THIS AGREE WITH THE FILESTAMP TIMES? // TODO(allen): DOES THIS AGREE WITH THE FILESTAMP TIMES?
// NOTE(inso): I don't think so, CLOCK_MONOTONIC is an arbitrary number // NOTE(inso): I changed it to CLOCK_REALTIME, which should agree with file times
Sys_Time_Sig(system_time){ Sys_Time_Sig(system_time){
struct timespec spec; struct timespec spec;
u64 result; u64 result;
clock_gettime(CLOCK_REALTIME, &spec); clock_gettime(CLOCK_REALTIME, &spec);
result = (spec.tv_sec * 1000000ULL) + (spec.tv_nsec / 1000ULL); result = (spec.tv_sec * UINT64_C(1000000)) + (spec.tv_nsec / UINT64_C(1000));
//LINUX_FN_DEBUG("ts: %" PRIu64, result); //LINUX_FN_DEBUG("ts: %" PRIu64, result);
@ -1880,8 +1873,6 @@ main(int argc, char **argv)
} }
#endif #endif
//TODO(inso): look in linuxvars.settings and set window pos / size etc
if (linuxvars.custom_api.get_bindings == 0){ if (linuxvars.custom_api.get_bindings == 0){
linuxvars.custom_api.get_bindings = get_bindings; linuxvars.custom_api.get_bindings = get_bindings;
} }