projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix: scsi: block: Remove REQ_OP_WRITE_SAME support (v5.18)
[lttng-modules.git]
/
src
/
lttng-ring-buffer-metadata-client.h
diff --git
a/src/lttng-ring-buffer-metadata-client.h
b/src/lttng-ring-buffer-metadata-client.h
index 6c7f64c244cd6a241cdf9611a37eb8ae0b3923de..86ec78f16abf7af75bc0ed9a3fae5ce66f64766b 100644
(file)
--- a/
src/lttng-ring-buffer-metadata-client.h
+++ b/
src/lttng-ring-buffer-metadata-client.h
@@
-110,7
+110,8
@@
static void client_buffer_begin(struct lttng_kernel_ring_buffer *buf, u64 tsc,
* subbuffer. data_size is between 1 and subbuf_size.
*/
static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc,
* subbuffer. data_size is between 1 and subbuf_size.
*/
static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc,
- unsigned int subbuf_idx, unsigned long data_size)
+ unsigned int subbuf_idx, unsigned long data_size,
+ const struct lttng_kernel_ring_buffer_ctx *ctx)
{
struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
struct metadata_packet_header *header =
{
struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan;
struct metadata_packet_header *header =
@@
-125,9
+126,9
@@
static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc,
* We do not care about the records lost count, because the metadata
* channel waits and retry.
*/
* We do not care about the records lost count, because the metadata
* channel waits and retry.
*/
- (void) lib_ring_buffer_get_records_lost_full(&client_config,
buf
);
- records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config,
buf
);
- records_lost += lib_ring_buffer_get_records_lost_big(&client_config,
buf
);
+ (void) lib_ring_buffer_get_records_lost_full(&client_config,
ctx
);
+ records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config,
ctx
);
+ records_lost += lib_ring_buffer_get_records_lost_big(&client_config,
ctx
);
WARN_ON_ONCE(records_lost != 0);
}
WARN_ON_ONCE(records_lost != 0);
}
@@
-326,15
+327,17
@@
void lttng_event_commit(struct lttng_kernel_ring_buffer_ctx *ctx)
static
void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
static
void lttng_event_write(struct lttng_kernel_ring_buffer_ctx *ctx, const void *src,
- size_t len)
+ size_t len
, size_t alignment
)
{
{
+ lib_ring_buffer_align_ctx(ctx, alignment);
lib_ring_buffer_write(&client_config, ctx, src, len);
}
static
void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
lib_ring_buffer_write(&client_config, ctx, src, len);
}
static
void lttng_event_write_from_user(struct lttng_kernel_ring_buffer_ctx *ctx,
- const void __user *src, size_t len)
+ const void __user *src, size_t len
, size_t alignment
)
{
{
+ lib_ring_buffer_align_ctx(ctx, alignment);
lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
}
lib_ring_buffer_copy_from_user_inatomic(&client_config, ctx, src, len);
}
@@
-352,6
+355,13
@@
void lttng_event_strcpy(struct lttng_kernel_ring_buffer_ctx *ctx, const char *sr
lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
}
lib_ring_buffer_strcpy(&client_config, ctx, src, len, '#');
}
+static
+void lttng_event_pstrcpy_pad(struct lttng_kernel_ring_buffer_ctx *ctx, const char *src,
+ size_t len)
+{
+ lib_ring_buffer_pstrcpy(&client_config, ctx, src, len, '\0');
+}
+
static
size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
{
static
size_t lttng_packet_avail_size(struct lttng_kernel_ring_buffer_channel *chan)
{
@@
-427,6
+437,7
@@
static struct lttng_transport lttng_relay_transport = {
.event_memset = lttng_event_memset,
.event_write = lttng_event_write,
.event_strcpy = lttng_event_strcpy,
.event_memset = lttng_event_memset,
.event_write = lttng_event_write,
.event_strcpy = lttng_event_strcpy,
+ .event_pstrcpy_pad = lttng_event_pstrcpy_pad,
},
};
},
};
This page took
0.040034 seconds
and
4
git commands to generate.