old_channel.switch_timer_interval = chops->switch_timer_interval;
old_channel.read_timer_interval = chops->read_timer_interval;
old_channel.output = chops->output;
- memcpy(old_channel.padding, chops->padding, sizeof(old_channel.padding));
+
+ memset(old_channel.padding, 0, sizeof(old_channel.padding));
+ /*
+ * The new channel padding is smaller than the old ABI so we use the
+ * new ABI padding size for the memcpy.
+ */
+ memcpy(old_channel.padding, chops->padding, sizeof(chops->padding));
return ioctl(fd, LTTNG_KERNEL_OLD_METADATA, &old_channel);
}
channel.switch_timer_interval = chops->switch_timer_interval;
channel.read_timer_interval = chops->read_timer_interval;
channel.output = chops->output;
- memcpy(channel.padding, chops->padding, sizeof(channel.padding));
+ memcpy(channel.padding, chops->padding, sizeof(chops->padding));
return ioctl(fd, LTTNG_KERNEL_METADATA, &channel);
}
old_channel.switch_timer_interval = chops->switch_timer_interval;
old_channel.read_timer_interval = chops->read_timer_interval;
old_channel.output = chops->output;
- memcpy(old_channel.padding, chops->padding, sizeof(old_channel.padding));
+
+ memset(old_channel.padding, 0, sizeof(old_channel.padding));
+ /*
+ * The new channel padding is smaller than the old ABI so we use the
+ * new ABI padding size for the memcpy.
+ */
+ memcpy(old_channel.padding, chops->padding, sizeof(chops->padding));
return ioctl(fd, LTTNG_KERNEL_OLD_CHANNEL, &old_channel);
}
channel.switch_timer_interval = chops->switch_timer_interval;
channel.read_timer_interval = chops->read_timer_interval;
channel.output = chops->output;
- memcpy(channel.padding, chops->padding, sizeof(channel.padding));
+ memcpy(channel.padding, chops->padding, sizeof(chops->padding));
return ioctl(fd, LTTNG_KERNEL_CHANNEL, &channel);
}
old_ctx.ctx = ctx->ctx;
/* only type that uses the union */
- if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_COUNTER) {
+ if (ctx->ctx == LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER) {
old_ctx.u.perf_counter.type =
ctx->u.perf_counter.type;
old_ctx.u.perf_counter.config =
{
return ioctl(fd, RING_BUFFER_PUT_SUBBUF);
}
+
+/* Returns the timestamp begin of the current sub-buffer. */
+int kernctl_get_timestamp_begin(int fd, uint64_t *timestamp_begin)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_TIMESTAMP_BEGIN, timestamp_begin);
+}
+
+/* Returns the timestamp end of the current sub-buffer. */
+int kernctl_get_timestamp_end(int fd, uint64_t *timestamp_end)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_TIMESTAMP_END, timestamp_end);
+}
+
+/* Returns the number of discarded events in the current sub-buffer. */
+int kernctl_get_events_discarded(int fd, uint64_t *events_discarded)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_EVENTS_DISCARDED, events_discarded);
+}
+
+/* Returns the content size in the current sub-buffer. */
+int kernctl_get_content_size(int fd, uint64_t *content_size)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_CONTENT_SIZE, content_size);
+}
+
+/* Returns the packet size in the current sub-buffer. */
+int kernctl_get_packet_size(int fd, uint64_t *packet_size)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_PACKET_SIZE, packet_size);
+}
+
+/* Returns the stream id of the current sub-buffer. */
+int kernctl_get_stream_id(int fd, uint64_t *stream_id)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_STREAM_ID, stream_id);
+}
+
+/* Returns the current timestamp. */
+int kernctl_get_current_timestamp(int fd, uint64_t *ts)
+{
+ return ioctl(fd, LTTNG_RING_BUFFER_GET_CURRENT_TIMESTAMP, ts);
+}