From 456a4476cac0e5b5e5bec47a07243faee091eb72 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Fri, 5 May 2017 13:12:29 -0400 Subject: [PATCH] Rename debug_info.debug_info -> lttng-utils.debug-info MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- configure.ac | 2 +- plugins/Makefile.am | 2 +- .../{debug-info => lttng-utils}/Makefile.am | 0 .../{debug-info => lttng-utils}/bin-info.c | 0 .../{debug-info => lttng-utils}/bin-info.h | 0 plugins/{debug-info => lttng-utils}/copy.c | 0 plugins/{debug-info => lttng-utils}/copy.h | 0 plugins/{debug-info => lttng-utils}/crc32.c | 0 plugins/{debug-info => lttng-utils}/crc32.h | 0 .../{debug-info => lttng-utils}/debug-info.c | 0 .../{debug-info => lttng-utils}/debug-info.h | 0 plugins/{debug-info => lttng-utils}/dwarf.c | 0 plugins/{debug-info => lttng-utils}/dwarf.h | 0 plugins/{debug-info => lttng-utils}/plugin.c | 44 +++++++------------ plugins/{debug-info => lttng-utils}/utils.c | 0 plugins/{debug-info => lttng-utils}/utils.h | 0 16 files changed, 19 insertions(+), 29 deletions(-) rename plugins/{debug-info => lttng-utils}/Makefile.am (100%) rename plugins/{debug-info => lttng-utils}/bin-info.c (100%) rename plugins/{debug-info => lttng-utils}/bin-info.h (100%) rename plugins/{debug-info => lttng-utils}/copy.c (100%) rename plugins/{debug-info => lttng-utils}/copy.h (100%) rename plugins/{debug-info => lttng-utils}/crc32.c (100%) rename plugins/{debug-info => lttng-utils}/crc32.h (100%) rename plugins/{debug-info => lttng-utils}/debug-info.c (100%) rename plugins/{debug-info => lttng-utils}/debug-info.h (100%) rename plugins/{debug-info => lttng-utils}/dwarf.c (100%) rename plugins/{debug-info => lttng-utils}/dwarf.h (100%) rename plugins/{debug-info => lttng-utils}/plugin.c (92%) rename plugins/{debug-info => lttng-utils}/utils.c (100%) rename plugins/{debug-info => lttng-utils}/utils.h (100%) diff --git a/configure.ac b/configure.ac index e937d25d..8890f4ab 100644 --- a/configure.ac +++ b/configure.ac @@ -507,7 +507,7 @@ AC_CONFIG_FILES([ plugins/utils/muxer/Makefile python-plugin-provider/Makefile plugins/libctfcopytrace/Makefile - plugins/debug-info/Makefile + plugins/lttng-utils/Makefile babeltrace.pc babeltrace-ctf.pc ]) diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 9e4ff087..c6249c4d 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = libctfcopytrace ctf text utils writer if ENABLE_DEBUG_INFO -SUBDIRS += debug-info +SUBDIRS += lttng-utils endif noinst_HEADERS = plugins-common.h diff --git a/plugins/debug-info/Makefile.am b/plugins/lttng-utils/Makefile.am similarity index 100% rename from plugins/debug-info/Makefile.am rename to plugins/lttng-utils/Makefile.am diff --git a/plugins/debug-info/bin-info.c b/plugins/lttng-utils/bin-info.c similarity index 100% rename from plugins/debug-info/bin-info.c rename to plugins/lttng-utils/bin-info.c diff --git a/plugins/debug-info/bin-info.h b/plugins/lttng-utils/bin-info.h similarity index 100% rename from plugins/debug-info/bin-info.h rename to plugins/lttng-utils/bin-info.h diff --git a/plugins/debug-info/copy.c b/plugins/lttng-utils/copy.c similarity index 100% rename from plugins/debug-info/copy.c rename to plugins/lttng-utils/copy.c diff --git a/plugins/debug-info/copy.h b/plugins/lttng-utils/copy.h similarity index 100% rename from plugins/debug-info/copy.h rename to plugins/lttng-utils/copy.h diff --git a/plugins/debug-info/crc32.c b/plugins/lttng-utils/crc32.c similarity index 100% rename from plugins/debug-info/crc32.c rename to plugins/lttng-utils/crc32.c diff --git a/plugins/debug-info/crc32.h b/plugins/lttng-utils/crc32.h similarity index 100% rename from plugins/debug-info/crc32.h rename to plugins/lttng-utils/crc32.h diff --git a/plugins/debug-info/debug-info.c b/plugins/lttng-utils/debug-info.c similarity index 100% rename from plugins/debug-info/debug-info.c rename to plugins/lttng-utils/debug-info.c diff --git a/plugins/debug-info/debug-info.h b/plugins/lttng-utils/debug-info.h similarity index 100% rename from plugins/debug-info/debug-info.h rename to plugins/lttng-utils/debug-info.h diff --git a/plugins/debug-info/dwarf.c b/plugins/lttng-utils/dwarf.c similarity index 100% rename from plugins/debug-info/dwarf.c rename to plugins/lttng-utils/dwarf.c diff --git a/plugins/debug-info/dwarf.h b/plugins/lttng-utils/dwarf.h similarity index 100% rename from plugins/debug-info/dwarf.h rename to plugins/lttng-utils/dwarf.h diff --git a/plugins/debug-info/plugin.c b/plugins/lttng-utils/plugin.c similarity index 92% rename from plugins/debug-info/plugin.c rename to plugins/lttng-utils/plugin.c index 85b12a67..e7cffbd1 100644 --- a/plugins/debug-info/plugin.c +++ b/plugins/lttng-utils/plugin.c @@ -287,17 +287,6 @@ end: } */ -static -enum bt_notification_iterator_status debug_info_iterator_seek_time( - struct bt_private_notification_iterator *iterator, int64_t time) -{ - enum bt_notification_iterator_status ret; - - ret = BT_NOTIFICATION_ITERATOR_STATUS_OK; - - return ret; -} - static enum bt_notification_iterator_status debug_info_iterator_init( struct bt_private_notification_iterator *iterator, @@ -474,19 +463,20 @@ error: } /* Initialize plug-in entry points. */ -BT_PLUGIN(debug_info); -BT_PLUGIN_DESCRIPTION("Babeltrace Debug Informations Plug-In."); -BT_PLUGIN_AUTHOR("Julien Desfossez"); -BT_PLUGIN_LICENSE("MIT"); - -BT_PLUGIN_FILTER_COMPONENT_CLASS(debug_info, debug_info_iterator_next); -BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION(debug_info, - "Add the debug information to events if possible."); -BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD(debug_info, debug_info_component_init); -BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD(debug_info, destroy_debug_info_component); -BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD(debug_info, - debug_info_iterator_init); -BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD(debug_info, - debug_info_iterator_destroy); -BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_SEEK_TIME_METHOD(debug_info, - debug_info_iterator_seek_time); +BT_PLUGIN_WITH_ID(lttng_utils, "lttng-utils"); +BT_PLUGIN_DESCRIPTION_WITH_ID(lttng_utils, "LTTng utilities"); +BT_PLUGIN_AUTHOR_WITH_ID(lttng_utils, "Julien Desfossez"); +BT_PLUGIN_LICENSE_WITH_ID(lttng_utils, "MIT"); + +BT_PLUGIN_FILTER_COMPONENT_CLASS_WITH_ID(lttng_utils, debug_info, "debug-info", + debug_info_iterator_next); +BT_PLUGIN_FILTER_COMPONENT_CLASS_DESCRIPTION_WITH_ID(lttng_utils, debug_info, + "Augment compatible events with debugging information."); +BT_PLUGIN_FILTER_COMPONENT_CLASS_INIT_METHOD_WITH_ID(lttng_utils, + debug_info, debug_info_component_init); +BT_PLUGIN_FILTER_COMPONENT_CLASS_FINALIZE_METHOD_WITH_ID(lttng_utils, + debug_info, destroy_debug_info_component); +BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_INIT_METHOD_WITH_ID( + lttng_utils, debug_info, debug_info_iterator_init); +BT_PLUGIN_FILTER_COMPONENT_CLASS_NOTIFICATION_ITERATOR_FINALIZE_METHOD_WITH_ID( + lttng_utils, debug_info, debug_info_iterator_destroy); diff --git a/plugins/debug-info/utils.c b/plugins/lttng-utils/utils.c similarity index 100% rename from plugins/debug-info/utils.c rename to plugins/lttng-utils/utils.c diff --git a/plugins/debug-info/utils.h b/plugins/lttng-utils/utils.h similarity index 100% rename from plugins/debug-info/utils.h rename to plugins/lttng-utils/utils.h -- 2.34.1