From b2e0c9076135f47110af2d96dfaee397c597bc90 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Tue, 28 Mar 2017 22:04:59 -0400 Subject: [PATCH] Rename -> MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Also put all the graph-related header files directly in this directory, not in subdirectories. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- configure.ac | 7 +- converter/babeltrace-cfg.h | 2 +- converter/babeltrace.c | 18 ++-- formats/ctf/ir/trace.c | 2 +- include/Makefile.am | 86 +++++++++---------- include/babeltrace/ctf-ir/trace.h | 2 +- .../component-class-filter.h | 2 +- .../component-class-internal.h | 10 +-- .../component-class-sink.h | 2 +- .../component-class-source.h | 2 +- .../{component => graph}/component-class.h | 2 +- .../component-filter-internal.h | 4 +- .../{component => graph}/component-filter.h | 2 +- .../{component => graph}/component-internal.h | 6 +- .../component-sink-internal.h | 6 +- .../{component => graph}/component-sink.h | 2 +- .../component-source-internal.h | 4 +- .../{component => graph}/component-source.h | 2 +- .../{component => graph}/component.h | 4 +- .../connection-internal.h | 4 +- .../{component => graph}/connection.h | 0 .../{component => graph}/graph-internal.h | 2 +- .../babeltrace/{component => graph}/graph.h | 2 +- .../notification-eot-internal.h} | 0 .../eot.h => graph/notification-eot.h} | 0 .../notification-event-internal.h} | 2 +- .../event.h => graph/notification-event.h} | 0 .../notification-heap-internal.h} | 4 +- .../heap.h => graph/notification-heap.h} | 2 +- .../notification-internal.h | 2 +- .../notification-iterator-internal.h} | 6 +- .../notification-iterator.h} | 0 .../notification-packet-internal.h} | 2 +- .../packet.h => graph/notification-packet.h} | 2 +- .../schema.h => graph/notification-schema.h} | 0 .../notification-stream-internal.h} | 2 +- .../stream.h => graph/notification-stream.h} | 2 +- .../notification => graph}/notification.h | 0 .../{component => graph}/port-internal.h | 2 +- .../babeltrace/{component => graph}/port.h | 0 .../private-component-filter.h | 2 +- .../private-component-sink.h | 2 +- .../private-component-source.h | 2 +- .../{component => graph}/private-component.h | 2 +- .../{component => graph}/private-connection.h | 0 .../private-notification-iterator.h} | 0 .../{component => graph}/private-port.h | 0 include/babeltrace/plugin/plugin-dev.h | 8 +- include/babeltrace/plugin/plugin.h | 2 +- lib/component/component-class.c | 2 +- lib/component/component.c | 24 +++--- lib/component/connection.c | 16 ++-- lib/component/filter.c | 10 +-- lib/component/graph.c | 14 +-- lib/component/iterator.c | 10 +-- lib/component/notification/event.c | 2 +- lib/component/notification/heap.c | 2 +- lib/component/notification/notification.c | 2 +- lib/component/notification/packet.c | 2 +- lib/component/notification/stream.c | 2 +- lib/component/port.c | 6 +- lib/component/sink.c | 6 +- lib/component/source.c | 10 +-- lib/plugin/plugin-so.c | 2 +- plugins/ctf/common/notif-iter/notif-iter.c | 6 +- plugins/ctf/fs/data-stream.c | 2 +- plugins/ctf/fs/fs.c | 16 ++-- plugins/ctf/fs/fs.h | 2 +- plugins/ctf/lttng-live/lttng-live-internal.h | 2 +- plugins/ctf/lttng-live/lttng-live.c | 2 +- plugins/muxer/muxer.c | 10 +-- plugins/text/text.c | 20 ++--- plugins/text/text.h | 2 +- plugins/utils/dummy/dummy.c | 16 ++-- plugins/utils/dummy/dummy.h | 6 +- plugins/utils/trimmer/iterator.c | 22 ++--- plugins/utils/trimmer/iterator.h | 8 +- plugins/utils/trimmer/trimmer.c | 14 +-- plugins/utils/trimmer/trimmer.h | 2 +- plugins/writer/writer.c | 20 ++--- plugins/writer/writer.h | 2 +- tests/lib/test-plugin-plugins/sfs.c | 2 +- tests/lib/test_bt_notification_heap.c | 6 +- 83 files changed, 241 insertions(+), 246 deletions(-) rename include/babeltrace/{component => graph}/component-class-filter.h (98%) rename include/babeltrace/{component => graph}/component-class-internal.h (92%) rename include/babeltrace/{component => graph}/component-class-sink.h (97%) rename include/babeltrace/{component => graph}/component-class-source.h (98%) rename include/babeltrace/{component => graph}/component-class.h (99%) rename include/babeltrace/{component => graph}/component-filter-internal.h (95%) rename include/babeltrace/{component => graph}/component-filter.h (98%) rename include/babeltrace/{component => graph}/component-internal.h (96%) rename include/babeltrace/{component => graph}/component-sink-internal.h (93%) rename include/babeltrace/{component => graph}/component-sink.h (97%) rename include/babeltrace/{component => graph}/component-source-internal.h (95%) rename include/babeltrace/{component => graph}/component-source.h (97%) rename include/babeltrace/{component => graph}/component.h (97%) rename include/babeltrace/{component => graph}/connection-internal.h (96%) rename include/babeltrace/{component => graph}/connection.h (100%) rename include/babeltrace/{component => graph}/graph-internal.h (98%) rename include/babeltrace/{component => graph}/graph.h (99%) rename include/babeltrace/{component/notification/eot-internal.h => graph/notification-eot-internal.h} (100%) rename include/babeltrace/{component/notification/eot.h => graph/notification-eot.h} (100%) rename include/babeltrace/{component/notification/event-internal.h => graph/notification-event-internal.h} (96%) rename include/babeltrace/{component/notification/event.h => graph/notification-event.h} (100%) rename include/babeltrace/{component/notification/heap-internal.h => graph/notification-heap-internal.h} (93%) rename include/babeltrace/{component/notification/heap.h => graph/notification-heap.h} (98%) rename include/babeltrace/{component/notification => graph}/notification-internal.h (97%) rename include/babeltrace/{component/notification/iterator-internal.h => graph/notification-iterator-internal.h} (93%) rename include/babeltrace/{component/notification/iterator.h => graph/notification-iterator.h} (100%) rename include/babeltrace/{component/notification/packet-internal.h => graph/notification-packet-internal.h} (96%) rename include/babeltrace/{component/notification/packet.h => graph/notification-packet.h} (97%) rename include/babeltrace/{component/notification/schema.h => graph/notification-schema.h} (100%) rename include/babeltrace/{component/notification/stream-internal.h => graph/notification-stream-internal.h} (95%) rename include/babeltrace/{component/notification/stream.h => graph/notification-stream.h} (96%) rename include/babeltrace/{component/notification => graph}/notification.h (100%) rename include/babeltrace/{component => graph}/port-internal.h (98%) rename include/babeltrace/{component => graph}/port.h (100%) rename include/babeltrace/{component => graph}/private-component-filter.h (98%) rename include/babeltrace/{component => graph}/private-component-sink.h (97%) rename include/babeltrace/{component => graph}/private-component-source.h (97%) rename include/babeltrace/{component => graph}/private-component.h (97%) rename include/babeltrace/{component => graph}/private-connection.h (100%) rename include/babeltrace/{component/notification/private-iterator.h => graph/private-notification-iterator.h} (100%) rename include/babeltrace/{component => graph}/private-port.h (100%) diff --git a/configure.ac b/configure.ac index 0f3182142..51e229d87 100644 --- a/configure.ac +++ b/configure.ac @@ -410,11 +410,8 @@ AC_SUBST(babeltracectfirincludedir) babeltracepluginincludedir="${includedir}/babeltrace/plugin" AC_SUBST(babeltracepluginincludedir) -babeltracecomponentincludedir="${includedir}/babeltrace/component" -AC_SUBST(babeltracecomponentincludedir) - -babeltracecomponentnotifincludedir="${includedir}/babeltrace/component/notification" -AC_SUBST(babeltracecomponentnotifincludedir) +babeltracegraphincludedir="${includedir}/babeltrace/graph" +AC_SUBST(babeltracegraphincludedir) program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name" AC_SUBST(program_transform_name) diff --git a/converter/babeltrace-cfg.h b/converter/babeltrace-cfg.h index caa90f44c..ca2f9950e 100644 --- a/converter/babeltrace-cfg.h +++ b/converter/babeltrace-cfg.h @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include struct bt_config_component { diff --git a/converter/babeltrace.c b/converter/babeltrace.c index ecfbf5bee..5aa725562 100644 --- a/converter/babeltrace.c +++ b/converter/babeltrace.c @@ -29,15 +29,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/formats/ctf/ir/trace.c b/formats/ctf/ir/trace.c index 378840691..32ceca636 100644 --- a/formats/ctf/ir/trace.c +++ b/formats/ctf/ir/trace.c @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/Makefile.am b/include/Makefile.am index 94676992a..a4ef7ecda 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -41,35 +41,33 @@ babeltraceplugininclude_HEADERS = \ babeltrace/plugin/plugin.h \ babeltrace/plugin/plugin-dev.h -babeltracecomponentnotifinclude_HEADERS = \ - babeltrace/component/notification/eot.h \ - babeltrace/component/notification/notification.h \ - babeltrace/component/notification/event.h \ - babeltrace/component/notification/iterator.h \ - babeltrace/component/notification/packet.h \ - babeltrace/component/notification/schema.h \ - babeltrace/component/notification/stream.h \ - babeltrace/component/notification/heap.h \ - babeltrace/component/notification/private-iterator.h - -babeltracecomponentinclude_HEADERS = \ - babeltrace/component/component.h \ - babeltrace/component/component-class.h \ - babeltrace/component/component-class-source.h \ - babeltrace/component/component-class-filter.h \ - babeltrace/component/component-class-sink.h \ - babeltrace/component/connection.h \ - babeltrace/component/port.h \ - babeltrace/component/graph.h \ - babeltrace/component/component-source.h \ - babeltrace/component/component-sink.h \ - babeltrace/component/component-filter.h \ - babeltrace/component/private-connection.h \ - babeltrace/component/private-port.h \ - babeltrace/component/private-component.h \ - babeltrace/component/private-component-source.h \ - babeltrace/component/private-component-sink.h \ - babeltrace/component/private-component-filter.h +babeltracegraphinclude_HEADERS = \ + babeltrace/graph/component-class-filter.h \ + babeltrace/graph/component-class-sink.h \ + babeltrace/graph/component-class-source.h \ + babeltrace/graph/component-class.h \ + babeltrace/graph/component-filter.h \ + babeltrace/graph/component-sink.h \ + babeltrace/graph/component-source.h \ + babeltrace/graph/component.h \ + babeltrace/graph/connection.h \ + babeltrace/graph/graph.h \ + babeltrace/graph/notification-eot.h \ + babeltrace/graph/notification-event.h \ + babeltrace/graph/notification-heap.h \ + babeltrace/graph/notification-iterator.h \ + babeltrace/graph/notification.h \ + babeltrace/graph/notification-packet.h \ + babeltrace/graph/notification-schema.h \ + babeltrace/graph/notification-stream.h \ + babeltrace/graph/port.h \ + babeltrace/graph/private-component-filter.h \ + babeltrace/graph/private-component-sink.h \ + babeltrace/graph/private-component-source.h \ + babeltrace/graph/private-component.h \ + babeltrace/graph/private-connection.h \ + babeltrace/graph/private-notification-iterator.h \ + babeltrace/graph/private-port.h noinst_HEADERS = \ babeltrace/align.h \ @@ -133,18 +131,18 @@ noinst_HEADERS = \ babeltrace/mmap-align.h \ babeltrace/plugin/plugin-internal.h \ babeltrace/plugin/plugin-so-internal.h \ - babeltrace/component/component-class-internal.h \ - babeltrace/component/connection-internal.h \ - babeltrace/component/port-internal.h \ - babeltrace/component/component-internal.h \ - babeltrace/component/graph-internal.h \ - babeltrace/component/component-filter-internal.h \ - babeltrace/component/component-sink-internal.h \ - babeltrace/component/component-source-internal.h \ - babeltrace/component/notification/eot-internal.h \ - babeltrace/component/notification/event-internal.h \ - babeltrace/component/notification/iterator-internal.h \ - babeltrace/component/notification/notification-internal.h \ - babeltrace/component/notification/packet-internal.h \ - babeltrace/component/notification/stream-internal.h \ - babeltrace/component/notification/heap-internal.h + babeltrace/graph/component-class-internal.h \ + babeltrace/graph/connection-internal.h \ + babeltrace/graph/port-internal.h \ + babeltrace/graph/component-internal.h \ + babeltrace/graph/graph-internal.h \ + babeltrace/graph/component-filter-internal.h \ + babeltrace/graph/component-sink-internal.h \ + babeltrace/graph/component-source-internal.h \ + babeltrace/graph/notification-eot-internal.h \ + babeltrace/graph/notification-event-internal.h \ + babeltrace/graph/notification-iterator-internal.h \ + babeltrace/graph/notification-internal.h \ + babeltrace/graph/notification-packet-internal.h \ + babeltrace/graph/notification-stream-internal.h \ + babeltrace/graph/notification-heap-internal.h diff --git a/include/babeltrace/ctf-ir/trace.h b/include/babeltrace/ctf-ir/trace.h index b722d9221..07daabe3a 100644 --- a/include/babeltrace/ctf-ir/trace.h +++ b/include/babeltrace/ctf-ir/trace.h @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #ifdef __cplusplus diff --git a/include/babeltrace/component/component-class-filter.h b/include/babeltrace/graph/component-class-filter.h similarity index 98% rename from include/babeltrace/component/component-class-filter.h rename to include/babeltrace/graph/component-class-filter.h index 60ed0f7c4..bc30a77f1 100644 --- a/include/babeltrace/component/component-class-filter.h +++ b/include/babeltrace/graph/component-class-filter.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component-class-internal.h b/include/babeltrace/graph/component-class-internal.h similarity index 92% rename from include/babeltrace/component/component-class-internal.h rename to include/babeltrace/graph/component-class-internal.h index 1cafef640..68a8e0c11 100644 --- a/include/babeltrace/component/component-class-internal.h +++ b/include/babeltrace/graph/component-class-internal.h @@ -28,11 +28,11 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/component/component-class-sink.h b/include/babeltrace/graph/component-class-sink.h similarity index 97% rename from include/babeltrace/component/component-class-sink.h rename to include/babeltrace/graph/component-class-sink.h index b93b51d67..e2cf85e23 100644 --- a/include/babeltrace/component/component-class-sink.h +++ b/include/babeltrace/graph/component-class-sink.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component-class-source.h b/include/babeltrace/graph/component-class-source.h similarity index 98% rename from include/babeltrace/component/component-class-source.h rename to include/babeltrace/graph/component-class-source.h index a6de3ae5d..6190977b4 100644 --- a/include/babeltrace/component/component-class-source.h +++ b/include/babeltrace/graph/component-class-source.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component-class.h b/include/babeltrace/graph/component-class.h similarity index 99% rename from include/babeltrace/component/component-class.h rename to include/babeltrace/graph/component-class.h index a5bfee871..cf031cfe1 100644 --- a/include/babeltrace/component/component-class.h +++ b/include/babeltrace/graph/component-class.h @@ -25,7 +25,7 @@ * SOFTWARE. */ -#include +#include #include #ifdef __cplusplus diff --git a/include/babeltrace/component/component-filter-internal.h b/include/babeltrace/graph/component-filter-internal.h similarity index 95% rename from include/babeltrace/component/component-filter-internal.h rename to include/babeltrace/graph/component-filter-internal.h index 71690cad3..15db1bb6b 100644 --- a/include/babeltrace/component/component-filter-internal.h +++ b/include/babeltrace/graph/component-filter-internal.h @@ -28,8 +28,8 @@ */ #include -#include -#include +#include +#include struct bt_value; diff --git a/include/babeltrace/component/component-filter.h b/include/babeltrace/graph/component-filter.h similarity index 98% rename from include/babeltrace/component/component-filter.h rename to include/babeltrace/graph/component-filter.h index 6f42d4e95..f9e681f39 100644 --- a/include/babeltrace/component/component-filter.h +++ b/include/babeltrace/graph/component-filter.h @@ -28,7 +28,7 @@ */ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component-internal.h b/include/babeltrace/graph/component-internal.h similarity index 96% rename from include/babeltrace/component/component-internal.h rename to include/babeltrace/graph/component-internal.h index 744fb0d31..4c50ffb95 100644 --- a/include/babeltrace/component/component-internal.h +++ b/include/babeltrace/graph/component-internal.h @@ -28,9 +28,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/babeltrace/component/component-sink-internal.h b/include/babeltrace/graph/component-sink-internal.h similarity index 93% rename from include/babeltrace/component/component-sink-internal.h rename to include/babeltrace/graph/component-sink-internal.h index 465fa54b3..84c37f2a2 100644 --- a/include/babeltrace/component/component-sink-internal.h +++ b/include/babeltrace/graph/component-sink-internal.h @@ -28,9 +28,9 @@ */ #include -#include -#include -#include +#include +#include +#include struct bt_value; diff --git a/include/babeltrace/component/component-sink.h b/include/babeltrace/graph/component-sink.h similarity index 97% rename from include/babeltrace/component/component-sink.h rename to include/babeltrace/graph/component-sink.h index 924f8c747..3bbfbb11e 100644 --- a/include/babeltrace/component/component-sink.h +++ b/include/babeltrace/graph/component-sink.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component-source-internal.h b/include/babeltrace/graph/component-source-internal.h similarity index 95% rename from include/babeltrace/component/component-source-internal.h rename to include/babeltrace/graph/component-source-internal.h index 0a68e8a50..fa53bf04c 100644 --- a/include/babeltrace/component/component-source-internal.h +++ b/include/babeltrace/graph/component-source-internal.h @@ -28,8 +28,8 @@ */ #include -#include -#include +#include +#include struct bt_value; diff --git a/include/babeltrace/component/component-source.h b/include/babeltrace/graph/component-source.h similarity index 97% rename from include/babeltrace/component/component-source.h rename to include/babeltrace/graph/component-source.h index 94ebf7071..165ba0d24 100644 --- a/include/babeltrace/component/component-source.h +++ b/include/babeltrace/graph/component-source.h @@ -28,7 +28,7 @@ */ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/component.h b/include/babeltrace/graph/component.h similarity index 97% rename from include/babeltrace/component/component.h rename to include/babeltrace/graph/component.h index 1d884968f..74f38345a 100644 --- a/include/babeltrace/component/component.h +++ b/include/babeltrace/graph/component.h @@ -27,8 +27,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include #include diff --git a/include/babeltrace/component/connection-internal.h b/include/babeltrace/graph/connection-internal.h similarity index 96% rename from include/babeltrace/component/connection-internal.h rename to include/babeltrace/graph/connection-internal.h index 10533aff7..d22c7eea0 100644 --- a/include/babeltrace/component/connection-internal.h +++ b/include/babeltrace/graph/connection-internal.h @@ -27,8 +27,8 @@ * SOFTWARE. */ -#include -#include +#include +#include #include struct bt_graph; diff --git a/include/babeltrace/component/connection.h b/include/babeltrace/graph/connection.h similarity index 100% rename from include/babeltrace/component/connection.h rename to include/babeltrace/graph/connection.h diff --git a/include/babeltrace/component/graph-internal.h b/include/babeltrace/graph/graph-internal.h similarity index 98% rename from include/babeltrace/component/graph-internal.h rename to include/babeltrace/graph/graph-internal.h index 0084628af..e8e9e7f6e 100644 --- a/include/babeltrace/component/graph-internal.h +++ b/include/babeltrace/graph/graph-internal.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #include #include #include diff --git a/include/babeltrace/component/graph.h b/include/babeltrace/graph/graph.h similarity index 99% rename from include/babeltrace/component/graph.h rename to include/babeltrace/graph/graph.h index 2d62484fa..c09279221 100644 --- a/include/babeltrace/component/graph.h +++ b/include/babeltrace/graph/graph.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/notification/eot-internal.h b/include/babeltrace/graph/notification-eot-internal.h similarity index 100% rename from include/babeltrace/component/notification/eot-internal.h rename to include/babeltrace/graph/notification-eot-internal.h diff --git a/include/babeltrace/component/notification/eot.h b/include/babeltrace/graph/notification-eot.h similarity index 100% rename from include/babeltrace/component/notification/eot.h rename to include/babeltrace/graph/notification-eot.h diff --git a/include/babeltrace/component/notification/event-internal.h b/include/babeltrace/graph/notification-event-internal.h similarity index 96% rename from include/babeltrace/component/notification/event-internal.h rename to include/babeltrace/graph/notification-event-internal.h index 3db8ffd3e..939b77111 100644 --- a/include/babeltrace/component/notification/event-internal.h +++ b/include/babeltrace/graph/notification-event-internal.h @@ -28,7 +28,7 @@ */ #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/notification/event.h b/include/babeltrace/graph/notification-event.h similarity index 100% rename from include/babeltrace/component/notification/event.h rename to include/babeltrace/graph/notification-event.h diff --git a/include/babeltrace/component/notification/heap-internal.h b/include/babeltrace/graph/notification-heap-internal.h similarity index 93% rename from include/babeltrace/component/notification/heap-internal.h rename to include/babeltrace/graph/notification-heap-internal.h index 860378013..07e137898 100644 --- a/include/babeltrace/component/notification/heap-internal.h +++ b/include/babeltrace/graph/notification-heap-internal.h @@ -26,8 +26,8 @@ */ #include -#include -#include +#include +#include #include struct bt_notification_heap { diff --git a/include/babeltrace/component/notification/heap.h b/include/babeltrace/graph/notification-heap.h similarity index 98% rename from include/babeltrace/component/notification/heap.h rename to include/babeltrace/graph/notification-heap.h index 3a5ce6d4d..ddadc67eb 100644 --- a/include/babeltrace/component/notification/heap.h +++ b/include/babeltrace/graph/notification-heap.h @@ -28,7 +28,7 @@ #include #include -#include +#include #include /** diff --git a/include/babeltrace/component/notification/notification-internal.h b/include/babeltrace/graph/notification-internal.h similarity index 97% rename from include/babeltrace/component/notification/notification-internal.h rename to include/babeltrace/graph/notification-internal.h index 8f3d055bb..c5a542d77 100644 --- a/include/babeltrace/component/notification/notification-internal.h +++ b/include/babeltrace/graph/notification-internal.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #ifdef __cplusplus diff --git a/include/babeltrace/component/notification/iterator-internal.h b/include/babeltrace/graph/notification-iterator-internal.h similarity index 93% rename from include/babeltrace/component/notification/iterator-internal.h rename to include/babeltrace/graph/notification-iterator-internal.h index b1300f038..d7025669b 100644 --- a/include/babeltrace/component/notification/iterator-internal.h +++ b/include/babeltrace/graph/notification-iterator-internal.h @@ -30,9 +30,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include struct bt_notification_iterator { struct bt_object base; diff --git a/include/babeltrace/component/notification/iterator.h b/include/babeltrace/graph/notification-iterator.h similarity index 100% rename from include/babeltrace/component/notification/iterator.h rename to include/babeltrace/graph/notification-iterator.h diff --git a/include/babeltrace/component/notification/packet-internal.h b/include/babeltrace/graph/notification-packet-internal.h similarity index 96% rename from include/babeltrace/component/notification/packet-internal.h rename to include/babeltrace/graph/notification-packet-internal.h index 3b7836d8a..8d525c55f 100644 --- a/include/babeltrace/component/notification/packet-internal.h +++ b/include/babeltrace/graph/notification-packet-internal.h @@ -28,7 +28,7 @@ */ #include -#include +#include struct bt_notification_packet_begin { struct bt_notification parent; diff --git a/include/babeltrace/component/notification/packet.h b/include/babeltrace/graph/notification-packet.h similarity index 97% rename from include/babeltrace/component/notification/packet.h rename to include/babeltrace/graph/notification-packet.h index d457aa213..a15a96924 100644 --- a/include/babeltrace/component/notification/packet.h +++ b/include/babeltrace/graph/notification-packet.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/notification/schema.h b/include/babeltrace/graph/notification-schema.h similarity index 100% rename from include/babeltrace/component/notification/schema.h rename to include/babeltrace/graph/notification-schema.h diff --git a/include/babeltrace/component/notification/stream-internal.h b/include/babeltrace/graph/notification-stream-internal.h similarity index 95% rename from include/babeltrace/component/notification/stream-internal.h rename to include/babeltrace/graph/notification-stream-internal.h index 83c7e24be..839c220cc 100644 --- a/include/babeltrace/component/notification/stream-internal.h +++ b/include/babeltrace/graph/notification-stream-internal.h @@ -28,7 +28,7 @@ */ #include -#include +#include struct bt_notification_stream_end { struct bt_notification parent; diff --git a/include/babeltrace/component/notification/stream.h b/include/babeltrace/graph/notification-stream.h similarity index 96% rename from include/babeltrace/component/notification/stream.h rename to include/babeltrace/graph/notification-stream.h index c33b2518c..bdcf4c960 100644 --- a/include/babeltrace/component/notification/stream.h +++ b/include/babeltrace/graph/notification-stream.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #include #ifdef __cplusplus diff --git a/include/babeltrace/component/notification/notification.h b/include/babeltrace/graph/notification.h similarity index 100% rename from include/babeltrace/component/notification/notification.h rename to include/babeltrace/graph/notification.h diff --git a/include/babeltrace/component/port-internal.h b/include/babeltrace/graph/port-internal.h similarity index 98% rename from include/babeltrace/component/port-internal.h rename to include/babeltrace/graph/port-internal.h index fb4ff727b..85d9d76bf 100644 --- a/include/babeltrace/component/port-internal.h +++ b/include/babeltrace/graph/port-internal.h @@ -27,7 +27,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/port.h b/include/babeltrace/graph/port.h similarity index 100% rename from include/babeltrace/component/port.h rename to include/babeltrace/graph/port.h diff --git a/include/babeltrace/component/private-component-filter.h b/include/babeltrace/graph/private-component-filter.h similarity index 98% rename from include/babeltrace/component/private-component-filter.h rename to include/babeltrace/graph/private-component-filter.h index e54ccc4a2..4c52d0f40 100644 --- a/include/babeltrace/component/private-component-filter.h +++ b/include/babeltrace/graph/private-component-filter.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/private-component-sink.h b/include/babeltrace/graph/private-component-sink.h similarity index 97% rename from include/babeltrace/component/private-component-sink.h rename to include/babeltrace/graph/private-component-sink.h index f1ba7a71d..52178aebc 100644 --- a/include/babeltrace/component/private-component-sink.h +++ b/include/babeltrace/graph/private-component-sink.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/private-component-source.h b/include/babeltrace/graph/private-component-source.h similarity index 97% rename from include/babeltrace/component/private-component-source.h rename to include/babeltrace/graph/private-component-source.h index b54bbfb81..d74df865f 100644 --- a/include/babeltrace/component/private-component-source.h +++ b/include/babeltrace/graph/private-component-source.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/private-component.h b/include/babeltrace/graph/private-component.h similarity index 97% rename from include/babeltrace/component/private-component.h rename to include/babeltrace/graph/private-component.h index e19b6ff2c..c20919852 100644 --- a/include/babeltrace/component/private-component.h +++ b/include/babeltrace/graph/private-component.h @@ -23,7 +23,7 @@ * SOFTWARE. */ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/component/private-connection.h b/include/babeltrace/graph/private-connection.h similarity index 100% rename from include/babeltrace/component/private-connection.h rename to include/babeltrace/graph/private-connection.h diff --git a/include/babeltrace/component/notification/private-iterator.h b/include/babeltrace/graph/private-notification-iterator.h similarity index 100% rename from include/babeltrace/component/notification/private-iterator.h rename to include/babeltrace/graph/private-notification-iterator.h diff --git a/include/babeltrace/component/private-port.h b/include/babeltrace/graph/private-port.h similarity index 100% rename from include/babeltrace/component/private-port.h rename to include/babeltrace/graph/private-port.h diff --git a/include/babeltrace/plugin/plugin-dev.h b/include/babeltrace/plugin/plugin-dev.h index 5221b974c..4a0dadd23 100644 --- a/include/babeltrace/plugin/plugin-dev.h +++ b/include/babeltrace/plugin/plugin-dev.h @@ -33,10 +33,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/include/babeltrace/plugin/plugin.h b/include/babeltrace/plugin/plugin.h index 0ec3b6c03..1d1725408 100644 --- a/include/babeltrace/plugin/plugin.h +++ b/include/babeltrace/plugin/plugin.h @@ -30,7 +30,7 @@ #include #include -#include +#include #ifdef __cplusplus extern "C" { diff --git a/lib/component/component-class.c b/lib/component/component-class.c index f3cbb4222..bdaa2d37d 100644 --- a/lib/component/component-class.c +++ b/lib/component/component-class.c @@ -27,7 +27,7 @@ */ #include -#include +#include #include #include #include diff --git a/lib/component/component.c b/lib/component/component.c index 834370751..e8c4b5af7 100644 --- a/lib/component/component.c +++ b/lib/component/component.c @@ -26,18 +26,18 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/component/connection.c b/lib/component/connection.c index 587a19565..d57a2cd49 100644 --- a/lib/component/connection.c +++ b/lib/component/connection.c @@ -26,14 +26,14 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/component/filter.c b/lib/component/filter.c index 20c8b6279..dd4401202 100644 --- a/lib/component/filter.c +++ b/lib/component/filter.c @@ -28,11 +28,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include BT_HIDDEN void bt_component_filter_destroy(struct bt_component *component) diff --git a/lib/component/graph.c b/lib/component/graph.c index e16a13142..7f0a4258d 100644 --- a/lib/component/graph.c +++ b/lib/component/graph.c @@ -26,13 +26,13 @@ * SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/lib/component/iterator.c b/lib/component/iterator.c index d72f86499..5e70e7194 100644 --- a/lib/component/iterator.c +++ b/lib/component/iterator.c @@ -28,11 +28,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include static void bt_notification_iterator_destroy(struct bt_object *obj) diff --git a/lib/component/notification/event.c b/lib/component/notification/event.c index 93833a22f..faf963527 100644 --- a/lib/component/notification/event.c +++ b/lib/component/notification/event.c @@ -25,7 +25,7 @@ */ #include -#include +#include static void bt_notification_event_destroy(struct bt_object *obj) diff --git a/lib/component/notification/heap.c b/lib/component/notification/heap.c index b58480fc1..897b680b0 100644 --- a/lib/component/notification/heap.c +++ b/lib/component/notification/heap.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #ifdef DEBUG_HEAP static diff --git a/lib/component/notification/notification.c b/lib/component/notification/notification.c index 3b2ffb3d4..9dc64d796 100644 --- a/lib/component/notification/notification.c +++ b/lib/component/notification/notification.c @@ -24,7 +24,7 @@ * SOFTWARE. */ -#include +#include BT_HIDDEN void bt_notification_init(struct bt_notification *notification, diff --git a/lib/component/notification/packet.c b/lib/component/notification/packet.c index 587b85084..393181dab 100644 --- a/lib/component/notification/packet.c +++ b/lib/component/notification/packet.c @@ -25,7 +25,7 @@ */ #include -#include +#include static void bt_notification_packet_begin_destroy(struct bt_object *obj) diff --git a/lib/component/notification/stream.c b/lib/component/notification/stream.c index 1fd096c62..56062f612 100644 --- a/lib/component/notification/stream.c +++ b/lib/component/notification/stream.c @@ -25,7 +25,7 @@ */ #include -#include +#include static void bt_notification_stream_end_destroy(struct bt_object *obj) diff --git a/lib/component/port.c b/lib/component/port.c index ed4eda054..68b1cb607 100644 --- a/lib/component/port.c +++ b/lib/component/port.c @@ -26,9 +26,9 @@ * SOFTWARE. */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/lib/component/sink.c b/lib/component/sink.c index 91fa23533..1f01d3191 100644 --- a/lib/component/sink.c +++ b/lib/component/sink.c @@ -28,9 +28,9 @@ #include #include -#include -#include -#include +#include +#include +#include BT_HIDDEN enum bt_component_status bt_component_sink_validate( diff --git a/lib/component/source.c b/lib/component/source.c index bddd2f6a2..7d43e34c8 100644 --- a/lib/component/source.c +++ b/lib/component/source.c @@ -28,11 +28,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include BT_HIDDEN enum bt_component_status bt_component_source_validate( diff --git a/lib/plugin/plugin-so.c b/lib/plugin/plugin-so.c index 4fc939e5b..bf6f9425d 100644 --- a/lib/plugin/plugin-so.c +++ b/lib/plugin/plugin-so.c @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c index 92de35798..c4b6f68da 100644 --- a/plugins/ctf/common/notif-iter/notif-iter.c +++ b/plugins/ctf/common/notif-iter/notif-iter.c @@ -38,9 +38,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/plugins/ctf/fs/data-stream.c b/plugins/ctf/fs/data-stream.c index 905e26a94..ceeefdf5c 100644 --- a/plugins/ctf/fs/data-stream.c +++ b/plugins/ctf/fs/data-stream.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "file.h" #include "metadata.h" #include "../common/notif-iter/notif-iter.h" diff --git a/plugins/ctf/fs/fs.c b/plugins/ctf/fs/fs.c index f559a7ba4..9a38834a7 100644 --- a/plugins/ctf/fs/fs.c +++ b/plugins/ctf/fs/fs.c @@ -28,14 +28,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/ctf/fs/fs.h b/plugins/ctf/fs/fs.h index 037d47eeb..43977d286 100644 --- a/plugins/ctf/fs/fs.h +++ b/plugins/ctf/fs/fs.h @@ -29,7 +29,7 @@ */ #include -#include +#include #include "data-stream.h" #define CTF_FS_COMPONENT_DESCRIPTION \ diff --git a/plugins/ctf/lttng-live/lttng-live-internal.h b/plugins/ctf/lttng-live/lttng-live-internal.h index a99f170d3..e2f99b476 100644 --- a/plugins/ctf/lttng-live/lttng-live-internal.h +++ b/plugins/ctf/lttng-live/lttng-live-internal.h @@ -28,7 +28,7 @@ */ #include -#include +#include #define LTTNG_LIVE_COMPONENT_DESCRIPTION "Component implementing an LTTng-live client." diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c index 0c8b3c2b6..2d996abb2 100644 --- a/plugins/ctf/lttng-live/lttng-live.c +++ b/plugins/ctf/lttng-live/lttng-live.c @@ -27,7 +27,7 @@ */ #include "lttng-live-internal.h" -#include +#include #include BT_HIDDEN diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c index 6fa10f384..5ce38d894 100644 --- a/plugins/muxer/muxer.c +++ b/plugins/muxer/muxer.c @@ -27,11 +27,11 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include "muxer.h" diff --git a/plugins/text/text.c b/plugins/text/text.c index 045673686..66b476e92 100644 --- a/plugins/text/text.c +++ b/plugins/text/text.c @@ -28,16 +28,16 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/text/text.h b/plugins/text/text.h index c819365f8..956527607 100644 --- a/plugins/text/text.h +++ b/plugins/text/text.h @@ -29,7 +29,7 @@ #include #include -#include +#include enum text_default { TEXT_DEFAULT_UNSET, diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c index 44d191c30..df4b5a3b9 100644 --- a/plugins/utils/dummy/dummy.c +++ b/plugins/utils/dummy/dummy.c @@ -21,14 +21,14 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include "dummy.h" diff --git a/plugins/utils/dummy/dummy.h b/plugins/utils/dummy/dummy.h index 31a84e83b..77e25111c 100644 --- a/plugins/utils/dummy/dummy.h +++ b/plugins/utils/dummy/dummy.h @@ -24,9 +24,9 @@ */ #include -#include -#include -#include +#include +#include +#include struct dummy { GPtrArray *iterators; diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c index 9d15ba1da..2d487f19e 100644 --- a/plugins/utils/trimmer/iterator.c +++ b/plugins/utils/trimmer/iterator.c @@ -28,17 +28,17 @@ #include "trimmer.h" #include "iterator.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/utils/trimmer/iterator.h b/plugins/utils/trimmer/iterator.h index 3fe3dc4b7..3fd99a729 100644 --- a/plugins/utils/trimmer/iterator.h +++ b/plugins/utils/trimmer/iterator.h @@ -28,10 +28,10 @@ */ #include "trimmer.h" -#include -#include -#include -#include +#include +#include +#include +#include struct trimmer_iterator { /* Input iterator associated with this output iterator. */ diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c index ec34c973f..d3f907e16 100644 --- a/plugins/utils/trimmer/trimmer.c +++ b/plugins/utils/trimmer/trimmer.c @@ -27,13 +27,13 @@ */ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include "trimmer.h" #include "iterator.h" diff --git a/plugins/utils/trimmer/trimmer.h b/plugins/utils/trimmer/trimmer.h index e4ee88246..165d7c8b3 100644 --- a/plugins/utils/trimmer/trimmer.h +++ b/plugins/utils/trimmer/trimmer.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #define NSEC_PER_SEC 1000000000LL diff --git a/plugins/writer/writer.c b/plugins/writer/writer.c index a7f4024be..8f1d2fc19 100644 --- a/plugins/writer/writer.c +++ b/plugins/writer/writer.c @@ -28,16 +28,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/plugins/writer/writer.h b/plugins/writer/writer.h index 12e2b65fb..6c6fed35f 100644 --- a/plugins/writer/writer.h +++ b/plugins/writer/writer.h @@ -29,7 +29,7 @@ #include #include -#include +#include #include struct writer_component { diff --git a/tests/lib/test-plugin-plugins/sfs.c b/tests/lib/test-plugin-plugins/sfs.c index 93fbb0236..735bf2ae1 100644 --- a/tests/lib/test-plugin-plugins/sfs.c +++ b/tests/lib/test-plugin-plugins/sfs.c @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include diff --git a/tests/lib/test_bt_notification_heap.c b/tests/lib/test_bt_notification_heap.c index bacce9f6c..a8c1a42b0 100644 --- a/tests/lib/test_bt_notification_heap.c +++ b/tests/lib/test_bt_notification_heap.c @@ -24,9 +24,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #define NR_TESTS 7 -- 2.34.1