diff --git a/lib/node.c b/lib/node.c index 854feb7ee..3695c6e2b 100644 --- a/lib/node.c +++ b/lib/node.c @@ -645,16 +645,19 @@ char * node_name_long(struct node *n) if (node_type(n)->print) { struct node_type *vt = node_type(n); - strcatf(&n->_name_long, "%s: #in.signals=%zu, #in.hooks=%zu, in.vectorize=%d, #out.hooks=%zu, out.vectorize=%d, out.netem=%s", + strcatf(&n->_name_long, "%s: #in.signals=%zu, #in.hooks=%zu, in.vectorize=%d, #out.hooks=%zu, out.vectorize=%d", node_name(n), vlist_length(&n->signals), vlist_length(&n->in.hooks), n->in.vectorize, - vlist_length(&n->out.hooks), n->out.vectorize, - n->tc_qdisc ? "yes" : "no" + vlist_length(&n->out.hooks), n->out.vectorize ); +#ifdef WITH_NETEM + strcatf(&n->_name_long, ", out.netem=%s", n->tc_qdisc ? "yes" : "no"); + if (n->tc_qdisc) strcatf(&n->_name_long, ", mark=%d", n->mark); +#endif /* WITH_NETEM */ /* Append node-type specific details */ char *name_long = vt->print(n); diff --git a/lib/sample.c b/lib/sample.c index 87c177b00..34139bca9 100644 --- a/lib/sample.c +++ b/lib/sample.c @@ -287,7 +287,7 @@ enum signal_type sample_format(const struct sample *s, unsigned idx) void sample_dump(struct sample *s) { - debug(5, "Sample: sequence=%zu, length=%d, capacity=%d, flags=%#x, signals=%p, #signals=%zu, " + debug(5, "Sample: sequence=%llu, length=%d, capacity=%d, flags=%#x, signals=%p, #signals=%zu, " "refcnt=%d, pool_off=%zd", s->sequence, s->length, s->capacity, s->flags, s->signals, s->signals ? vlist_length(s->signals) : 0, atomic_load(&s->refcnt), s->pool_off);