commit dfb201220c034fde00a242d0533bef3f73b2907d
author Simon Rutishauser <simon.rutishauser@pix4d.com> Tue Oct 13 07:33:58 2015 +0200
committer Simon Rutishauser <simon.rutishauser@pix4d.com> Thu Oct 15 09:44:53 2015 +0200
tree 4b742efa164ba8c8f43e19b4bf0e86f796a8dda7
parent 41455566ac633e55f222bce7c4d2cb4cc33d5c72

Make miniglog threadsafe on non-windows system by using
localtime_r() instead of localtime() for time formatting

Change-Id: Ib8006c685cd8ed4f374893bef56c4061ca2c9747

internal/ceres/miniglog/glog/logging.h

diff --git a/internal/ceres/miniglog/glog/logging.h b/internal/ceres/miniglog/glog/logging.h
index f2c2ff4..0fdf382 100644
--- a/internal/ceres/miniglog/glog/logging.h
+++ b/internal/ceres/miniglog/glog/logging.h
@@ -229,14 +229,13 @@
     time_t rawtime;
     time (&rawtime);
 
-    struct tm* timeinfo;
+    struct tm timeinfo;
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__)
     // On Windows, use secure localtime_s not localtime.
-    struct tm windows_timeinfo;
-    timeinfo = &windows_timeinfo;
-    localtime_s(timeinfo, &rawtime);
+    localtime_s(&timeinfo, &rawtime);
 #else
-    timeinfo = localtime(&rawtime);
+    // On non-Windows systems, use threadsafe localtime_r not localtime.
+    localtime_r(&rawtime, &timeinfo);
 #endif
 
     std::set<google::LogSink*>::iterator iter;
@@ -244,7 +243,7 @@
     for (iter = google::log_sinks_global.begin();
          iter != google::log_sinks_global.end(); ++iter) {
       (*iter)->send(severity, file_.c_str(), filename_only_.c_str(), line_,
-                    timeinfo, stream_.str().c_str(), stream_.str().size());
+                    &timeinfo, stream_.str().c_str(), stream_.str().size());
     }
   }