From: "Christian Biesinger (Code Review)" <gerrit@gnutoolchain-gerrit.osci.io>
To: Christian Biesinger <cbiesinger@google.com>,
Kevin Buettner <kevinb@redhat.com>,
gdb-patches@sourceware.org
Subject: [review v6] Use ctime_r and localtime_r for threadsafety
Date: Fri, 15 Nov 2019 19:50:00 -0000 [thread overview]
Message-ID: <20191115194959.9CCD828171@gnutoolchain-gerrit.osci.io> (raw)
In-Reply-To: <gerrit.1572555982000.I329bbdc39d5b576f51859ba00f1617e024c30cbd@gnutoolchain-gerrit.osci.io>
Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/475
......................................................................
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
---
M gdb/ChangeLog
M gdb/maint.c
M gdb/nat/linux-osdata.c
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f31552b..f727aa4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,12 @@
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
avoid compile errors.
diff --git a/gdb/maint.c b/gdb/maint.c
index ec9f4ab..a253584 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -1039,10 +1039,11 @@
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);
}
diff --git a/gdb/nat/linux-osdata.c b/gdb/nat/linux-osdata.c
index ca6acd3..d82c062 100644
--- a/gdb/nat/linux-osdata.c
+++ b/gdb/nat/linux-osdata.c
@@ -916,7 +916,11 @@
{
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';
}
}
--
Gerrit-Project: binutils-gdb
Gerrit-Branch: master
Gerrit-Change-Id: I329bbdc39d5b576f51859ba00f1617e024c30cbd
Gerrit-Change-Number: 475
Gerrit-PatchSet: 6
Gerrit-Owner: Christian Biesinger <cbiesinger@google.com>
Gerrit-Reviewer: Christian Biesinger <cbiesinger@google.com>
Gerrit-Reviewer: Kevin Buettner <kevinb@redhat.com>
Gerrit-MessageType: newpatchset
next prev parent reply other threads:[~2019-11-15 19:50 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 21:06 [review] Use ctime_r and localtime_r if available Christian Biesinger (Code Review)
2019-10-31 21:15 ` Christian Biesinger (Code Review)
2019-11-03 2:54 ` [review v2] " Christian Biesinger (Code Review)
2019-11-03 7:20 ` Andreas Schwab
2019-11-03 20:09 ` Christian Biesinger via gdb-patches
2019-11-03 2:54 ` [review] " Christian Biesinger (Code Review)
2019-11-03 20:04 ` [review v3] " Christian Biesinger (Code Review)
2019-11-06 20:30 ` Christian Biesinger (Code Review)
2019-11-08 14:09 ` Pedro Alves
2019-11-08 17:11 ` Christian Biesinger via gdb-patches
2019-11-09 20:18 ` Christian Biesinger via gdb-patches
2019-11-10 7:38 ` Kevin Buettner (Code Review)
2019-11-10 7:45 ` Kevin Buettner (Code Review)
2019-11-11 22:22 ` [review v4] " Christian Biesinger (Code Review)
2019-11-11 22:27 ` [review v5] Use ctime_r and localtime_r for threadsafety Christian Biesinger (Code Review)
2019-11-11 22:29 ` Christian Biesinger (Code Review)
2019-11-12 20:21 ` Kevin Buettner (Code Review)
2019-11-15 19:50 ` Christian Biesinger (Code Review) [this message]
2019-11-15 19:52 ` [pushed] " Sourceware to Gerrit sync (Code Review)
2019-11-16 22:07 ` [review v6] " Christian Biesinger (Code Review)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191115194959.9CCD828171@gnutoolchain-gerrit.osci.io \
--to=gerrit@gnutoolchain-gerrit.osci.io \
--cc=cbiesinger@google.com \
--cc=gdb-patches@sourceware.org \
--cc=kevinb@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).