X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Futils.hpp;h=7f398397a95a38ca585bcfcd000095497f913c6d;hb=HEAD;hp=326f0ae746396312e235d105af4a8c4b8fe66011;hpb=9caec246ae3fabcadd56c334e9b8755ccf8c46c0;p=lttng-tools.git diff --git a/src/bin/lttng/utils.hpp b/src/bin/lttng/utils.hpp index 326f0ae74..7f398397a 100644 --- a/src/bin/lttng/utils.hpp +++ b/src/bin/lttng/utils.hpp @@ -9,10 +9,12 @@ #define _LTTNG_UTILS_H #include +#include #include #include #include +#include #include #include @@ -25,6 +27,9 @@ extern pid_t sessiond_pid; struct cmd_struct; +namespace lttng { +namespace cli { + struct session_spec { enum class type { NAME, @@ -42,132 +47,109 @@ struct session_spec { const char *value; }; -/* - * We don't use a std::vector here because it would make a copy of the C array. - */ -class session_list { - template - class _iterator : public std::iterator { - public: - explicit _iterator(ContainerType& list, std::size_t k) : _list(list), _index(k) - { - } - - _iterator& operator++() noexcept - { - ++_index; - return *this; - } - - _iterator& operator--() noexcept - { - --_index; - return *this; - } - - _iterator& operator++(int) noexcept - { - _index++; - return *this; - } - - _iterator& operator--(int) noexcept - { - _index--; - return *this; - } - - bool operator==(_iterator other) const noexcept - { - return _index == other._index; - } - - bool operator!=(_iterator other) const noexcept - { - return !(*this == other); - } - - DereferenceReturnType& operator*() const noexcept - { - return _list[_index]; - } - - private: - ContainerType& _list; - std::size_t _index; - }; - - using iterator = _iterator; - using const_iterator = _iterator; +class session_list; +namespace details { +class session_storage { public: - session_list() : _sessions_count(0), _sessions(nullptr) + session_storage(lttng_session *raw_sessions, std::size_t sessions_count) : + _array(raw_sessions), _count(sessions_count) { } - session_list(session_list&& original, std::size_t new_count) + session_storage(session_storage&& original) noexcept : + _array(std::move(original._array)), _count(original._count) { - _sessions_count = new_count; - _sessions = std::move(original._sessions); } - session_list(struct lttng_session *raw_sessions, std::size_t raw_sessions_count) + session_storage(session_storage&& original, std::size_t new_count) : + _array(std::move(original._array)), _count(new_count) { - _sessions_count = raw_sessions_count; - _sessions.reset(raw_sessions); } - iterator begin() noexcept - { - return iterator(*this, 0); - } + session_storage(session_storage&) = delete; + session_storage& operator=(const session_storage& other) = delete; + session_storage& operator=(session_storage&& other) = delete; + ~session_storage() = default; + + lttng_session_uptr _array = nullptr; + std::size_t _count = 0; +}; - iterator end() noexcept +class session_list_operations { +public: + static lttng_session& get(const lttng::cli::details::session_storage& storage, + std::size_t index) noexcept { - return iterator(*this, _sessions_count); + return storage._array[index]; } - const_iterator begin() const noexcept + static std::size_t size(const lttng::cli::details::session_storage& storage) { - return const_iterator(*this, 0); + return storage._count; } +}; +} /* namespace details */ - const_iterator end() const noexcept +/* + * We don't use a std::vector here because it would make a copy of the C array. + */ +class session_list + : public lttng::utils::random_access_container_wrapper { +public: + friend details::session_list_operations; + + session_list() : + lttng::utils::random_access_container_wrapper( + { nullptr, 0 }) { - return const_iterator(*this, _sessions_count); } - std::size_t size() const noexcept + session_list(session_list&& original) noexcept : + lttng::utils::random_access_container_wrapper( + std::move(original._container)) { - return _sessions_count; } - void resize(std::size_t new_size) noexcept + session_list(session_list&& original, std::size_t new_count) : + lttng::utils::random_access_container_wrapper( + { std::move(original._container), new_count }) { - _sessions_count = new_size; } - lttng_session& operator[](std::size_t index) + session_list(lttng_session *raw_sessions, std::size_t raw_sessions_count) : + lttng::utils::random_access_container_wrapper( + { raw_sessions, raw_sessions_count }) { - LTTNG_ASSERT(index < _sessions_count); - return _sessions.get()[index]; } - const lttng_session& operator[](std::size_t index) const + session_list(session_list&) = delete; + session_list& operator=(const session_list& other) = delete; + session_list& operator=(session_list&& other) = delete; + ~session_list() = default; + + void resize(std::size_t new_size) noexcept { - LTTNG_ASSERT(index < _sessions_count); - return _sessions.get()[index]; + _container._count = new_size; } - -private: - std::size_t _sessions_count; - std::unique_ptr::deleter> - _sessions; }; -char *get_session_name(void); -char *get_session_name_quiet(void); +lttng::cli::session_list list_sessions(const struct session_spec& spec); +} /* namespace cli */ +} /* namespace lttng */ + +char *get_session_name(); +char *get_session_name_quiet(); void list_commands(struct cmd_struct *commands, FILE *ofp); void list_cmd_options(FILE *ofp, struct poptOption *options); void list_cmd_options_argpar(FILE *ofp, const struct argpar_opt_descr *options); @@ -195,7 +177,7 @@ const char *get_event_type_str(enum lttng_event_type event_type); int print_missing_or_multiple_domains(unsigned int domain_count, bool include_agent_domains); int spawn_relayd(const char *pathname, int port); -int check_relayd(void); +int check_relayd(); void print_session_stats(const char *session_name); int get_session_stats_str(const char *session_name, char **str); int show_cmd_help(const char *cmd_name, const char *help_msg); @@ -206,6 +188,10 @@ int print_trace_archive_location(const struct lttng_trace_archive_location *loca int validate_exclusion_list(const char *event_name, const struct lttng_dynamic_pointer_array *exclusions); -session_list list_sessions(const struct session_spec& spec); +/* + * Ask the sessiond for the more details on the status of the kernel tracer and + * print it to stderr. + */ +void print_kernel_tracer_status_error(); #endif /* _LTTNG_UTILS_H */