Fix log timestamps being off by one hour when DST is in effect. (#11385)

microsoft · Sep 20, 2022 · 32878a1 · 32878a1
1 parent 1245c63
commit 32878a1
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/onnxruntime/core/common/logging/logging.cc b/onnxruntime/core/common/logging/logging.cc
@@ -179,6 +179,11 @@ static minutes InitLocaltimeOffset(const time_point<system_clock>& epoch) noexce
   gmtime_r(&system_time_t, &utc_tm);
 #endif
 
+  // Note: mktime() expects a local time and utc_tm is not a local time.
+  // However, we treat utc_tm as a local time in order to compute the local time offset.
+  // To avoid DST inconsistency, set utc_tm's tm_isdst to match that of actual local time local_tm.
+  utc_tm.tm_isdst = local_tm.tm_isdst;
+
   const double seconds = difftime(mktime(&local_tm), mktime(&utc_tm));
 
   // minutes should be accurate enough for timezone conversion