Use compiler-agnostic defines to silence warning

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.hpp

diff --git a/src/bin/lttng-sessiond/cmd.hpp b/src/bin/lttng-sessiond/cmd.hpp
index 8727e741bca66a715237ed5e275c0000fc0d1a01..6b6dfedf5de0c9de2d16824ef6f1d8ba6b516d0f 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.hpp
+++ b/src/bin/lttng-sessiond/cmd.hpp
@@ -9,11 +9,16 @@
 #define CMD_H
 
 #include "context.hpp"
 #define CMD_H
 
 #include "context.hpp"

+#include "ctl-utils.hpp"

 #include "lttng-sessiond.hpp"
 #include "lttng/tracker.h"
 #include "session.hpp"
 #include "lttng-sessiond.hpp"
 #include "lttng/tracker.h"
 #include "session.hpp"

+#include "snapshot-output.hpp"
+

 #include <common/tracker.hpp>
 
 #include <common/tracker.hpp>
 

+#include <lttng/kernel.h>
+

 struct notification_thread_handle;
 struct lttng_dynamic_buffer;
 
 struct notification_thread_handle;
 struct lttng_dynamic_buffer;
 


@@ -25,7 +30,7 @@ struct lttng_dynamic_buffer;
  * completed successfully. On failure, the handler's return code should
  * be the only reply sent to the client.
  */
  * completed successfully. On failure, the handler's return code should
  * be the only reply sent to the client.
  */

-typedef enum lttng_error_code (*completion_handler_function)(void *);
+using completion_handler_function = enum lttng_error_code (*)(void *);

 struct cmd_completion_handler {
        completion_handler_function run;
        void *data;
 struct cmd_completion_handler {
        completion_handler_function run;
        void *data;


@@ -35,146 +40,156 @@ struct cmd_completion_handler {
  * Init the command subsystem. Must be called before using any of the functions
  * above. This is called in the main() of the session daemon.
  */
  * Init the command subsystem. Must be called before using any of the functions
  * above. This is called in the main() of the session daemon.
  */

-void cmd_init(void);
+void cmd_init();

 
 /* Session commands */
 
 /* Session commands */

-enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx, int sock,
-               struct lttng_session_descriptor **return_descriptor);
-int cmd_destroy_session(struct ltt_session *session,
-               struct notification_thread_handle *notification_thread_handle,
-               int *sock_fd);
+enum lttng_error_code cmd_create_session(struct command_ctx *cmd_ctx,
+                                        int sock,
+                                        struct lttng_session_descriptor **return_descriptor);
+int cmd_destroy_session(const ltt_session::locked_ref& session, int *sock_fd);

 
 /* Channel commands */
 
 /* Channel commands */

-int cmd_disable_channel(struct ltt_session *session,
-               enum lttng_domain_type domain, char *channel_name);
-int cmd_enable_channel(struct command_ctx *cmd_ctx, int sock, int wpipe);
+int cmd_disable_channel(const ltt_session::locked_ref& session,
+                       enum lttng_domain_type domain,
+                       char *channel_name);
+int cmd_enable_channel(struct command_ctx *cmd_ctx,
+                      ltt_session::locked_ref& session,
+                      int sock,
+                      int wpipe);

 
 /* Process attribute tracker commands */
 
 /* Process attribute tracker commands */

-enum lttng_error_code cmd_process_attr_tracker_get_tracking_policy(
-               struct ltt_session *session,
-               enum lttng_domain_type domain,
-               enum lttng_process_attr process_attr,
-               enum lttng_tracking_policy *policy);
-enum lttng_error_code cmd_process_attr_tracker_set_tracking_policy(
-               struct ltt_session *session,
-               enum lttng_domain_type domain,
-               enum lttng_process_attr process_attr,
-               enum lttng_tracking_policy policy);
-enum lttng_error_code cmd_process_attr_tracker_inclusion_set_add_value(
-               struct ltt_session *session,
-               enum lttng_domain_type domain,
-               enum lttng_process_attr process_attr,
-               const struct process_attr_value *value);
-enum lttng_error_code cmd_process_attr_tracker_inclusion_set_remove_value(
-               struct ltt_session *session,
-               enum lttng_domain_type domain,
-               enum lttng_process_attr process_attr,
-               const struct process_attr_value *value);
-enum lttng_error_code cmd_process_attr_tracker_get_inclusion_set(
-               struct ltt_session *session,
-               enum lttng_domain_type domain,
-               enum lttng_process_attr process_attr,
-               struct lttng_process_attr_values **values);
+enum lttng_error_code
+cmd_process_attr_tracker_get_tracking_policy(const ltt_session::locked_ref& session,
+                                            enum lttng_domain_type domain,
+                                            enum lttng_process_attr process_attr,
+                                            enum lttng_tracking_policy *policy);
+enum lttng_error_code
+cmd_process_attr_tracker_set_tracking_policy(const ltt_session::locked_ref& session,
+                                            enum lttng_domain_type domain,
+                                            enum lttng_process_attr process_attr,
+                                            enum lttng_tracking_policy policy);
+enum lttng_error_code
+cmd_process_attr_tracker_inclusion_set_add_value(const ltt_session::locked_ref& session,
+                                                enum lttng_domain_type domain,
+                                                enum lttng_process_attr process_attr,
+                                                const struct process_attr_value *value);
+enum lttng_error_code
+cmd_process_attr_tracker_inclusion_set_remove_value(const ltt_session::locked_ref& session,
+                                                   enum lttng_domain_type domain,
+                                                   enum lttng_process_attr process_attr,
+                                                   const struct process_attr_value *value);
+enum lttng_error_code
+cmd_process_attr_tracker_get_inclusion_set(const ltt_session::locked_ref& session,
+                                          enum lttng_domain_type domain,
+                                          enum lttng_process_attr process_attr,
+                                          struct lttng_process_attr_values **values);

 
 /* Event commands */
 int cmd_disable_event(struct command_ctx *cmd_ctx,
 
 /* Event commands */
 int cmd_disable_event(struct command_ctx *cmd_ctx,

-               struct lttng_event *event,
-               char *filter_expression,
-               struct lttng_bytecode *filter,
-               struct lttng_event_exclusion *exclusion);
+                     ltt_session::locked_ref& locked_session,
+                     struct lttng_event *event,
+                     char *filter_expression,
+                     struct lttng_bytecode *filter,
+                     struct lttng_event_exclusion *exclusion);

 int cmd_add_context(struct command_ctx *cmd_ctx,
 int cmd_add_context(struct command_ctx *cmd_ctx,

-               const struct lttng_event_context *event_context,
-               int kwpipe);
-int cmd_set_filter(struct ltt_session *session, enum lttng_domain_type domain,
-               char *channel_name, struct lttng_event *event,
-               struct lttng_bytecode *bytecode);
+                   ltt_session::locked_ref& locked_session,
+                   const struct lttng_event_context *event_context,
+                   int kwpipe);
+int cmd_set_filter(struct ltt_session *session,
+                  enum lttng_domain_type domain,
+                  char *channel_name,
+                  struct lttng_event *event,
+                  struct lttng_bytecode *bytecode);

 int cmd_enable_event(struct command_ctx *cmd_ctx,
 int cmd_enable_event(struct command_ctx *cmd_ctx,

-               struct lttng_event *event,
-               char *filter_expression,
-               struct lttng_event_exclusion *exclusion,
-               struct lttng_bytecode *bytecode,
-               int wpipe);
+                    ltt_session::locked_ref& session,
+                    struct lttng_event *event,
+                    char *filter_expression,
+                    struct lttng_event_exclusion *exclusion,
+                    struct lttng_bytecode *bytecode,
+                    int wpipe);

 
 /* Trace session action commands */
 
 /* Trace session action commands */

-int cmd_start_trace(struct ltt_session *session);
-int cmd_stop_trace(struct ltt_session *session);
+int cmd_start_trace(const ltt_session::locked_ref& session);
+int cmd_stop_trace(const ltt_session::locked_ref& session);

 
 /* Consumer commands */
 
 /* Consumer commands */

-int cmd_register_consumer(struct ltt_session *session,
-               enum lttng_domain_type domain,
-               const char *sock_path, struct consumer_data *cdata);
-int cmd_set_consumer_uri(struct ltt_session *session, size_t nb_uri,
-               struct lttng_uri *uris);
-int cmd_setup_relayd(struct ltt_session *session);
+int cmd_register_consumer(const ltt_session::locked_ref& session,
+                         enum lttng_domain_type domain,
+                         const char *sock_path,
+                         struct consumer_data *cdata);
+int cmd_set_consumer_uri(const ltt_session::locked_ref& session,
+                        size_t nb_uri,
+                        struct lttng_uri *uris);
+int cmd_setup_relayd(const ltt_session::locked_ref& session);

 
 /* Listing commands */
 
 /* Listing commands */

-ssize_t cmd_list_domains(struct ltt_session *session,
-               struct lttng_domain **domains);
+ssize_t cmd_list_domains(const ltt_session::locked_ref& session, struct lttng_domain **domains);

 enum lttng_error_code cmd_list_events(enum lttng_domain_type domain,
 enum lttng_error_code cmd_list_events(enum lttng_domain_type domain,

-               struct ltt_session *session,
-               char *channel_name,
-               struct lttng_payload *payload);
+                                     const ltt_session::locked_ref& session,
+                                     char *channel_name,
+                                     struct lttng_payload *payload);

 enum lttng_error_code cmd_list_channels(enum lttng_domain_type domain,
 enum lttng_error_code cmd_list_channels(enum lttng_domain_type domain,

-               struct ltt_session *session,
-               struct lttng_payload *payload);
-void cmd_list_lttng_sessions(struct lttng_session *sessions,
-               size_t session_count, uid_t uid, gid_t gid);
+                                       const ltt_session::locked_ref& session,
+                                       struct lttng_payload *payload);
+void cmd_list_lttng_sessions(lttng_session *sessions, size_t session_count, uid_t uid, gid_t gid);

 enum lttng_error_code cmd_list_tracepoint_fields(enum lttng_domain_type domain,
 enum lttng_error_code cmd_list_tracepoint_fields(enum lttng_domain_type domain,

-               struct lttng_payload *reply);
+                                                struct lttng_payload *reply);

 enum lttng_error_code cmd_list_tracepoints(enum lttng_domain_type domain,
 enum lttng_error_code cmd_list_tracepoints(enum lttng_domain_type domain,

-               struct lttng_payload *reply_payload);
-ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
-               struct lttng_snapshot_output **outputs);
-enum lttng_error_code cmd_list_syscalls(
-               struct lttng_payload *reply_payload);
+                                          struct lttng_payload *reply_payload);
+ssize_t cmd_snapshot_list_outputs(const ltt_session::locked_ref& session,
+                                 struct lttng_snapshot_output **outputs);
+enum lttng_error_code cmd_list_syscalls(struct lttng_payload *reply_payload);

 
 

-int cmd_data_pending(struct ltt_session *session);
+int cmd_data_pending(const ltt_session::locked_ref& session);
+enum lttng_error_code cmd_kernel_tracer_status(enum lttng_kernel_tracer_status *status);

 
 /* Snapshot */
 
 /* Snapshot */

-int cmd_snapshot_add_output(struct ltt_session *session,
-               const struct lttng_snapshot_output *output, uint32_t *id);
-int cmd_snapshot_del_output(struct ltt_session *session,
-               const struct lttng_snapshot_output *output);
-int cmd_snapshot_record(struct ltt_session *session,
-               const struct lttng_snapshot_output *output, int wait);
-
-int cmd_set_session_shm_path(struct ltt_session *session,
-               const char *shm_path);
-int cmd_regenerate_metadata(struct ltt_session *session);
-int cmd_regenerate_statedump(struct ltt_session *session);
-
-enum lttng_error_code cmd_register_trigger(
-               const struct lttng_credentials *cmd_creds,
-               struct lttng_trigger *trigger,
-               bool is_anonymous_trigger,
-               struct notification_thread_handle *notification_thread_handle,
-               struct lttng_trigger **return_trigger);
-enum lttng_error_code cmd_unregister_trigger(
-               const struct lttng_credentials *cmd_creds,
-               const struct lttng_trigger *trigger,
-               struct notification_thread_handle *notification_thread_handle);
-
-enum lttng_error_code cmd_list_triggers(struct command_ctx *cmd_ctx,
-               struct notification_thread_handle *notification_thread_handle,
-               struct lttng_triggers **return_triggers);
-enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cmd_creds,
-               const struct lttng_error_query *query,
-               struct lttng_error_query_results **_results,
-               struct notification_thread_handle *notification_thread);
-
-int cmd_rotate_session(struct ltt_session *session,
-               struct lttng_rotate_session_return *rotate_return,
-               bool quiet_rotation,
-               enum lttng_trace_chunk_command_type command);
-int cmd_rotate_get_info(struct ltt_session *session,
-               struct lttng_rotation_get_info_return *info_return,
-               uint64_t rotate_id);
-int cmd_rotation_set_schedule(struct ltt_session *session,
-               bool activate, enum lttng_rotation_schedule_type schedule_type,
-               uint64_t value,
-               struct notification_thread_handle *notification_thread_handle);
-
-const struct cmd_completion_handler *cmd_pop_completion_handler(void);
+int cmd_snapshot_add_output(const ltt_session::locked_ref& session,
+                           const struct lttng_snapshot_output *output,
+                           uint32_t *id);
+int cmd_snapshot_del_output(const ltt_session::locked_ref& session,
+                           const struct lttng_snapshot_output *output);
+int cmd_snapshot_record(const ltt_session::locked_ref& session,
+                       const struct lttng_snapshot_output *output,
+                       int wait);
+
+int cmd_set_session_shm_path(const ltt_session::locked_ref& session, const char *shm_path);
+int cmd_regenerate_metadata(const ltt_session::locked_ref& session);
+int cmd_regenerate_statedump(const ltt_session::locked_ref& session);
+
+lttng::ctl::trigger
+cmd_register_trigger(const struct lttng_credentials *cmd_creds,
+                    struct lttng_trigger *trigger,
+                    bool is_anonymous_trigger,
+                    struct notification_thread_handle *notification_thread_handle);
+enum lttng_error_code
+cmd_unregister_trigger(const struct lttng_credentials *cmd_creds,
+                      const struct lttng_trigger *trigger,
+                      struct notification_thread_handle *notification_thread_handle);
+
+enum lttng_error_code
+cmd_list_triggers(struct command_ctx *cmd_ctx,
+                 struct notification_thread_handle *notification_thread_handle,
+                 struct lttng_triggers **return_triggers);
+enum lttng_error_code
+cmd_execute_error_query(const struct lttng_credentials *cmd_creds,
+                       const struct lttng_error_query *query,
+                       struct lttng_error_query_results **_results,
+                       struct notification_thread_handle *notification_thread);
+
+int cmd_rotate_session(const ltt_session::locked_ref& session,
+                      struct lttng_rotate_session_return *rotate_return,
+                      bool quiet_rotation,
+                      enum lttng_trace_chunk_command_type command);
+int cmd_rotate_get_info(const ltt_session::locked_ref& session,
+                       struct lttng_rotation_get_info_return *info_return,
+                       uint64_t rotate_id);
+int cmd_rotation_set_schedule(const ltt_session::locked_ref& session,
+                             bool activate,
+                             enum lttng_rotation_schedule_type schedule_type,
+                             uint64_t value);
+
+const struct cmd_completion_handler *cmd_pop_completion_handler();

 int start_kernel_session(struct ltt_kernel_session *ksess);
 int stop_kernel_session(struct ltt_kernel_session *ksess);
 
 int start_kernel_session(struct ltt_kernel_session *ksess);
 int stop_kernel_session(struct ltt_kernel_session *ksess);