fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2025-12-25 08:10:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus-monitor: Combine sec and usec columns into one timestamp column and unify platform related format string.

Browse source 
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89165
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Ralf Habacker 2015-02-16 13:54:39 +01:00
parent 1e2395f25d
commit 450c7067de
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tools/dbus-monitor.c
View file

@ -107,14 +107,6 @@ monitor_filter_func (DBusConnection *connection,
return DBUS_HANDLER_RESULT_HANDLED;
}
#ifdef __APPLE__
#define PROFILE_TIMED_FORMAT "%s\t%lu\t%d"
#elif defined(__NetBSD__)
#include <inttypes.h>
#define PROFILE_TIMED_FORMAT "%s\t%" PRId64 "\t%d"
#else
#define PROFILE_TIMED_FORMAT "%s\t%lu\t%lu"
#endif
#define TRAP_NULL_STRING(str) ((str) ? (str) : "<none>")
typedef enum
@ -132,15 +124,15 @@ typedef enum
static void
profile_print_headers (void)
{
printf ("#type\tsec\tusec\tserial\tsender\tdestination\tpath\tinterface\tmember\n");
printf ("#\t\t\t\t\t\t\tin_reply_to\n");
printf ("#type\ttimestamp\tserial\tsender\tdestination\tpath\tinterface\tmember\n");
printf ("#\t\t\t\t\t\tin_reply_to\n");
}
static void
profile_print_with_attrs (const char *type, DBusMessage *message,
struct timeval *t, ProfileAttributeFlags attrs)
{
printf (PROFILE_TIMED_FORMAT, type, t->tv_sec, t->tv_usec);
printf ("%s\t%lu.%06lu", type, (unsigned long) t->tv_sec, (unsigned long) t->tv_usec);
if (attrs & PROFILE_ATTRIBUTE_FLAG_SERIAL)
printf ("\t%u", dbus_message_get_serial (message));
@ -224,7 +216,7 @@ print_message_profile (DBusMessage *message)
PROFILE_ATTRIBUTE_FLAG_MEMBER);
break;
default:
printf (PROFILE_TIMED_FORMAT "\n", "tun", t.tv_sec, t.tv_usec);
printf ("%s\t%lu.%06lu", "tun", (unsigned long) t.tv_sec, (unsigned long) t.tv_usec);
break;
}
}