From 92ea1a7802a7de0f0a2a9366cd75e87ad819b406 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 5 Jun 2014 09:34:39 +0000 Subject: [PATCH] fixed print utility and some debug messages git-svn-id: https://zerberus.eonerc.rwth-aachen.de:8443/svn/s2ss/trunk@12 8ec27952-4edc-4aab-86aa-e87bb2611832 --- src/msg.c | 4 ++-- src/node.c | 1 - src/utils.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/msg.c b/src/msg.c index e997c9648..70c1bc8c4 100644 --- a/src/msg.c +++ b/src/msg.c @@ -13,10 +13,10 @@ void msg_fprint(FILE *f, struct msg *msg) { - fprintf(f, "p: dev_id = %u, msg_id = %u, data", msg->dev_id, msg->msg_id); + fprintf(f, "p: dev_id = %u, msg_id = %4u, data", msg->dev_id, msg->msg_id); for (int i = 0; i < msg->msg_len / sizeof(double); i++) - fprintf(f, "\t%f", msg->data[i]); + fprintf(f, "%8.3f", msg->data[i]); fprintf(f, "\n"); } diff --git a/src/node.c b/src/node.c index db3abbfd4..774275eec 100644 --- a/src/node.c +++ b/src/node.c @@ -128,5 +128,4 @@ int node_recv(struct node *n, struct msg *m) print(ERROR, "Recv failed: %s", strerror(errno)); print(DEBUG, "Message received from node %s", n->name); - msg_fprint(stdout, m); } diff --git a/src/utils.c b/src/utils.c index 233dc589b..32cbef368 100644 --- a/src/utils.c +++ b/src/utils.c @@ -29,7 +29,7 @@ void print(enum log_level lvl, const char *fmt, ...) clock_gettime(CLOCK_REALTIME, &ts); - printf("%lu.%lu [%-7s] ", (long) ts.tv_sec, (long) ts.tv_nsec / 1000, log_prefix[lvl]); + printf("%14.3f [%-7s] ", ts.tv_sec + ts.tv_nsec / 1e9, log_prefix[lvl]); vprintf(fmt, ap); printf("\n");