X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Fcounter%2Fcounter.c;h=5a6eadaf4ffec97c4cbcd9cfdb59a1439acd3164;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=ec0a8dba8633a83641254f9b555ae6a2930fba65;hpb=5badd463e184894a3bfd5b8db257efc6f92c6374;p=babeltrace.git

diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c
index ec0a8dba..5a6eadaf 100644
--- a/plugins/utils/counter/counter.c
+++ b/plugins/utils/counter/counter.c
@@ -20,22 +20,26 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/common-internal.h>
+#define BT_LOG_TAG "PLUGIN-UTILS-COUNTER-FLT"
+#include "logging.h"
+
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/babeltrace-internal.h>
+#include <babeltrace2/common-internal.h>
 #include <plugins-common.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <inttypes.h>
 #include <stdint.h>
 
 #include "counter.h"
 
-#define PRINTF_COUNT(_what_sing, _what_plur, _var, args...)		\
+#define PRINTF_COUNT(_what, _var, args...)				\
 	do {								\
 		if (counter->count._var != 0 || !counter->hide_zero) {	\
-			printf("%15" PRIu64 " %s\n",			\
+			printf("%15" PRIu64 " %s message%s\n",		\
 				counter->count._var,			\
-				counter->count._var == 1 ? _what_sing : _what_plur); \
+				(_what),				\
+				counter->count._var == 1 ? "" : "s");	\
 		}							\
 	} while (0)
 
@@ -48,9 +52,13 @@ uint64_t get_total_count(struct counter *counter)
 	return counter->count.event +
 		counter->count.stream_begin +
 		counter->count.stream_end +
+		counter->count.stream_activity_begin +
+		counter->count.stream_activity_end +
 		counter->count.packet_begin +
 		counter->count.packet_end +
-		counter->count.inactivity +
+		counter->count.disc_events +
+		counter->count.disc_packets +
+		counter->count.msg_iter_inactivity +
 		counter->count.other;
 }
 
@@ -59,16 +67,19 @@ void print_count(struct counter *counter)
 {
 	uint64_t total = get_total_count(counter);
 
-	PRINTF_COUNT("event", "events", event);
-	PRINTF_COUNT("stream beginning", "stream beginnings", stream_begin);
-	PRINTF_COUNT("stream end", "stream ends", stream_end);
-	PRINTF_COUNT("packet beginning", "packet beginnings", packet_begin);
-	PRINTF_COUNT("packet end", "packet ends", packet_end);
-	PRINTF_COUNT("inactivity", "inactivities", inactivity);
+	PRINTF_COUNT("Event", event);
+	PRINTF_COUNT("Stream beginning", stream_begin);
+	PRINTF_COUNT("Stream end", stream_end);
+	PRINTF_COUNT("Stream activity beginning", stream_activity_begin);
+	PRINTF_COUNT("Stream activity end", stream_activity_end);
+	PRINTF_COUNT("Packet beginning", packet_begin);
+	PRINTF_COUNT("Packet end", packet_end);
+	PRINTF_COUNT("Discarded event", disc_events);
+	PRINTF_COUNT("Discarded packet", disc_packets);
+	PRINTF_COUNT("Message iterator inactivity", msg_iter_inactivity);
 
 	if (counter->count.other > 0) {
-		PRINTF_COUNT("  other (unknown) message",
-			"  other (unknown) messages", other);
+		PRINTF_COUNT("Other (unknown)", other);
 	}
 
 	printf("%s%15" PRIu64 " message%s (TOTAL)%s\n",
@@ -147,23 +158,29 @@ bt_self_component_status counter_init(
 	}
 
 	counter->last_printed_total = -1ULL;
-	counter->step = 1000;
+	counter->step = 10000;
 	step = bt_value_map_borrow_entry_value_const(params, "step");
-	if (step && bt_value_is_integer(step)) {
-		int64_t val;
-
-		val = bt_value_integer_get(step);
-		if (val >= 0) {
-			counter->step = (uint64_t) val;
+	if (step) {
+		if (!bt_value_is_unsigned_integer(step)) {
+			BT_LOGE("`step` parameter: expecting an unsigned integer value: "
+				"type=%s", bt_common_value_type_string(
+					bt_value_get_type(step)));
+			goto error;
 		}
+
+		counter->step = bt_value_unsigned_integer_get(step);
 	}
 
 	hide_zero = bt_value_map_borrow_entry_value_const(params, "hide-zero");
-	if (hide_zero && bt_value_is_bool(hide_zero)) {
-		bt_bool val;
+	if (hide_zero) {
+		if (!bt_value_is_bool(hide_zero)) {
+			BT_LOGE("`hide-zero` parameter: expecting a boolean value: "
+				"type=%s", bt_common_value_type_string(
+					bt_value_get_type(hide_zero)));
+			goto error;
+		}
 
-		val = bt_value_bool_get(hide_zero);
-		counter->hide_zero = (bool) val;
+		counter->hide_zero = (bool) bt_value_bool_get(hide_zero);
 	}
 
 	bt_self_component_set_data(
@@ -173,6 +190,7 @@ bt_self_component_status counter_init(
 
 error:
 	destroy_private_counter_data(counter);
+	ret = BT_SELF_COMPONENT_STATUS_ERROR;
 
 end:
 	return ret;
@@ -245,8 +263,14 @@ bt_self_component_status counter_consume(
 			case BT_MESSAGE_TYPE_EVENT:
 				counter->count.event++;
 				break;
-			case BT_MESSAGE_TYPE_INACTIVITY:
-				counter->count.inactivity++;
+			case BT_MESSAGE_TYPE_PACKET_BEGINNING:
+				counter->count.packet_begin++;
+				break;
+			case BT_MESSAGE_TYPE_PACKET_END:
+				counter->count.packet_end++;
+				break;
+			case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
+				counter->count.msg_iter_inactivity++;
 				break;
 			case BT_MESSAGE_TYPE_STREAM_BEGINNING:
 				counter->count.stream_begin++;
@@ -254,11 +278,17 @@ bt_self_component_status counter_consume(
 			case BT_MESSAGE_TYPE_STREAM_END:
 				counter->count.stream_end++;
 				break;
-			case BT_MESSAGE_TYPE_PACKET_BEGINNING:
-				counter->count.packet_begin++;
+			case BT_MESSAGE_TYPE_STREAM_ACTIVITY_BEGINNING:
+				counter->count.stream_activity_begin++;
 				break;
-			case BT_MESSAGE_TYPE_PACKET_END:
-				counter->count.packet_end++;
+			case BT_MESSAGE_TYPE_STREAM_ACTIVITY_END:
+				counter->count.stream_activity_end++;
+				break;
+			case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+				counter->count.disc_events++;
+				break;
+			case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+				counter->count.disc_packets++;
 				break;
 			default:
 				counter->count.other++;