projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort includes in C++ files
[babeltrace.git]
/
src
/
plugins
/
ctf
/
lttng-live
/
lttng-live.cpp
diff --git
a/src/plugins/ctf/lttng-live/lttng-live.cpp
b/src/plugins/ctf/lttng-live/lttng-live.cpp
index 8b4fbb416c1cb8ba6d963a368806ceea5d5872b4..5f33ab225f1ab4169379d4781cc80751e79db4c8 100644
(file)
--- a/
src/plugins/ctf/lttng-live/lttng-live.cpp
+++ b/
src/plugins/ctf/lttng-live/lttng-live.cpp
@@
-8,28
+8,27
@@
* Babeltrace CTF LTTng-live Client Component
*/
* Babeltrace CTF LTTng-live Client Component
*/
-#define BT_COMP_LOG_SELF_COMP self_comp
-#define BT_LOG_OUTPUT_LEVEL log_level
-#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
-#include "logging/comp-logging.h"
-
+#include <glib.h>
#include <inttypes.h>
#include <stdbool.h>
#include <unistd.h>
#include <inttypes.h>
#include <stdbool.h>
#include <unistd.h>
-#include <glib.h>
+#include <babeltrace2/babeltrace.h>
+
+#define BT_COMP_LOG_SELF_COMP self_comp
+#define BT_LOG_OUTPUT_LEVEL log_level
+#define BT_LOG_TAG "PLUGIN/SRC.CTF.LTTNG-LIVE"
+#include "logging/comp-logging.h"
#include "common/assert.h"
#include "common/assert.h"
-#include <babeltrace2/babeltrace.h>
#include "compat/compiler.h"
#include "compat/compiler.h"
-#include <babeltrace2/types.h>
#include "plugins/common/muxing/muxing.h"
#include "plugins/common/param-validation/param-validation.h"
#include "data-stream.hpp"
#include "plugins/common/muxing/muxing.h"
#include "plugins/common/param-validation/param-validation.h"
#include "data-stream.hpp"
-#include "metadata.hpp"
#include "lttng-live.hpp"
#include "lttng-live.hpp"
+#include "metadata.hpp"
#define MAX_QUERY_SIZE (256 * 1024)
#define URL_PARAM "url"
#define MAX_QUERY_SIZE (256 * 1024)
#define URL_PARAM "url"
@@
-108,7
+107,6
@@
void lttng_live_stream_iterator_set_state(struct lttng_live_stream_iterator *str
live_stream_iter->current_inactivity_ts); \
} while (0);
live_stream_iter->current_inactivity_ts); \
} while (0);
-BT_HIDDEN
bool lttng_live_graph_is_canceled(struct lttng_live_msg_iter *msg_iter)
{
bool ret;
bool lttng_live_graph_is_canceled(struct lttng_live_msg_iter *msg_iter)
{
bool ret;
@@
-195,7
+193,6
@@
end:
return trace;
}
return trace;
}
-BT_HIDDEN
struct lttng_live_trace *
lttng_live_session_borrow_or_create_trace_by_id(struct lttng_live_session *session,
uint64_t trace_id)
struct lttng_live_trace *
lttng_live_session_borrow_or_create_trace_by_id(struct lttng_live_session *session,
uint64_t trace_id)
@@
-214,7
+211,6
@@
end:
return trace;
}
return trace;
}
-BT_HIDDEN
int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter, uint64_t session_id,
const char *hostname, const char *session_name)
{
int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter, uint64_t session_id,
const char *hostname, const char *session_name)
{
@@
-321,7
+317,6
@@
end:
return;
}
return;
}
-BT_HIDDEN
void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter)
{
struct lttng_live_msg_iter *lttng_live_msg_iter;
void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter)
{
struct lttng_live_msg_iter *lttng_live_msg_iter;
@@
-724,11
+719,9
@@
end:
return ret;
}
return ret;
}
-static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
- struct lttng_live_msg_iter *lttng_live_msg_iter,
+static int live_get_msg_ts_ns(struct lttng_live_msg_iter *lttng_live_msg_iter,
const bt_message *msg, int64_t last_msg_ts_ns, int64_t *ts_ns)
{
const bt_message *msg, int64_t last_msg_ts_ns, int64_t *ts_ns)
{
- const bt_clock_class *clock_class = NULL;
const bt_clock_snapshot *clock_snapshot = NULL;
int ret = 0;
bt_logging_level log_level = lttng_live_msg_iter->log_level;
const bt_clock_snapshot *clock_snapshot = NULL;
int ret = 0;
bt_logging_level log_level = lttng_live_msg_iter->log_level;
@@
-743,37
+736,19
@@
static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
switch (bt_message_get_type(msg)) {
case BT_MESSAGE_TYPE_EVENT:
switch (bt_message_get_type(msg)) {
case BT_MESSAGE_TYPE_EVENT:
- clock_class = bt_message_event_borrow_stream_class_default_clock_class_const(msg);
- BT_ASSERT_DBG(clock_class);
-
clock_snapshot = bt_message_event_borrow_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_PACKET_BEGINNING:
clock_snapshot = bt_message_event_borrow_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_PACKET_BEGINNING:
- clock_class =
- bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(msg);
- BT_ASSERT(clock_class);
-
clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_PACKET_END:
clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_PACKET_END:
- clock_class = bt_message_packet_end_borrow_stream_class_default_clock_class_const(msg);
- BT_ASSERT(clock_class);
-
clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
- clock_class =
- bt_message_discarded_events_borrow_stream_class_default_clock_class_const(msg);
- BT_ASSERT(clock_class);
-
clock_snapshot =
bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
clock_snapshot =
bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
- clock_class =
- bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(msg);
- BT_ASSERT(clock_class);
-
clock_snapshot =
bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(msg);
break;
clock_snapshot =
bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(msg);
break;
@@
-787,9
+762,6
@@
static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter,
goto end;
}
goto end;
}
- clock_class = bt_clock_snapshot_borrow_clock_class_const(clock_snapshot);
- BT_ASSERT_DBG(clock_class);
-
ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns);
if (ret) {
BT_COMP_LOGE_APPEND_CAUSE(self_comp,
ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns);
if (ret) {
BT_COMP_LOGE_APPEND_CAUSE(self_comp,
@@
-1308,8
+1280,8
@@
next_stream_iterator_for_trace(struct lttng_live_msg_iter *lttng_live_msg_iter,
* Get the timestamp in nanoseconds from origin of this
* messsage.
*/
* Get the timestamp in nanoseconds from origin of this
* messsage.
*/
- live_get_msg_ts_ns(
stream_iter, lttng_live_msg_iter, msg
,
-
lttng_live_msg_iter->last_msg_ts_ns,
&curr_msg_ts_ns);
+ live_get_msg_ts_ns(
lttng_live_msg_iter, msg, lttng_live_msg_iter->last_msg_ts_ns
,
+ &curr_msg_ts_ns);
/*
* Check if the message of the current live stream
/*
* Check if the message of the current live stream
@@
-1529,7
+1501,6
@@
static inline void put_messages(bt_message_array_const msgs, uint64_t count)
}
}
}
}
-BT_HIDDEN
bt_message_iterator_class_next_method_status
lttng_live_msg_iter_next(bt_self_message_iterator *self_msg_it, bt_message_array_const msgs,
uint64_t capacity, uint64_t *count)
bt_message_iterator_class_next_method_status
lttng_live_msg_iter_next(bt_self_message_iterator *self_msg_it, bt_message_array_const msgs,
uint64_t capacity, uint64_t *count)
@@
-1806,11
+1777,9
@@
end:
return lttng_live_msg_iter;
}
return lttng_live_msg_iter;
}
-BT_HIDDEN
bt_message_iterator_class_initialize_method_status
lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
bt_message_iterator_class_initialize_method_status
lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it,
- bt_self_message_iterator_configuration *config,
- bt_self_component_port_output *self_port)
+ bt_self_message_iterator_configuration *, bt_self_component_port_output *)
{
bt_message_iterator_class_initialize_method_status status;
struct lttng_live_component *lttng_live;
{
bt_message_iterator_class_initialize_method_status status;
struct lttng_live_component *lttng_live;
@@
-1986,7
+1955,7
@@
lttng_live_query_support_info(const bt_value *params, const bt_value **result,
const bt_value *input_type_value;
const bt_value *input_value;
double weight = 0;
const bt_value *input_type_value;
const bt_value *input_value;
double weight = 0;
- struct bt_common_lttng_live_url_parts parts = {
0
};
+ struct bt_common_lttng_live_url_parts parts = {};
/* Used by the logging macros */
__attribute__((unused)) bt_self_component *self_comp = NULL;
/* Used by the logging macros */
__attribute__((unused)) bt_self_component *self_comp = NULL;
@@
-2050,7
+2019,6
@@
end:
return status;
}
return status;
}
-BT_HIDDEN
bt_component_class_query_method_status lttng_live_query(bt_self_component_class_source *comp_class,
bt_private_query_executor *priv_query_exec,
const char *object, const bt_value *params,
bt_component_class_query_method_status lttng_live_query(bt_self_component_class_source *comp_class,
bt_private_query_executor *priv_query_exec,
const char *object, const bt_value *params,
@@
-2089,7
+2057,6
@@
static void lttng_live_component_destroy_data(struct lttng_live_component *lttng
g_free(lttng_live);
}
g_free(lttng_live);
}
-BT_HIDDEN
void lttng_live_component_finalize(bt_self_component_source *component)
{
lttng_live_component *data = (lttng_live_component *) bt_self_component_get_data(
void lttng_live_component_finalize(bt_self_component_source *component)
{
lttng_live_component *data = (lttng_live_component *) bt_self_component_get_data(
@@
-2201,11
+2168,9
@@
end:
return status;
}
return status;
}
-BT_HIDDEN
bt_component_class_initialize_method_status
lttng_live_component_init(bt_self_component_source *self_comp_src,
bt_component_class_initialize_method_status
lttng_live_component_init(bt_self_component_source *self_comp_src,
- bt_self_component_source_configuration *config, const bt_value *params,
- __attribute__((unused)) void *init_method_data)
+ bt_self_component_source_configuration *, const bt_value *params, void *)
{
struct lttng_live_component *lttng_live;
bt_component_class_initialize_method_status ret;
{
struct lttng_live_component *lttng_live;
bt_component_class_initialize_method_status ret;
This page took
0.027584 seconds
and
4
git commands to generate.