7.0.116

metartc · Oct 17, 2024 · 55dc4ec · 55dc4ec
1 parent cfc01c3
commit 55dc4ec
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 23 deletions.
diff --git a/include/yangutil/sys/YangCTime.h b/include/yangutil/sys/YangCTime.h
@@ -7,11 +7,9 @@
 #include <yangutil/yangtype.h>
 #define yang_time_t time_t
 
-int64_t yang_get_system_micro_time();
-int64_t yang_get_system_micro_time();
-
-int64_t yang_get_milli_time();//haomiao
-int64_t yang_get_micro_time();//weimiao
+uint64_t yang_get_system_micro_time();
+uint64_t yang_get_milli_time();//haomiao
+uint64_t yang_get_micro_time();//weimiao
 
 #define yang_get_milli_tick  yang_get_milli_time
 #define yang_get_micro_tick  yang_get_micro_time
@@ -21,7 +19,7 @@ int64_t yang_get_micro_time();//weimiao
 #include <winsock2.h>
 int gettimeofday(struct timeval *tp, void *tzp);
 #endif
-int64_t yang_get_nano_tick();//namiao
+uint64_t yang_get_nano_tick();//namiao
 typedef struct YangNtp{
     uint64_t system_ms;
     uint64_t ntp;

diff --git a/libmetartccore7/src/yangutil/sys/YangTime.c b/libmetartccore7/src/yangutil/sys/YangTime.c
@@ -31,7 +31,7 @@ int64_t yang_get_win_micro_time();
 #define yang_micro_time yang_get_micro_time
 #endif
 
-int64_t g_system_time_startup_time = 0;
+uint64_t g_system_time_startup_time = 0;
 #ifdef _MSC_VER
 LARGE_INTEGER  g_large_interger;
 int64_t g_dff=0;
@@ -48,62 +48,58 @@ void yang_update_system_time() { //milli weimiao
 		g_system_time_startup_time=g_large_interger.QuadPart;
 	}
 #else
-	if(g_system_time_startup_time==0) g_system_time_startup_time = yang_get_micro_time();
-
+	if(g_system_time_startup_time==0)
+		g_system_time_startup_time = yang_get_micro_time();
 #endif
 
 }
 
-int64_t yang_get_system_micro_time(){
+uint64_t yang_get_system_micro_time(){
 	if(g_system_time_startup_time==0) yang_update_system_time();
 	return yang_micro_time()-g_system_time_startup_time;
 }
 
-int64_t yang_get_system_milli_time(){
+uint64_t yang_get_system_milli_time(){
 	if(g_system_time_startup_time==0) yang_update_system_time();
-
 	return yang_micro_time()/1000;
-
 }
 
-
-
 #ifdef _MSC_VER
 
-int64_t yang_get_win_micro_time(){
+uint64_t yang_get_win_micro_time(){
 	// if(g_system_time_startup_time==0) yang_update_system_time();
 	QueryPerformanceCounter(&g_large_interger);
 	return (g_large_interger.QuadPart-g_system_time_startup_time)*1000000/g_dff;
 }
-int64_t yang_get_win_milli_time(){
+uint64_t yang_get_win_milli_time(){
 	if(g_system_time_startup_time==0) yang_update_system_time();
 	QueryPerformanceCounter(&g_large_interger);
 	return (g_large_interger.QuadPart-g_system_time_startup_time)*1000/g_dff;
 
 }
 #else
 //namiao
-int64_t yang_get_nano_tick(){
+uint64_t yang_get_nano_tick(){
 	struct timespec ts;
 	clock_gettime(CLOCK_MONOTONIC, &ts);
-	return (ts.tv_sec * 1000000000 + ts.tv_nsec);
+	return ((uint64_t)ts.tv_sec * 1000000000 + ts.tv_nsec);
 }
 
 #endif
 
 
 //weimiao
-int64_t yang_get_micro_time() {
+uint64_t yang_get_micro_time() {
 	struct timeval time;
 	gettimeofday(&time, 0);
-	return time.tv_sec * 1000000 + time.tv_usec ;
+	return (uint64_t)time.tv_sec * 1000000 + time.tv_usec ;
 }
 //haomiao
-int64_t yang_get_milli_time() {
+uint64_t yang_get_milli_time() {
 	struct timeval time;
 	gettimeofday(&time, 0);
 	// long millis = (time.tv_sec * 1000) + (time.tv_usec / 1000);
-	return (time.tv_sec * 1000) + (time.tv_usec / 1000);
+	return ((uint64_t)time.tv_sec * 1000) + (time.tv_usec / 1000);
 }