From: Jérémie Galarneau Date: Mon, 10 Oct 2016 02:46:35 +0000 (-0400) Subject: Rename correlator to muxer X-Git-Tag: v2.0.0-pre1~756 X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=0cb31e39840f9a8be916b0ad6447559d1a1b800e;p=babeltrace.git Rename correlator to muxer Signed-off-by: Jérémie Galarneau --- diff --git a/configure.ac b/configure.ac index ac7e4393..afc696d9 100644 --- a/configure.ac +++ b/configure.ac @@ -383,7 +383,7 @@ AC_CONFIG_FILES([ plugins/ctf/common/notif-iter/Makefile plugins/ctf/fs/Makefile plugins/ctf/lttng-live/Makefile - plugins/correlator/Makefile + plugins/muxer/Makefile plugins/text/Makefile babeltrace.pc babeltrace-ctf.pc diff --git a/plugins/Makefile.am b/plugins/Makefile.am index eee13497..6575b0be 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1 +1 @@ -SUBDIRS = ctf text correlator +SUBDIRS = ctf text muxer diff --git a/plugins/correlator/Makefile.am b/plugins/correlator/Makefile.am deleted file mode 100644 index 43e26164..00000000 --- a/plugins/correlator/Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include - -SUBDIRS = . - -plugindir = "$(PLUGINSDIR)" -plugin_LTLIBRARIES = libbabeltrace-plugin-correlator.la - -libbabeltrace_plugin_correlator_la_SOURCES = \ - correlator.h correlator.c - -libbabeltrace_plugin_correlator_la_LDFLAGS = \ - -version-info $(BABELTRACE_LIBRARY_VERSION) - -libbabeltrace_plugin_ctf_text_la_LIBADD = \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/formats/ctf/libbabeltrace-ctf.la diff --git a/plugins/correlator/correlator.c b/plugins/correlator/correlator.c deleted file mode 100644 index c0c9dc72..00000000 --- a/plugins/correlator/correlator.c +++ /dev/null @@ -1,102 +0,0 @@ -/* - * correlator.c - * - * Babeltrace Trace Correlator - * - * Copyright 2016 Jérémie Galarneau - * - * Author: Jérémie Galarneau - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include -#include -#include -#include -#include -#include -#include "correlator.h" - -static -void destroy_correlator_data(struct correlator *correlator) -{ - g_free(correlator); -} - -static -struct correlator *create_correlator(void) -{ - struct correlator *correlator; - - correlator = g_new0(struct correlator, 1); - if (!correlator) { - goto end; - } -end: - return correlator; -} - -static -void destroy_correlator(struct bt_component *component) -{ - void *data = bt_component_get_private_data(component); - - destroy_correlator_data(data); -} - -enum bt_component_status correlator_component_init( - struct bt_component *component, struct bt_value *params) -{ - enum bt_component_status ret; - struct correlator *correlator = create_correlator(); - - if (!correlator) { - ret = BT_COMPONENT_STATUS_NOMEM; - goto end; - } - - ret = bt_component_set_destroy_cb(component, - destroy_correlator); - if (ret != BT_COMPONENT_STATUS_OK) { - goto error; - } - - ret = bt_component_set_private_data(component, correlator); - if (ret != BT_COMPONENT_STATUS_OK) { - goto error; - } -end: - return ret; -error: - destroy_correlator_data(correlator); - return ret; -} - -/* Initialize plug-in entry points. */ -BT_PLUGIN_NAME("correlator"); -BT_PLUGIN_DESCRIPTION("Babeltrace Trace Correlator Plug-In."); -BT_PLUGIN_AUTHOR("Jérémie Galarneau"); -BT_PLUGIN_LICENSE("MIT"); - -BT_PLUGIN_COMPONENT_CLASSES_BEGIN -BT_PLUGIN_FILTER_COMPONENT_CLASS_ENTRY("correlator", - "Time-correlate multiple traces.", - correlator_component_init) -BT_PLUGIN_COMPONENT_CLASSES_END diff --git a/plugins/muxer/Makefile.am b/plugins/muxer/Makefile.am new file mode 100644 index 00000000..84fce07b --- /dev/null +++ b/plugins/muxer/Makefile.am @@ -0,0 +1,16 @@ +AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include + +SUBDIRS = . + +plugindir = "$(PLUGINSDIR)" +plugin_LTLIBRARIES = libbabeltrace-plugin-muxer.la + +libbabeltrace_plugin_muxer_la_SOURCES = \ + muxer.h muxer.c + +libbabeltrace_plugin_muxer_la_LDFLAGS = \ + -version-info $(BABELTRACE_LIBRARY_VERSION) + +libbabeltrace_plugin_ctf_text_la_LIBADD = \ + $(top_builddir)/lib/libbabeltrace.la \ + $(top_builddir)/formats/ctf/libbabeltrace-ctf.la diff --git a/plugins/muxer/muxer.c b/plugins/muxer/muxer.c new file mode 100644 index 00000000..ba78cfb0 --- /dev/null +++ b/plugins/muxer/muxer.c @@ -0,0 +1,102 @@ +/* + * muxer.c + * + * Babeltrace Trace Muxer + * + * Copyright 2016 Jérémie Galarneau + * + * Author: Jérémie Galarneau + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include +#include +#include "muxer.h" + +static +void destroy_muxer_data(struct muxer *muxer) +{ + g_free(muxer); +} + +static +struct muxer *create_muxer(void) +{ + struct muxer *muxer; + + muxer = g_new0(struct muxer, 1); + if (!muxer) { + goto end; + } +end: + return muxer; +} + +static +void destroy_muxer(struct bt_component *component) +{ + void *data = bt_component_get_private_data(component); + + destroy_muxer_data(data); +} + +enum bt_component_status muxer_component_init( + struct bt_component *component, struct bt_value *params) +{ + enum bt_component_status ret; + struct muxer *muxer = create_muxer(); + + if (!muxer) { + ret = BT_COMPONENT_STATUS_NOMEM; + goto end; + } + + ret = bt_component_set_destroy_cb(component, + destroy_muxer); + if (ret != BT_COMPONENT_STATUS_OK) { + goto error; + } + + ret = bt_component_set_private_data(component, muxer); + if (ret != BT_COMPONENT_STATUS_OK) { + goto error; + } +end: + return ret; +error: + destroy_muxer_data(muxer); + return ret; +} + +/* Initialize plug-in entry points. */ +BT_PLUGIN_NAME("muxer"); +BT_PLUGIN_DESCRIPTION("Babeltrace Trace Muxer Plug-In."); +BT_PLUGIN_AUTHOR("Jérémie Galarneau"); +BT_PLUGIN_LICENSE("MIT"); + +BT_PLUGIN_COMPONENT_CLASSES_BEGIN +BT_PLUGIN_FILTER_COMPONENT_CLASS_ENTRY("muxer", + "Time-correlate multiple traces.", + muxer_component_init) +BT_PLUGIN_COMPONENT_CLASSES_END diff --git a/plugins/muxer/muxer.h b/plugins/muxer/muxer.h new file mode 100644 index 00000000..77937523 --- /dev/null +++ b/plugins/muxer/muxer.h @@ -0,0 +1,38 @@ +#ifndef BABELTRACE_PLUGIN_MUXER_H +#define BABELTRACE_PLUGIN_MUXER_H + +/* + * BabelTrace - Trace Muxer Plug-in + * + * Copyright 2016 Jérémie Galarneau + * + * Author: Jérémie Galarneau + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include +#include +#include + +struct muxer { + GHashTable *trace_clocks; +}; + +#endif /* BABELTRACE_PLUGIN_MUXER_H */