update

base/hlog.h

@@ -5,6 +5,18 @@
  * hlog is thread-safe
  */
 
+#include <string.h>
+
+#ifdef _WIN32
+#define DIR_SEPARATOR   '\\'
+#else
+#define DIR_SEPARATOR   '/'
+#endif
+
+#ifndef __FILENAME__
+#define __FILENAME__  (strrchr(__FILE__, DIR_SEPARATOR) + 1)
+#endif
+
 #include "hexport.h"
 
 #ifdef __cplusplus
@@ -100,11 +112,11 @@ HV_EXPORT logger_t* hv_default_logger();
 #define hlog_fsync()                    logger_fsync(hlog)
 #define hlog_get_cur_file()             logger_get_cur_file(hlog)
 
-#define hlogd(fmt, ...) logger_print(hlog, LOG_LEVEL_DEBUG, fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__)
-#define hlogi(fmt, ...) logger_print(hlog, LOG_LEVEL_INFO,  fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__)
-#define hlogw(fmt, ...) logger_print(hlog, LOG_LEVEL_WARN,  fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__)
-#define hloge(fmt, ...) logger_print(hlog, LOG_LEVEL_ERROR, fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__)
-#define hlogf(fmt, ...) logger_print(hlog, LOG_LEVEL_FATAL, fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILE__, __LINE__, __FUNCTION__)
+#define hlogd(fmt, ...) logger_print(hlog, LOG_LEVEL_DEBUG, fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILENAME__, __LINE__, __FUNCTION__)
+#define hlogi(fmt, ...) logger_print(hlog, LOG_LEVEL_INFO,  fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILENAME__, __LINE__, __FUNCTION__)
+#define hlogw(fmt, ...) logger_print(hlog, LOG_LEVEL_WARN,  fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILENAME__, __LINE__, __FUNCTION__)
+#define hloge(fmt, ...) logger_print(hlog, LOG_LEVEL_ERROR, fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILENAME__, __LINE__, __FUNCTION__)
+#define hlogf(fmt, ...) logger_print(hlog, LOG_LEVEL_FATAL, fmt " [%s:%d:%s]\n", ## __VA_ARGS__, __FILENAME__, __LINE__, __FUNCTION__)
 
 // below for android
 #if defined(ANDROID) || defined(__ANDROID__)

base/htime.c

@@ -154,7 +154,7 @@ char* duration_fmt(int sec, char* buf) {
 char* datetime_fmt(datetime_t* dt, char* buf) {
     sprintf(buf, DATETIME_FMT,
         dt->year, dt->month, dt->day,
-        dt->hour, dt->min, dt->sec, dt->ms);
+        dt->hour, dt->min, dt->sec);
     return buf;
 }
 
@@ -199,7 +199,7 @@ datetime_t hv_compile_datetime() {
     datetime_t dt;
     char month[32];
     sscanf(__DATE__, "%s %d %d", month, &dt.day, &dt.year);
-    sscanf(__TIME__, "%d %d %d", &dt.hour, &dt.min, &dt.sec);
+    sscanf(__TIME__, "%d:%d:%d", &dt.hour, &dt.min, &dt.sec);
     dt.month = month_atoi(month);
     return dt;
 }

base/htime.h

@@ -93,7 +93,7 @@ HV_EXPORT datetime_t* datetime_future(datetime_t* dt, int days DEFAULT(1));
 #define TIME_FMT_BUFLEN     12
 HV_EXPORT char* duration_fmt(int sec, char* buf);
 
-#define DATETIME_FMT        "%04d-%02d-%02d %02d:%02d:%02d.%03d"
+#define DATETIME_FMT        "%04d-%02d-%02d %02d:%02d:%02d"
 #define DATETIME_FMT_BUFLEN 24
 HV_EXPORT char* datetime_fmt(datetime_t* dt, char* buf);