Merge branch 'feature/modify_log_time_unit' into 'master'

wujiangang · wujiangang · commit 2e56ddad845f · 2018-08-10T11:24:02.000+08:00
Modify log time unit from "s" to "ms"

See merge request sdk/ESP8266_RTOS_SDK!367
diff --git a/components/log/log.c b/components/log/log.c
@@ -49,6 +49,11 @@ static const char s_log_prefix[ESP_LOG_MAX] = {
     'V', //  ESP_LOG_VERBOSE
 };
 
+static uint32_t IRAM_ATTR esp_log_early_timestamp()
+{
+    return xthal_get_ccount() / (80 * 1000);
+}
+
 #ifndef BOOTLOADER_BUILD
 static _lock_t s_lock;
 static putchar_like_t s_putchar_func = &putchar;
@@ -66,19 +71,10 @@ static int esp_log_write_str(const char *s)
 
 static uint32_t esp_log_timestamp()
 {
-    time_t t;
-
-    t = time(NULL);
-
-    return t;
+    return clock() * (1000 / CLOCKS_PER_SEC) + esp_log_early_timestamp() % (1000 / CLOCKS_PER_SEC);
 }
 #endif
 
-static uint32_t IRAM_ATTR esp_log_early_timestamp()
-{
-    return xthal_get_ccount() / (80 * 1000);
-}
-
 /**
  * @brief Write message into the log at system startup or critical state
  */
diff --git a/components/newlib/Makefile.projbuild b/components/newlib/Makefile.projbuild
@@ -0,0 +1 @@
+CFLAGS += -D_CLOCKS_PER_SEC_=CONFIG_FREERTOS_HZ
diff --git a/components/newlib/newlib/port/time.c b/components/newlib/newlib/port/time.c
@@ -14,12 +14,14 @@
 
 #include <stdint.h>
 #include <reent.h>
+#include <sys/times.h>
 #include <sys/time.h>
 
 #include "esp_system.h"
 #include "esp_timer.h"
 
 #include "FreeRTOS.h"
+#include "task.h"
 
 extern uint32_t esp_get_time();
 
@@ -129,3 +131,13 @@ int settimeofday(const struct timeval* tv, const struct timezone* tz)
 
     return 0;
 }
+
+clock_t _times_r(struct _reent *r, struct tms *tms)
+{
+    tms->tms_utime = xTaskGetTickCount();
+    tms->tms_stime = 0;
+    tms->tms_cutime = 0;
+    tms->tms_cstime = 0;
+
+    return 0;
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+CFLAGS += -D_CLOCKS_PER_SEC_=CONFIG_FREERTOS_HZ`