Rename to separate the plug-in and component notions

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/Makefile.am b/include/Makefile.am
index 01273ae450bad2b11264f86040cbe76656b7929b..f6b11bfc1f174320755e7c8ead57fc5a34d70eb3 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -39,17 +39,17 @@ babeltracectfirinclude_HEADERS = \
 babeltraceplugininclude_HEADERS = \
        babeltrace/plugin/plugin.h \
        babeltrace/plugin/component.h \
-       babeltrace/plugin/component-class.h \
        babeltrace/plugin/component-factory.h \
        babeltrace/plugin/source.h \
        babeltrace/plugin/sink.h \
        babeltrace/plugin/filter.h \
        babeltrace/plugin/plugin-lib.h \
        babeltrace/plugin/plugin-system.h \
+       babeltrace/plugin/notification/eot.h \
        babeltrace/plugin/notification/notification.h \
        babeltrace/plugin/notification/event.h \
-       babeltrace/plugin/notification/eot.h \
        babeltrace/plugin/notification/iterator.h \
+       babeltrace/plugin/notification/notification.h \
        babeltrace/plugin/notification/packet.h
 
 noinst_HEADERS = \
@@ -109,12 +109,13 @@ noinst_HEADERS = \
        babeltrace/compat/mman.h \
        babeltrace/endian.h \
        babeltrace/mmap-align.h \
-       babeltrace/plugin/sink-internal.h \
-       babeltrace/plugin/component-internal.h \
-       babeltrace/plugin/component-class-internal.h \
        babeltrace/plugin/component-factory-internal.h \
-       babeltrace/plugin/source-internal.h \
+       babeltrace/plugin/component-internal.h \
        babeltrace/plugin/filter-internal.h \
+       babeltrace/plugin/sink-internal.h \
+       babeltrace/plugin/source-internal.h \
+       babeltrace/plugin/notification/eot-internal.h \
        babeltrace/plugin/notification/event-internal.h \
+       babeltrace/plugin/notification/iterator-internal.h \
        babeltrace/plugin/notification/notification-internal.h \
-       babeltrace/plugin/notification/iterator-internal.h
+       babeltrace/plugin/notification/packet-internal.h

diff --git a/include/babeltrace/plugin/notification/event-internal.h b/include/babeltrace/plugin/notification/event-internal.h
index 442f6040a87887ecd57082bf353d18a61ca18bb8..f9876bd88ba9e1b879398ea153699acf8e68f0bd 100644 (file)
--- a/include/babeltrace/plugin/notification/event-internal.h
+++ b/include/babeltrace/plugin/notification/event-internal.h
@@ -39,8 +39,8 @@
 extern "C" {
 #endif
 
-struct bt_plugin_notification_event {
-       struct bt_plugin_notification parent;
+struct bt_notification_event {
+       struct bt_notification parent;
        struct bt_ctf_trace *trace;
        struct bt_ctf_stream *stream;
        struct bt_ctf_event *event;

diff --git a/include/babeltrace/plugin/notification/event.h b/include/babeltrace/plugin/notification/event.h
index 39d3e03be1c1d0e94656ef54ac52c3b5cfab5445..49505d0da46acd07081365305d3da88ba23b53b0 100644 (file)
--- a/include/babeltrace/plugin/notification/event.h
+++ b/include/babeltrace/plugin/notification/event.h
@@ -31,7 +31,7 @@
 extern "C" {
 #endif
 
-struct bt_plugin_notification;
+struct bt_notification;
 struct bt_ctf_trace;
 struct bt_ctf_stream;
 struct bt_ctf_event;
@@ -44,9 +44,9 @@ struct bt_ctf_event;
  * @param event                        The event
  * @returns                    An event notification instance
  *
- * @see #bt_plugin_notification_type
+ * @see #bt_notification_type
  */
-extern struct bt_plugin_notification *bt_plugin_notification_event_create(
+extern struct bt_notification *bt_notification_event_create(
                struct bt_ctf_trace *trace, struct bt_ctf_stream *stream,
                struct bt_ctf_event *event);
 
@@ -58,8 +58,8 @@ extern struct bt_plugin_notification *bt_plugin_notification_event_create(
  *
  * @see #bt_ctf_trace
  */
-extern struct bt_ctf_trace *bt_plugin_notification_event_get_trace(
-               struct bt_plugin_notification *notification);
+extern struct bt_ctf_trace *bt_notification_event_get_trace(
+               struct bt_notification *notification);
 
 /**
  * Get an event notification's associated stream.
@@ -69,8 +69,8 @@ extern struct bt_ctf_trace *bt_plugin_notification_event_get_trace(
  *
  * @see #bt_ctf_stream
  */
-extern struct bt_ctf_stream *bt_plugin_notification_event_get_stream(
-               struct bt_plugin_notification *notification);
+extern struct bt_ctf_stream *bt_notification_event_get_stream(
+               struct bt_notification *notification);
 
 /**
  * Get an event notification's event.
@@ -80,8 +80,8 @@ extern struct bt_ctf_stream *bt_plugin_notification_event_get_stream(
  *
  * @see #bt_ctf_event
  */
-extern struct bt_ctf_event *bt_plugin_notification_event_get_event(
-               struct bt_plugin_notification *notification);
+extern struct bt_ctf_event *bt_notification_event_get_event(
+               struct bt_notification *notification);
 
 #ifdef __cplusplus
 }

diff --git a/include/babeltrace/plugin/notification/notification-internal.h b/include/babeltrace/plugin/notification/notification-internal.h
index 92cea158764dd0834b29e1627dfa975f2154d478..7b1a3954b8c813ce72085e0ddc2057ad2bdb957f 100644 (file)
--- a/include/babeltrace/plugin/notification/notification-internal.h
+++ b/include/babeltrace/plugin/notification/notification-internal.h
@@ -30,15 +30,14 @@
 #include <babeltrace/ctf-writer/ref-internal.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/plugin/notification/notification.h>
-#include <glib.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-struct bt_plugin_notification {
+struct bt_notification {
        struct bt_ctf_ref ref_count;
-       enum bt_plugin_notification_type type;
+       enum bt_notification_type type;
 };
 
 #ifdef __cplusplus

diff --git a/include/babeltrace/plugin/notification/notification.h b/include/babeltrace/plugin/notification/notification.h
index bc21a39623c9b607abc3ae081664a8334bfaf0b8..3e3459b8b685d8c97fdf2a2691c2773c44fb4e97 100644 (file)
--- a/include/babeltrace/plugin/notification/notification.h
+++ b/include/babeltrace/plugin/notification/notification.h
@@ -36,37 +36,39 @@ struct bt_notification;
 /**
  * Notification types. Unhandled notification types should be ignored.
  */
-enum bt_plugin_notification_type {
-       BT_PLUGIN_NOTIFICATION_TYPE_UNKNOWN = -1,
+enum bt_notification_type {
+       BT_NOTIFICATION_TYPE_UNKNOWN = -1,
 
        /** Event delivery notification, see event.h */
-       BT_PLUGIN_NOTIFICATION_TYPE_EVENT = 0,
+       BT_NOTIFICATION_TYPE_EVENT = 0,
 
        /** New stream packet notification, see packet.h */
-       BT_PLUGIN_NOTIFICATION_TYPE_NEW_PACKET = 1,
+       BT_NOTIFICATION_TYPE_NEW_PACKET = 1,
+
+       /** End of stream packet notification, see packet.h */
+       BT_NOTIFICATION_TYPE_END_PACKET = 1,
 
        /** End of trace notification, see eot.h */
-       BT_PLUGIN_NOTIFICATION_TYPE_EOT = 2,
+       BT_NOTIFICATION_TYPE_END_OF_TRACE = 2,
 };
 
 /**
  * Get a notification's type.
  *
  * @param notification Notification instance
- * @returns            One of #bt_plugin_notification_type
+ * @returns            One of #bt_notification_type
  */
-extern enum bt_plugin_notification_type bt_plugin_notification_get_type(
-               struct bt_plugin_notification *notification);
+extern enum bt_notification_type bt_notification_get_type(
+               struct bt_notification *notification);
 
 /**
- * Increments the reference count of \p notifiaction.
+ * Increments the reference count of \p notification.
  *
  * @param notification Notification of which to increment the reference count
  *
- * @see bt_plugin_notification_put()
+ * @see bt_notification_put()
  */
-extern void bt_plugin_notification_get(
-               struct bt_plugin_notification *notification);
+extern void bt_notification_get(struct bt_notification *notification);
 
 /**
  * Decrements the reference count of \p notification, destroying it when this
@@ -74,10 +76,10 @@ extern void bt_plugin_notification_get(
  *
  * @param notification Notification of which to decrement the reference count
  *
- * @see bt_plugin_notification_get()
+ * @see bt_notification_get()
  */
-extern void bt_plugin_notification_put(
-               struct bt_plugin_notification *notification);
+extern void bt_notification_put(
+               struct bt_notification *notification);
 
 #ifdef __cplusplus
 }

diff --git a/include/babeltrace/plugin/notification/packet-internal.h b/include/babeltrace/plugin/notification/packet-internal.h
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/include/babeltrace/plugin/notification/packet.h b/include/babeltrace/plugin/notification/packet.h
index ab952fe52a26856b6ef4dd86e3629c5aca6c21ad..1d4a5ce7a05a30557bc0b59031826113a04ea0e7 100644 (file)
--- a/include/babeltrace/plugin/notification/packet.h
+++ b/include/babeltrace/plugin/notification/packet.h
@@ -2,7 +2,7 @@
 #define BABELTRACE_PLUGIN_NOTIFICATION_PACKET_H
 
 /*
- * BabelTrace - Plug-in New Packet Notification
+ * BabelTrace - Plug-in Packet Notifications
  *
  * Copyright 2015 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -35,4 +35,4 @@ extern "C" {
 }
 #endif
 
-#endif /* BABELTRACE_PLUGIN_NOTIFICATION_NEW_PACKET_H */
+#endif /* BABELTRACE_PLUGIN_NOTIFICATION_PACKET_H */