aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYordan Karadzhov (VMware) <y.karadz@gmail.com>2021-04-28 16:47:22 +0300
committerYordan Karadzhov (VMware) <y.karadz@gmail.com>2021-05-11 15:44:11 +0300
commit8c3a5c39a00e0f19cedf0ef635348d09434ab8da (patch)
treebe466fd11636aed5c1aa2fd19b6d27503ba15b2c
parent9bf9ea0c1f5a5569979b42fa0758f79a410bad43 (diff)
downloadkernel-shark-8c3a5c39a00e0f19cedf0ef635348d09434ab8da.tar.gz
kernel-shark: Fix the build for 32b systems
All warnings and errors when building on 32bit Linux systems are fixed. Link: https://lore.kernel.org/linux-trace-devel/20210428134730.187533-2-y.karadz@gmail.com Reported-by: Alan Mikhak <amikhak@wirelessfabric.com> Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com>
-rw-r--r--src/KsSession.cpp2
-rw-r--r--src/libkshark-configio.c2
-rw-r--r--src/libkshark-tepdata.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/KsSession.cpp b/src/KsSession.cpp
index 8d489f76..1e19a5fc 100644
--- a/src/KsSession.cpp
+++ b/src/KsSession.cpp
@@ -587,7 +587,7 @@ void KsSession::saveDualMarker(KsDualMarkerSM *dm)
*/
void KsSession::loadDualMarker(KsDualMarkerSM *dm, KsTraceGraph *graphs)
{
- uint64_t pos;
+ size_t pos;
dm->reset();
dm->setState(DualMarkerState::A);
diff --git a/src/libkshark-configio.c b/src/libkshark-configio.c
index 98098da6..9a1ba607 100644
--- a/src/libkshark-configio.c
+++ b/src/libkshark-configio.c
@@ -567,7 +567,7 @@ static bool kshark_trace_file_from_json(const char **file, const char **name,
}
if (st.st_mtime != time) {
- fprintf(stderr, "Timestamp mismatch! (%li!=%li)\nFile %s\n",
+ fprintf(stderr, "Timestamp mismatch! (%" PRIu64 "!=%li)\nFile %s\n",
time, st.st_mtime, file_str);
return false;
}
diff --git a/src/libkshark-tepdata.c b/src/libkshark-tepdata.c
index 4e76ef2a..bc5babb2 100644
--- a/src/libkshark-tepdata.c
+++ b/src/libkshark-tepdata.c
@@ -1025,7 +1025,7 @@ static char *tepdata_dump_entry(struct kshark_data_stream *stream,
free(info);
} else {
n = asprintf(&entry_str,
- "%i; %li; [UNKNOWN TASK]-%i; CPU %i; ; [UNKNOWN EVENT]; [NO INFO]; 0x%x",
+ "%i; %" PRIu64 "; [UNKNOWN TASK]-%i; CPU %i; ; [UNKNOWN EVENT]; [NO INFO]; 0x%x",
entry->stream_id,
entry->ts,
interface->get_pid(stream, entry),