Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Change-Id: Icc72fe8df669e2bb53e1d6ba7865bb75723aa672
public:
using uptr = std::unique_ptr<trace_format_descriptor>;
using sptr = std::shared_ptr<trace_format_descriptor>;
public:
using uptr = std::unique_ptr<trace_format_descriptor>;
using sptr = std::shared_ptr<trace_format_descriptor>;
+ using csptr = std::shared_ptr<const trace_format_descriptor>;
explicit trace_format_descriptor(enum lttng_trace_format_descriptor_type type) : _type(type)
{
}
explicit trace_format_descriptor(enum lttng_trace_format_descriptor_type type) : _type(type)
{
}
LTTNG_ASSERT(session);
/* Allocate data structure */
LTTNG_ASSERT(session);
/* Allocate data structure */
- lks = trace_kernel_create_session();
+ lks = trace_kernel_create_session(
+ std::const_pointer_cast<const lttng::trace_format_descriptor>(
+ session->trace_format));
if (lks == NULL) {
ret = -1;
goto error;
if (lks == NULL) {
ret = -1;
goto error;
*
* Return pointer to structure or NULL.
*/
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_session *trace_kernel_create_session(void)
+struct ltt_kernel_session *trace_kernel_create_session(
+ lttng::trace_format_descriptor::csptr trace_format)
{
struct ltt_kernel_session *lks = NULL;
{
struct ltt_kernel_session *lks = NULL;
+ lks->trace_format = trace_format;
+
struct process_attr_tracker *tracker_vuid{};
struct process_attr_tracker *tracker_gid{};
struct process_attr_tracker *tracker_vgid{};
struct process_attr_tracker *tracker_vuid{};
struct process_attr_tracker *tracker_gid{};
struct process_attr_tracker *tracker_vgid{};
+
+ lttng::trace_format_descriptor::csptr trace_format;
/*
* Create functions malloc() the data structure.
*/
/*
* Create functions malloc() the data structure.
*/
-struct ltt_kernel_session *trace_kernel_create_session(void);
+struct ltt_kernel_session *trace_kernel_create_session(
+ lttng::trace_format_descriptor::csptr trace_format);
struct ltt_kernel_channel *trace_kernel_create_channel(
struct lttng_channel *chan);
enum lttng_error_code trace_kernel_create_event(struct lttng_event *ev,
struct ltt_kernel_channel *trace_kernel_create_channel(
struct lttng_channel *chan);
enum lttng_error_code trace_kernel_create_event(struct lttng_event *ev,
static void test_create_one_kernel_session(void)
{
static void test_create_one_kernel_session(void)
{
- kern = trace_kernel_create_session();
+ lttng::trace_format_descriptor::csptr trace_format =
+ std::make_shared<const lttng::trace_format_descriptor_ctf2>();
+ kern = trace_kernel_create_session(trace_format);
ok(kern != NULL, "Create kernel session");
if (!kern) {
ok(kern != NULL, "Create kernel session");
if (!kern) {