projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: string constants (-Wwrite-strings)
[lttng-ust.git]
/
liblttng-ust
/
lttng-ring-buffer-metadata-client.h
diff --git
a/liblttng-ust/lttng-ring-buffer-metadata-client.h
b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index ed2dcb67509701d99b7d8155d6a77adea502ebbf..f4d1362a6e9b95303349483a574842815a96ed77 100644
(file)
--- a/
liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/
liblttng-ust/lttng-ring-buffer-metadata-client.h
@@
-6,6
+6,7
@@
* LTTng lib ring buffer client template.
*/
* LTTng lib ring buffer client template.
*/
+#include <limits.h>
#include <stddef.h>
#include <stdint.h>
#include <stddef.h>
#include <stdint.h>
@@
-14,6
+15,7
@@
#include "ust-compat.h"
#include "lttng-tracer.h"
#include "../libringbuffer/frontend_types.h"
#include "ust-compat.h"
#include "lttng-tracer.h"
#include "../libringbuffer/frontend_types.h"
+#include <urcu/tls-compat.h>
struct metadata_packet_header {
uint32_t magic; /* 0x75D11D57 */
struct metadata_packet_header {
uint32_t magic; /* 0x75D11D57 */
@@
-35,6
+37,9
@@
struct metadata_record_header {
static const struct lttng_ust_lib_ring_buffer_config client_config;
static const struct lttng_ust_lib_ring_buffer_config client_config;
+/* No nested use supported for metadata ring buffer. */
+static DEFINE_URCU_TLS(struct lttng_ust_lib_ring_buffer_ctx_private, private_ctx);
+
static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
{
return 0;
static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
{
return 0;
@@
-239,15
+244,19
@@
void lttng_channel_destroy(struct lttng_ust_channel_buffer *lttng_chan_buf)
}
static
}
static
-int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx
, uint32_t event_id
)
+int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx)
{
int ret;
{
int ret;
+ memset(&URCU_TLS(private_ctx), 0, sizeof(struct lttng_ust_lib_ring_buffer_ctx_private));
+ URCU_TLS(private_ctx).pub = ctx;
+ URCU_TLS(private_ctx).chan = ctx->client_priv;
+ ctx->priv = &URCU_TLS(private_ctx);
ret = lib_ring_buffer_reserve(&client_config, ctx, NULL);
if (ret)
return ret;
if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
ret = lib_ring_buffer_reserve(&client_config, ctx, NULL);
if (ret)
return ret;
if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
- &ctx->backend_pages))
+ &ctx->
priv->
backend_pages))
return -EPERM;
return 0;
}
return -EPERM;
return 0;
}
@@
-259,9
+268,10
@@
void lttng_event_commit(struct lttng_ust_lib_ring_buffer_ctx *ctx)
}
static
}
static
-void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx,
const void *src,
-
size_t len
)
+void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+
const void *src, size_t len, size_t alignment
)
{
{
+ lttng_ust_lib_ring_buffer_align_ctx(ctx, alignment);
lib_ring_buffer_write(&client_config, ctx, src, len);
}
lib_ring_buffer_write(&client_config, ctx, src, len);
}
This page took
0.02386 seconds
and
4
git commands to generate.