Rename C++ header files to .hpp

[lttng-tools.git] / src / bin / lttng-sessiond / client.cpp

diff --git a/src/bin/lttng-sessiond/client.cpp b/src/bin/lttng-sessiond/client.cpp
index 69a6497ee326d48bd64012e60697dbfb1fcbff90..cf3fd44243bd18cbce118f4d53b37aa8000a0c15 100644 (file)
--- a/src/bin/lttng-sessiond/client.cpp
+++ b/src/bin/lttng-sessiond/client.cpp
@@ -7,25 +7,25 @@
  *
  */
 
-#include "common/buffer-view.h"
-#include "common/compat/socket.h"
-#include "common/dynamic-array.h"
-#include "common/dynamic-buffer.h"
-#include "common/fd-handle.h"
-#include "common/payload-view.h"
-#include "common/payload.h"
-#include "common/sessiond-comm/sessiond-comm.h"
+#include "common/buffer-view.hpp"
+#include "common/compat/socket.hpp"
+#include "common/dynamic-array.hpp"
+#include "common/dynamic-buffer.hpp"
+#include "common/fd-handle.hpp"
+#include "common/payload-view.hpp"
+#include "common/payload.hpp"
+#include "common/sessiond-comm/sessiond-comm.hpp"
 #include "lttng/lttng-error.h"
 #include "lttng/tracker.h"
-#include <common/compat/getenv.h>
-#include <common/tracker.h>
-#include <common/unix.h>
-#include <common/utils.h>
-#include <lttng/error-query-internal.h>
-#include <lttng/event-internal.h>
-#include <lttng/session-descriptor-internal.h>
-#include <lttng/session-internal.h>
-#include <lttng/userspace-probe-internal.h>
+#include <common/compat/getenv.hpp>
+#include <common/tracker.hpp>
+#include <common/unix.hpp>
+#include <common/utils.hpp>
+#include <lttng/error-query-internal.hpp>
+#include <lttng/event-internal.hpp>
+#include <lttng/session-descriptor-internal.hpp>
+#include <lttng/session-internal.hpp>
+#include <lttng/userspace-probe-internal.hpp>
 #include <pthread.h>
 #include <signal.h>
 #include <stddef.h>
@@ -33,17 +33,17 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "agent-thread.h"
-#include "clear.h"
-#include "client.h"
-#include "cmd.h"
-#include "health-sessiond.h"
-#include "kernel.h"
-#include "lttng-sessiond.h"
-#include "manage-consumer.h"
-#include "save.h"
-#include "testpoint.h"
-#include "utils.h"
+#include "agent-thread.hpp"
+#include "clear.hpp"
+#include "client.hpp"
+#include "cmd.hpp"
+#include "health-sessiond.hpp"
+#include "kernel.hpp"
+#include "lttng-sessiond.hpp"
+#include "manage-consumer.hpp"
+#include "save.hpp"
+#include "testpoint.hpp"
+#include "utils.hpp"
 
 static bool is_root;
 
@@ -583,7 +583,8 @@ error_create:
 /*
  * Count number of session permitted by uid/gid.
  */
-static unsigned int lttng_sessions_count(uid_t uid, gid_t gid)
+static unsigned int lttng_sessions_count(uid_t uid,
+               gid_t gid __attribute__((unused)))
 {
        unsigned int i = 0;
        struct ltt_session *session;
@@ -763,6 +764,10 @@ static enum lttng_error_code receive_lttng_event(struct command_ctx *cmd_ctx,
        ssize_t sock_recv_len;
        enum lttng_error_code ret_code;
        struct lttng_payload event_payload;
+       struct lttng_event *local_event = NULL;
+       char *local_filter_expression = NULL;
+       struct lttng_bytecode *local_bytecode = NULL;
+       struct lttng_event_exclusion *local_exclusion = NULL;
 
        lttng_payload_init(&event_payload);
        if (cmd_ctx->lsm.cmd_type == LTTNG_ENABLE_EVENT) {
@@ -810,23 +815,45 @@ static enum lttng_error_code receive_lttng_event(struct command_ctx *cmd_ctx,
 
        /* Deserialize event. */
        {
+               ssize_t len;
                struct lttng_payload_view event_view =
                                lttng_payload_view_from_payload(
                                                &event_payload, 0, -1);
 
-               if (lttng_event_create_from_payload(&event_view, out_event,
-                                   out_exclusion, out_filter_expression,
-                                   out_bytecode) != event_len) {
-                       ERR("Invalid event received as part of command payload");
+               len = lttng_event_create_from_payload(&event_view, &local_event,
+                                   &local_exclusion, &local_filter_expression,
+                                   &local_bytecode);
+
+               if (len < 0) {
+                       ERR("Failed to create an event from the received buffer");
+                       ret_code = LTTNG_ERR_INVALID_PROTOCOL;
+                       goto end;
+               }
+
+               if (len != event_len) {
+                       ERR("Userspace probe location from the received buffer is not the advertised length: header length = %zu" PRIu32 ", payload length = %zd", event_len, len);
                        ret_code = LTTNG_ERR_INVALID_PROTOCOL;
                        goto end;
                }
        }
 
+       *out_event = local_event;
+       *out_exclusion = local_exclusion;
+       *out_filter_expression = local_filter_expression;
+       *out_bytecode = local_bytecode;
+       local_event = NULL;
+       local_exclusion = NULL;
+       local_filter_expression = NULL;
+       local_bytecode = NULL;
+
        ret_code = LTTNG_OK;
 
 end:
        lttng_payload_reset(&event_payload);
+       lttng_event_destroy(local_event);
+       free(local_filter_expression);
+       free(local_bytecode);
+       free(local_exclusion);
        return ret_code;
 }
 
@@ -2015,8 +2042,7 @@ skip_domain:
        {
                lttng_snapshot_output output = cmd_ctx->lsm.u.snapshot_record.output;
                ret = cmd_snapshot_record(cmd_ctx->session,
-                               &output,
-                               cmd_ctx->lsm.u.snapshot_record.wait);
+                               &output, 0); // RFC: set to zero since it's ignored by cmd_snapshot_record
                break;
        }
        case LTTNG_CREATE_SESSION_EXT:
@@ -2409,7 +2435,7 @@ static void cleanup_client_thread(void *data)
        lttng_pipe_destroy(quit_pipe);
 }
 
-static void thread_init_cleanup(void *data)
+static void thread_init_cleanup(void *data __attribute__((unused)))
 {
        set_thread_status(false);
 }