Use ctime_r and localtime_r for threadsafety

To make these calls threadsafe. localtime_r is provided by gnulib if
necessary, and for ctime_r we can just use it because it is in a linux-
specific file.

gdb/ChangeLog:

2019-11-15  Christian Biesinger  <cbiesinger@google.com>

	* maint.c (scoped_command_stats::print_time): Use localtime_r
	instead of localtime (provided through gnulib if necessary).
	* nat/linux-osdata.c (time_from_time_t): Use ctime_r instead
	of ctime.

Change-Id: I329bbdc39d5b576f51859ba00f1617e024c30cbd
This commit is contained in:
Christian Biesinger 2019-10-31 16:02:41 -05:00
parent f8e27d88e4
commit 53fea9c7e6
3 changed files with 15 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2019-11-15 Christian Biesinger <cbiesinger@google.com>
* maint.c (scoped_command_stats::print_time): Use localtime_r
instead of localtime (provided through gnulib if necessary).
* nat/linux-osdata.c (time_from_time_t): Use ctime_r instead
of ctime.
2019-11-15 Christian Biesinger <cbiesinger@google.com>
* gdbsupport/common-defs.h: Include time.h before pathmax.h to

View File

@ -1039,10 +1039,11 @@ scoped_command_stats::print_time (const char *msg)
auto millis = ticks % 1000;
std::time_t as_time = system_clock::to_time_t (now);
struct tm *tm = localtime (&as_time);
struct tm tm;
localtime_r (&as_time, &tm);
char out[100];
strftime (out, sizeof (out), "%F %H:%M:%S", tm);
strftime (out, sizeof (out), "%F %H:%M:%S", &tm);
printf_unfiltered ("%s.%03d - %s\n", out, (int) millis, msg);
}

View File

@ -916,7 +916,11 @@ time_from_time_t (char *time, int maxlen, TIME_T seconds)
{
time_t t = (time_t) seconds;
strncpy (time, ctime (&t), maxlen);
/* Per the ctime_r manpage, this buffer needs to be at least 26
characters long. */
char buf[30];
const char *time_str = ctime_r (&t, buf);
strncpy (time, time_str, maxlen);
time[maxlen - 1] = '\0';
}
}