This is the mail archive of the
elfutils-devel@sourceware.org
mailing list for the elfutils project.
[PATCH v2] Cast pid_t to long long when printing
- From: Ulf Hermann <ulf dot hermann at qt dot io>
- To: <elfutils-devel at sourceware dot org>
- Date: Mon, 8 May 2017 12:42:05 +0200
- Subject: [PATCH v2] Cast pid_t to long long when printing
- Authentication-results: sourceware.org; auth=none
- Authentication-results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io;
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=m+a8ROuigAioan2wQ4CEhpL5pEBRZquK1xNJN6cT2ak=; b=AYr5Ky4Dy+Z1kL1uAQcVolnYNn9Cv/KmgzCE3oVq9cvDl+AK6R/0KmDm72kxBqX5EdnCotCMkoArbk/uNE0sdfgh7/lkOAB7VFhPxr5mLhp8sU1dEMeRYH47RrWhnAW822xJVaL0vqM6BWhxUDHINW1CghcHF6F2U3TzMjFL0F8=
- Spamdiagnosticmetadata: NSPM
- Spamdiagnosticoutput: 1:99
On windows x86_64 pid_t is 64bit wide. We need to adapt our printf
format respectively.
(We can actually print the extra bits in a portable way, so let's do it
rather than casting to int and ignoring them.)
Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
---
src/ChangeLog | 4 ++++
src/stack.c | 22 +++++++++++-----------
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index a474331..1c67b57 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
2017-05-04 Ulf Hermann <ulf.hermann@qt.io>
+ * stack.c: Cast pid_t to int when printing using %d.
+
+2017-05-04 Ulf Hermann <ulf.hermann@qt.io>
+
* strip.c: Close and reopen file when renaming.
2017-05-04 Ulf Hermann <ulf.hermann@qt.io>
diff --git a/src/stack.c b/src/stack.c
index 1f5a1c6..da912e5 100644
--- a/src/stack.c
+++ b/src/stack.c
@@ -362,7 +362,7 @@ print_frames (struct frames *frames, pid_t tid, int
dwflerr, const char *what)
if (frames->frames > 0)
frames_shown = true;
- printf ("TID %d:\n", tid);
+ printf ("TID %lld:\n", (long long)tid);
int frame_nr = 0;
for (int nr = 0; nr < frames->frames && (maxframes == 0
|| frame_nr < maxframes); nr++)
@@ -419,8 +419,8 @@ print_frames (struct frames *frames, pid_t tid, int
dwflerr, const char *what)
}
if (frames->frames > 0 && frame_nr == maxframes)
- error (0, 0, "tid %d: shown max number of frames "
- "(%d, use -n 0 for unlimited)", tid, maxframes);
+ error (0, 0, "tid %lld: shown max number of frames "
+ "(%d, use -n 0 for unlimited)", (long long)tid, maxframes);
else if (dwflerr != 0)
{
if (frames->frames > 0)
@@ -440,11 +440,11 @@ print_frames (struct frames *frames, pid_t tid,
int dwflerr, const char *what)
else
modname = "<unknown>";
}
- error (0, 0, "%s tid %d at 0x%" PRIx64 " in %s: %s", what, tid,
+ error (0, 0, "%s tid %lld at 0x%" PRIx64 " in %s: %s", what, (long
long)tid,
pc_adjusted, modname, dwfl_errmsg (dwflerr));
}
else
- error (0, 0, "%s tid %d: %s", what, tid, dwfl_errmsg (dwflerr));
+ error (0, 0, "%s tid %lld: %s", what, (long long)tid, dwfl_errmsg
(dwflerr));
}
}
@@ -575,10 +575,10 @@ parse_opt (int key, char *arg __attribute__
((unused)),
int err = dwfl_linux_proc_report (dwfl, pid);
if (err < 0)
- error (EXIT_BAD, 0, "dwfl_linux_proc_report pid %d: %s", pid,
+ error (EXIT_BAD, 0, "dwfl_linux_proc_report pid %lld: %s", (long
long)pid,
dwfl_errmsg (-1));
else if (err > 0)
- error (EXIT_BAD, err, "dwfl_linux_proc_report pid %d", pid);
+ error (EXIT_BAD, err, "dwfl_linux_proc_report pid %lld", (long
long)pid);
}
if (core != NULL)
@@ -597,10 +597,10 @@ parse_opt (int key, char *arg __attribute__
((unused)),
{
int err = dwfl_linux_proc_attach (dwfl, pid, false);
if (err < 0)
- error (EXIT_BAD, 0, "dwfl_linux_proc_attach pid %d: %s", pid,
+ error (EXIT_BAD, 0, "dwfl_linux_proc_attach pid %lld: %s", (long
long)pid,
dwfl_errmsg (-1));
else if (err > 0)
- error (EXIT_BAD, err, "dwfl_linux_proc_attach pid %d", pid);
+ error (EXIT_BAD, err, "dwfl_linux_proc_attach pid %lld", (long
long)pid);
}
if (core != NULL)
@@ -688,7 +688,7 @@ invoked with bad or missing arguments it will exit
with return code 64.")
if (show_modules)
{
- printf ("PID %d - %s module memory map\n", dwfl_pid (dwfl),
+ printf ("PID %lld - %s module memory map\n", (long long)dwfl_pid
(dwfl),
pid != 0 ? "process" : "core");
if (dwfl_getmodules (dwfl, module_callback, NULL, 0) != 0)
error (EXIT_BAD, 0, "dwfl_getmodules: %s", dwfl_errmsg (-1));
@@ -721,7 +721,7 @@ invoked with bad or missing arguments it will exit
with return code 64.")
}
else
{
- printf ("PID %d - %s\n", dwfl_pid (dwfl), pid != 0 ? "process" :
"core");
+ printf ("PID %lld - %s\n", (long long)dwfl_pid (dwfl), pid != 0 ?
"process" : "core");
switch (dwfl_getthreads (dwfl, thread_callback, &frames))
{
case DWARF_CB_OK:
--
2.8.1.windows.1