Cleanup: move callback init to static initialization

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/lttng-ring-buffer-client.h b/lttng-ring-buffer-client.h
index c97793d2061a784b9ea68014a0c12cc9349c8bf6..c186c60b4a3eb62f68fef575cd2caf07860eeca0 100644 (file)
--- a/lttng-ring-buffer-client.h
+++ b/lttng-ring-buffer-client.h
@@ -493,14 +493,6 @@ struct channel *_channel_create(const char *name,
                                unsigned int switch_timer_interval,
                                unsigned int read_timer_interval)
 {
-       lttng_chan->ops->timestamp_begin = client_timestamp_begin;
-       lttng_chan->ops->timestamp_end = client_timestamp_end;
-       lttng_chan->ops->events_discarded = client_events_discarded;
-       lttng_chan->ops->content_size = client_content_size;
-       lttng_chan->ops->packet_size = client_packet_size;
-       lttng_chan->ops->stream_id = client_stream_id;
-       lttng_chan->ops->current_timestamp = client_current_timestamp;
-
        return channel_create(&client_config, name, lttng_chan, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
                              read_timer_interval);
@@ -655,6 +647,13 @@ static struct lttng_transport lttng_relay_transport = {
                .get_hp_wait_queue = lttng_get_hp_wait_queue,
                .is_finalized = lttng_is_finalized,
                .is_disabled = lttng_is_disabled,
+               .timestamp_begin = client_timestamp_begin,
+               .timestamp_end = client_timestamp_end,
+               .events_discarded = client_events_discarded,
+               .content_size = client_content_size,
+               .packet_size = client_packet_size,
+               .stream_id = client_stream_id,
+               .current_timestamp = client_current_timestamp,
        },
 };
 

diff --git a/lttng-ring-buffer-metadata-client.h b/lttng-ring-buffer-metadata-client.h
index bea482b9a961316460800bb9d4294ef2ea8c7b45..bb91f4d4aaa4a049af5adf40a483f43afefb15bb 100644 (file)
--- a/lttng-ring-buffer-metadata-client.h
+++ b/lttng-ring-buffer-metadata-client.h
@@ -223,14 +223,6 @@ struct channel *_channel_create(const char *name,
                                unsigned int switch_timer_interval,
                                unsigned int read_timer_interval)
 {
-       lttng_chan->ops->timestamp_begin = client_timestamp_begin;
-       lttng_chan->ops->timestamp_end = client_timestamp_end;
-       lttng_chan->ops->events_discarded = client_events_discarded;
-       lttng_chan->ops->content_size = client_content_size;
-       lttng_chan->ops->packet_size = client_packet_size;
-       lttng_chan->ops->stream_id = client_stream_id;
-       lttng_chan->ops->current_timestamp = client_current_timestamp;
-
        return channel_create(&client_config, name, lttng_chan, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
                              read_timer_interval);
@@ -369,6 +361,13 @@ static struct lttng_transport lttng_relay_transport = {
                .get_hp_wait_queue = lttng_get_hp_wait_queue,
                .is_finalized = lttng_is_finalized,
                .is_disabled = lttng_is_disabled,
+               .timestamp_begin = client_timestamp_begin,
+               .timestamp_end = client_timestamp_end,
+               .events_discarded = client_events_discarded,
+               .content_size = client_content_size,
+               .packet_size = client_packet_size,
+               .stream_id = client_stream_id,
+               .current_timestamp = client_current_timestamp,
        },
 };