Browse Source

Merge branch 'branch_libev' of https://github.com/wangyu-/UDPspeeder into branch_libev

wangyu 7 years ago
parent
commit
9fd6428525
2 changed files with 18 additions and 1 deletions
  1. 17 1
      common.cpp
  2. 1 0
      common.h

+ 17 - 1
common.cpp

@@ -47,7 +47,7 @@ struct random_fd_t
 		return random_number_fd;
 	}
 }random_fd;
-
+/*
 u64_t get_current_time()//ms
 {
 	timespec tmp_time;
@@ -60,6 +60,22 @@ u64_t get_current_time_us()
 	timespec tmp_time;
 	clock_gettime(CLOCK_MONOTONIC, &tmp_time);
 	return (uint64_t(tmp_time.tv_sec))*1000llu*1000llu+ (uint64_t(tmp_time.tv_nsec))/1000llu;
+}*/
+
+u64_t get_current_time()//ms
+{
+	//timespec tmp_time;
+	//clock_gettime(CLOCK_MONOTONIC, &tmp_time);
+	//return ((u64_t)tmp_time.tv_sec)*1000llu+((u64_t)tmp_time.tv_nsec)/(1000*1000llu);
+	return (u64_t)(ev_time()*1000);
+}
+
+u64_t get_current_time_us()
+{
+	//timespec tmp_time;
+	//clock_gettime(CLOCK_MONOTONIC, &tmp_time);
+	//return (uint64_t(tmp_time.tv_sec))*1000llu*1000llu+ (uint64_t(tmp_time.tv_nsec))/1000llu;
+	return (u64_t)(ev_time()*1000*1000);
 }
 
 u64_t pack_u64(u32_t a,u32_t b)

+ 1 - 0
common.h

@@ -65,6 +65,7 @@ struct itimerspec {
 
 typedef u64_t my_time_t;
 
+
 const int max_data_len=3600;
 const int buf_len=max_data_len+200;