Changeset ee6b30f for functions.c

Timestamp:

Oct 8, 2017, 6:02:19 PM (7 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master

Children:

4fd3c04

Parents:

09530e6

git-author:

Anders Kaseorg <andersk@mit.edu> (10/07/17 03:25:44)

git-committer:

Anders Kaseorg <andersk@mit.edu> (10/08/17 18:02:19)

Message:

Avoid thread-unsafe functions ctime, localtime, strtok

BarnOwl seems to be growing threads at an alarming rate, so let’s be
sure these don’t turn into race conditions.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -1226 +1226 @@
   FILE *file;
   time_t now;
+  struct tm tm;
   va_list ap;
 
@@ -1237 +1238 @@
   now = time(NULL);
 
-  tmpbuff = owl_util_format_time(localtime(&now));
+  tmpbuff = owl_util_format_time(localtime_r(&now, &tm));
   fprintf(file, "[%d -  %s - %lds]: ",
           (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
@@ -1775 +1776 @@
   char buff[MAXPATHLEN+1];
   time_t start;
+  struct tm tm;
   int up, days, hours, minutes;
   owl_fmtext fm;
@@ -1800 +1802 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  tmpbuff = owl_util_format_time(localtime(&start));
+  tmpbuff = owl_util_format_time(localtime_r(&start, &tm));
   owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
   g_free(tmpbuff);
@@ -3424 +3426 @@
   char *date;
   time_t now;
+  struct tm tm;
   char *buff;
 
   now = time(NULL);
-  date = owl_util_format_time(localtime(&now));
+  date = owl_util_format_time(localtime_r(&now, &tm));
 
   buff = g_strdup_printf("%s %s", date, string);