[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 50/59] linux-user: use GDateTime for formatting timestamp for core
From: |
Laurent Vivier |
Subject: |
[PULL 50/59] linux-user: use GDateTime for formatting timestamp for core file |
Date: |
Mon, 17 May 2021 20:14:15 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
The GDateTime APIs provided by GLib avoid portability pitfalls, such
as some platforms where 'struct timeval.tv_sec' field is still 'long'
instead of 'time_t'. When combined with automatic cleanup, GDateTime
often results in simpler code too.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210505103702.521457-7-berrange@redhat.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/elfload.c | 36 +++++++++---------------------------
1 file changed, 9 insertions(+), 27 deletions(-)
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index ffc03d72f935..015eed1a27b4 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -3376,7 +3376,6 @@ static size_t note_size(const struct memelfnote *);
static void free_note_info(struct elf_note_info *);
static int fill_note_info(struct elf_note_info *, long, const CPUArchState *);
static void fill_thread_info(struct elf_note_info *, const CPUArchState *);
-static int core_dump_filename(const TaskState *, char *, size_t);
static int dump_write(int, const void *, size_t);
static int write_note(struct memelfnote *, int);
@@ -3675,32 +3674,16 @@ static void fill_auxv_note(struct memelfnote *note,
const TaskState *ts)
* for the name:
* qemu_<basename-of-target-binary>_<date>-<time>_<pid>.core
*
- * Returns 0 in case of success, -1 otherwise (errno is set).
+ * Returns the filename
*/
-static int core_dump_filename(const TaskState *ts, char *buf,
- size_t bufsize)
+static char *core_dump_filename(const TaskState *ts)
{
- char timestamp[64];
- char *base_filename = NULL;
- struct timeval tv;
- struct tm tm;
+ g_autoptr(GDateTime) now = g_date_time_new_now_local();
+ g_autofree char *nowstr = g_date_time_format(now, "%Y%m%d-%H%M%S");
+ g_autofree char *base_filename = g_path_get_basename(ts->bprm->filename);
- assert(bufsize >= PATH_MAX);
-
- if (gettimeofday(&tv, NULL) < 0) {
- (void) fprintf(stderr, "unable to get current timestamp: %s",
- strerror(errno));
- return (-1);
- }
-
- base_filename = g_path_get_basename(ts->bprm->filename);
- (void) strftime(timestamp, sizeof (timestamp), "%Y%m%d-%H%M%S",
- localtime_r(&tv.tv_sec, &tm));
- (void) snprintf(buf, bufsize, "qemu_%s_%s_%d.core",
- base_filename, timestamp, (int)getpid());
- g_free(base_filename);
-
- return (0);
+ return g_strdup_printf("qemu_%s_%s_%d.core",
+ base_filename, nowstr, (int)getpid());
}
static int dump_write(int fd, const void *ptr, size_t size)
@@ -3928,7 +3911,7 @@ static int elf_core_dump(int signr, const CPUArchState
*env)
const CPUState *cpu = env_cpu((CPUArchState *)env);
const TaskState *ts = (const TaskState *)cpu->opaque;
struct vm_area_struct *vma = NULL;
- char corefile[PATH_MAX];
+ g_autofree char *corefile = NULL;
struct elf_note_info info;
struct elfhdr elf;
struct elf_phdr phdr;
@@ -3945,8 +3928,7 @@ static int elf_core_dump(int signr, const CPUArchState
*env)
if (dumpsize.rlim_cur == 0)
return 0;
- if (core_dump_filename(ts, corefile, sizeof (corefile)) < 0)
- return (-errno);
+ corefile = core_dump_filename(ts);
if ((fd = open(corefile, O_WRONLY | O_CREAT,
S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH)) < 0)
--
2.31.1
- [PULL 58/59] linux-user/elfload: fix filling psinfo->pr_psargs, (continued)
- [PULL 58/59] linux-user/elfload: fix filling psinfo->pr_psargs, Laurent Vivier, 2021/05/17
- [PULL 39/59] linux-user/s390x: Use tswap_sigset in setup_rt_frame, Laurent Vivier, 2021/05/17
- [PULL 31/59] linux-user/sparc: Implement sparc64 rt signals, Laurent Vivier, 2021/05/17
- [PULL 35/59] linux-user/s390x: Remove PSW_ADDR_AMODE, Laurent Vivier, 2021/05/17
- [PULL 40/59] linux-user/s390x: Tidy save_sigregs, Laurent Vivier, 2021/05/17
- [PULL 43/59] linux-user/s390x: Add stub sigframe argument for last_break, Laurent Vivier, 2021/05/17
- [PULL 46/59] linux-user/s390x: Clean up signal.c, Laurent Vivier, 2021/05/17
- [PULL 42/59] linux-user/s390x: Set psw.mask properly for the signal handler, Laurent Vivier, 2021/05/17
- [PULL 41/59] linux-user/s390x: Clean up single-use gotos in signal.c, Laurent Vivier, 2021/05/17
- [PULL 48/59] linux-user: Add copy_file_range to strace.list, Laurent Vivier, 2021/05/17
- [PULL 50/59] linux-user: use GDateTime for formatting timestamp for core file,
Laurent Vivier <=
- [PULL 55/59] linux-user/alpha: Define TARGET_ARCH_HAS_KA_RESTORER, Laurent Vivier, 2021/05/17
- [PULL 44/59] linux-user/s390x: Fix frame_addr corruption in setup_frame, Laurent Vivier, 2021/05/17
- [PULL 51/59] linux-user/alpha: Fix rt sigframe return, Laurent Vivier, 2021/05/17
- [PULL 56/59] linux-user/alpha: Share code for TARGET_NR_sigaction, Laurent Vivier, 2021/05/17
- [PULL 52/59] linux-user/alpha: Rename the sigaction restorer field, Laurent Vivier, 2021/05/17
- [PULL 54/59] linux-user: Honor TARGET_ARCH_HAS_SA_RESTORER in do_syscall, Laurent Vivier, 2021/05/17
- [PULL 59/59] linux-user/elfload: add s390x core dumping support, Laurent Vivier, 2021/05/17
- [PULL 47/59] linux-user/s390x: Handle vector regs in signal stack, Laurent Vivier, 2021/05/17
- [PULL 49/59] linux-user: Fix erroneous conversion in copy_file_range, Laurent Vivier, 2021/05/17
- [PULL 53/59] linux-user: Pass ka_restorer to do_sigaction, Laurent Vivier, 2021/05/17