diff options
| author | Yordan Karadzhov <ykaradzhov@vmware.com> | 2019-06-14 13:51:23 +0000 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-07-08 08:30:17 -0400 |
| commit | 1db270ee30e95a28881ac6e79d6c4c43b0a8cf3a (patch) | |
| tree | a131fe578b52ee410291b580f406f6d4607cba17 | |
| parent | 7f779353b4a8efc4ce26b9b76fdac543c81da280 (diff) | |
| download | trace-cmd-1db270ee30e95a28881ac6e79d6c4c43b0a8cf3a.tar.gz | |
kernel-shark: Fix all warnings when building on 32 bit systems
Fixing warnings coming from:
../examples/datahisto.c
../src/KsTraceGraph.cpp
../src/libkshark.c
Link: http://lore.kernel.org/linux-trace-devel/20190614135045.17223-4-ykaradzhov@vmware.com
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203869
Reported-by: Alan Mikhak <alanmikhak@gmail.com>
Signed-off-by: Yordan Karadzhov <ykaradzhov@vmware.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -rw-r--r-- | kernel-shark/examples/datahisto.c | 4 | ||||
| -rw-r--r-- | kernel-shark/src/KsTraceGraph.cpp | 10 | ||||
| -rw-r--r-- | kernel-shark/src/libkshark.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/kernel-shark/examples/datahisto.c b/kernel-shark/examples/datahisto.c index 02c6285b..b177b088 100644 --- a/kernel-shark/examples/datahisto.c +++ b/kernel-shark/examples/datahisto.c @@ -56,11 +56,11 @@ void dump_bin(struct kshark_trace_histo *histo, int bin, puts ("EMPTY BIN"); } else { entry_str = kshark_dump_entry(e_front); - printf("%li -> %s\n", i_front, entry_str); + printf("%zd -> %s\n", i_front, entry_str); free(entry_str); entry_str = kshark_dump_entry(e_back); - printf("%li -> %s\n", i_back, entry_str); + printf("%zd -> %s\n", i_back, entry_str); free(entry_str); } diff --git a/kernel-shark/src/KsTraceGraph.cpp b/kernel-shark/src/KsTraceGraph.cpp index da2c6aa1..324f36ec 100644 --- a/kernel-shark/src/KsTraceGraph.cpp +++ b/kernel-shark/src/KsTraceGraph.cpp @@ -277,7 +277,7 @@ void KsTraceGraph::_resetPointer(uint64_t ts, int cpu, int pid) QString pointer; kshark_convert_nano(ts, &sec, &usec); - pointer.sprintf("%lu.%06lu", sec, usec); + pointer.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); _labelP2.setText(pointer); if (pid > 0 && cpu >= 0) { @@ -313,7 +313,7 @@ void KsTraceGraph::_setPointerInfo(size_t i) uint64_t sec, usec; kshark_convert_nano(e->ts, &sec, &usec); - pointer.sprintf("%lu.%06lu", sec, usec); + pointer.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); _labelP2.setText(pointer); comm.append("-"); @@ -601,17 +601,17 @@ void KsTraceGraph::_updateTimeLegends() QString tMin, tMid, tMax; kshark_convert_nano(_glWindow.model()->histo()->min, &sec, &usec); - tMin.sprintf("%lu.%06lu", sec, usec); + tMin.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); _labelXMin.setText(tMin); tsMid = (_glWindow.model()->histo()->min + _glWindow.model()->histo()->max) / 2; kshark_convert_nano(tsMid, &sec, &usec); - tMid.sprintf("%lu.%06lu", sec, usec); + tMid.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); _labelXMid.setText(tMid); kshark_convert_nano(_glWindow.model()->histo()->max, &sec, &usec); - tMax.sprintf("%lu.%06lu", sec, usec); + tMax.sprintf("%" PRIu64 ".%06" PRIu64 "", sec, usec); _labelXMax.setText(tMax); } diff --git a/kernel-shark/src/libkshark.c b/kernel-shark/src/libkshark.c index d2764e81..4201fa02 100644 --- a/kernel-shark/src/libkshark.c +++ b/kernel-shark/src/libkshark.c @@ -1423,7 +1423,7 @@ char* kshark_dump_custom_entry(struct kshark_context *kshark_ctx, event_name = info_func(kshark_ctx, entry, false); info = info_func(kshark_ctx, entry, true); - size = asprintf(&entry_str, "%li; %s-%i; CPU %i; ; %s; %s", + size = asprintf(&entry_str, "%" PRIu64 "; %s-%i; CPU %i; ; %s; %s", entry->ts, task, entry->pid, @@ -1472,7 +1472,7 @@ char* kshark_dump_entry(const struct kshark_entry *entry) event_name = event? event->name : "[UNKNOWN EVENT]"; lat = kshark_get_latency(kshark_ctx->pevent, data); - size = asprintf(&temp_str, "%li; %s-%i; CPU %i; %s;", + size = asprintf(&temp_str, "%" PRIu64 "; %s-%i; CPU %i; %s;", entry->ts, task, entry->pid, |