/*
- * lttng-ring-buffer-client.h
- *
- * LTTng lib ring buffer client template.
+ * SPDX-License-Identifier: LGPL-2.1-only
*
* Copyright (C) 2010-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * LTTng lib ring buffer client template.
*/
+#include <stddef.h>
#include <stdint.h>
-#include <lttng/ust-events.h>
-#include "lttng/bitfield.h"
+
+#include <ust-events-internal.h>
+#include "ust-bitfield.h"
+#include "ust-compat.h"
#include "clock.h"
+#include "context-internal.h"
#include "lttng-tracer.h"
#include "../libringbuffer/frontend_types.h"
struct lttng_client_ctx *client_ctx)
{
struct lttng_channel *lttng_chan = channel_get_private(chan);
- struct lttng_event *event = ctx->priv;
+ struct lttng_ust_event_recorder *event_recorder = ctx->priv;
struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
size_t orig_offset = offset;
size_t padding;
/* Pre 2.8 probe ABI. */
offset += ctx_get_aligned_size(offset, lttng_chan->ctx,
client_ctx->packet_context_len);
- offset += ctx_get_aligned_size(offset, event->ctx,
+ offset += ctx_get_aligned_size(offset, event_recorder->ctx,
client_ctx->event_context_len);
}
*pre_header_padding = padding;
uint32_t event_id)
{
struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
- struct lttng_event *event = ctx->priv;
+ struct lttng_ust_event_recorder *event_recorder = ctx->priv;
struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
if (caa_unlikely(ctx->rflags))
} else {
/* Pre 2.8 probe ABI. */
ctx_record(ctx, lttng_chan, lttng_chan->ctx, APP_CTX_DISABLED);
- ctx_record(ctx, lttng_chan, event->ctx, APP_CTX_DISABLED);
+ ctx_record(ctx, lttng_chan, event_recorder->ctx, APP_CTX_DISABLED);
}
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
uint32_t event_id)
{
struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
- struct lttng_event *event = ctx->priv;
+ struct lttng_ust_event_recorder *event_recorder = ctx->priv;
struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
switch (lttng_chan->header_type) {
} else {
/* Pre 2.8 probe ABI. */
ctx_record(ctx, lttng_chan, lttng_chan->ctx, APP_CTX_DISABLED);
- ctx_record(ctx, lttng_chan, event->ctx, APP_CTX_DISABLED);
+ ctx_record(ctx, lttng_chan, event_recorder->ctx, APP_CTX_DISABLED);
}
lib_ring_buffer_align_ctx(ctx, ctx->largest_align);
}
header->ctx.content_size =
(uint64_t) data_size * CHAR_BIT; /* in bits */
header->ctx.packet_size =
- (uint64_t) PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
+ (uint64_t) LTTNG_UST_PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */
records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf);
records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf);
struct lttng_ust_shm_handle *handle,
uint64_t *stream_id)
{
- struct packet_header *header;
+ struct channel *chan = shmp(handle, buf->backend.chan);
+ struct lttng_channel *lttng_chan = channel_get_private(chan);
+
+ *stream_id = lttng_chan->id;
- header = client_packet_header(buf, handle);
- if (!header)
- return -1;
- *stream_id = header->stream_id;
return 0;
}
struct packet_header *header;
header = client_packet_header(buf, handle);
+ if (!header)
+ return -1;
*seq = header->ctx.packet_seq_num;
return 0;
}
struct lttng_ust_shm_handle *handle,
uint64_t *id)
{
- struct packet_header *header;
+ *id = buf->backend.cpu;
- header = client_packet_header(buf, handle);
- *id = header->stream_instance_id;
return 0;
}
.cb_ptr = &client_cb.parent,
};
-const struct lttng_ust_client_lib_ring_buffer_client_cb *LTTNG_CLIENT_CALLBACKS = &client_cb;
-
static
struct lttng_channel *_channel_create(const char *name,
void *buf_addr,
uint32_t event_id)
{
struct lttng_channel *lttng_chan = channel_get_private(ctx->chan);
- struct lttng_event *event = ctx->priv;
+ struct lttng_ust_event_recorder *event_recorder = ctx->priv;
struct lttng_stack_ctx *lttng_ctx = ctx->priv2;
struct lttng_client_ctx client_ctx;
int ret, cpu;
/* Pre 2.8 probe ABI. */
ctx_get_struct_size(lttng_chan->ctx, &client_ctx.packet_context_len,
APP_CTX_DISABLED);
- ctx_get_struct_size(event->ctx, &client_ctx.event_context_len,
+ ctx_get_struct_size(event_recorder->ctx, &client_ctx.event_context_len,
APP_CTX_DISABLED);
}
.ops = {
.channel_create = _channel_create,
.channel_destroy = lttng_channel_destroy,
- .u.has_strcpy = 1,
.event_reserve = lttng_event_reserve,
.event_commit = lttng_event_commit,
.event_write = lttng_event_write,
.packet_avail_size = NULL, /* Would be racy anyway */
- //.get_reader_wait_queue = lttng_get_reader_wait_queue,
- //.get_hp_wait_queue = lttng_get_hp_wait_queue,
.is_finalized = lttng_is_finalized,
.is_disabled = lttng_is_disabled,
.flush_buffer = lttng_flush_buffer,
projects / lttng-ust.git / blobdiff