/*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- * Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef _LTT_TRACE_UST_H
#include <limits.h>
#include <urcu/list.h>
-#include <lttng/lttng.h>
-#include <common/hashtable/hashtable.h>
#include <common/defaults.h>
+#include <common/hashtable/hashtable.h>
+#include <common/tracker.h>
+#include <lttng/lttng.h>
#include "consumer.h"
#include "lttng-ust-ctl.h"
struct agent;
struct ltt_ust_ht_key {
+ uint64_t tracer_token;
const char *name;
- const struct lttng_filter_bytecode *filter;
+ const struct lttng_bytecode *filter;
enum lttng_ust_loglevel_type loglevel_type;
int loglevel_value;
const struct lttng_event_exclusion *exclusion;
+ struct lttng_map_key *key;
};
/* Context hash table nodes */
struct lttng_ust_event attr;
struct lttng_ht_node_str node;
char *filter_expression;
- struct lttng_filter_bytecode *filter;
+ struct lttng_bytecode *filter;
struct lttng_event_exclusion *exclusion;
+
+ /* refcounted */
+ struct lttng_map_key *key;
/*
* An internal event is an event which was created by the session daemon
* through which, for example, events emitted in Agent domains are
uint64_t monitor_timer_interval;
};
+struct ltt_ust_map_dead_pid_kv_values {
+ pthread_mutex_t lock;
+ struct lttng_ht *dead_app_kv_values_32bits;
+ struct lttng_ht *dead_app_kv_values_64bits;
+};
+
+/* UST map */
+struct ltt_ust_map {
+ uint64_t id; /* unique id per session. */
+ char name[LTTNG_UST_SYM_NAME_LEN];
+ unsigned int enabled;
+ size_t bucket_count;
+ bool coalesce_hits;
+ enum lttng_map_bitness bitness;
+ uint64_t nr_cpu;
+ struct lttng_ht_node_str node;
+ struct lttng_map *map;
+ struct lttng_ht *events;
+ struct ltt_ust_map_dead_pid_kv_values dead_app_kv_values;
+};
+
/* UST domain global (LTTNG_DOMAIN_UST) */
struct ltt_ust_domain_global {
struct lttng_ht *channels;
+ struct lttng_ht *maps;
struct cds_list_head registry_buffer_uid_list;
};
-struct ust_pid_tracker_node {
+struct ust_id_tracker_node {
struct lttng_ht_node_ulong node;
};
-struct ust_pid_tracker {
+struct ust_id_tracker {
struct lttng_ht *ht;
};
char root_shm_path[PATH_MAX];
char shm_path[PATH_MAX];
- struct ust_pid_tracker pid_tracker;
-
/* Current trace chunk of the ltt_session. */
struct lttng_trace_chunk *current_trace_chunk;
+
+ /* Trackers used for actual lookup on app registration. */
+ struct ust_id_tracker vpid_tracker;
+ struct ust_id_tracker vuid_tracker;
+ struct ust_id_tracker vgid_tracker;
+
+ /* Tracker list of keys requested by users. */
+ struct process_attr_tracker *tracker_vpid;
+ struct process_attr_tracker *tracker_vuid;
+ struct process_attr_tracker *tracker_vgid;
};
/*
* Lookup functions. NULL is returned if not found.
*/
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
- char *name, struct lttng_filter_bytecode *filter,
+ uint64_t tracer_token, char *name, struct lttng_bytecode *filter,
enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
- struct lttng_event_exclusion *exclusion);
+ struct lttng_event_exclusion *exclusion,
+ struct lttng_map_key *key);
struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
const char *name);
+struct ltt_ust_map *trace_ust_find_map_by_name(struct lttng_ht *ht,
+ const char *name);
struct agent *trace_ust_find_agent(struct ltt_ust_session *session,
enum lttng_domain_type domain_type);
struct ltt_ust_session *trace_ust_create_session(uint64_t session_id);
struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
enum lttng_domain_type domain);
-enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
+struct ltt_ust_map *trace_ust_create_map(const struct lttng_map *map);
+enum lttng_error_code trace_ust_create_event(uint64_t tracer_token,
+ const char *ev_name,
+ struct lttng_map_key *key,
+ enum lttng_event_type ev_type,
+ enum lttng_loglevel_type ev_loglevel_type,
+ enum lttng_loglevel ev_loglevel,
char *filter_expression,
- struct lttng_filter_bytecode *filter,
+ struct lttng_bytecode *filter,
struct lttng_event_exclusion *exclusion,
- bool internal_event, struct ltt_ust_event **ust_event);
+ bool internal_event,
+ struct ltt_ust_event **ust_event);
struct ltt_ust_context *trace_ust_create_context(
const struct lttng_event_context *ctx);
int trace_ust_match_context(const struct ltt_ust_context *uctx,
const struct lttng_event_context *ctx);
void trace_ust_delete_channel(struct lttng_ht *ht,
struct ltt_ust_channel *channel);
+void trace_ust_delete_map(struct lttng_ht *ht,
+ struct ltt_ust_map *map);
/*
* Destroy functions free() the data structure and remove from linked list if
*/
void trace_ust_destroy_session(struct ltt_ust_session *session);
void trace_ust_destroy_channel(struct ltt_ust_channel *channel);
+void trace_ust_destroy_map(struct ltt_ust_map *map);
void trace_ust_destroy_event(struct ltt_ust_event *event);
void trace_ust_destroy_context(struct ltt_ust_context *ctx);
void trace_ust_free_session(struct ltt_ust_session *session);
-int trace_ust_track_pid(struct ltt_ust_session *session, int pid);
-int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid);
-
-int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid);
-
-ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
- int32_t **_pids);
+int trace_ust_id_tracker_lookup(enum lttng_process_attr process_attr,
+ struct ltt_ust_session *session,
+ int id);
+enum lttng_error_code trace_ust_process_attr_tracker_set_tracking_policy(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr,
+ enum lttng_tracking_policy policy);
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_add_value(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value);
+enum lttng_error_code trace_ust_process_attr_tracker_inclusion_set_remove_value(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value);
+const struct process_attr_tracker *trace_ust_get_process_attr_tracker(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr);
#else /* HAVE_LIBLTTNG_UST_CTL */
{
return NULL;
}
-
+static inline
+struct ltt_ust_map *trace_ust_find_map_by_name(struct lttng_ht *ht,
+ const char *name)
+{
+ return NULL;
+}
static inline
struct ltt_ust_session *trace_ust_create_session(unsigned int session_id)
{
return NULL;
}
static inline
-enum lttng_error_code trace_ust_create_event(struct lttng_event *ev,
- const char *filter_expression,
- struct lttng_filter_bytecode *filter,
+struct ltt_ust_map *trace_ust_create_map(const struct lttng_map *map)
+{
+ return NULL;
+}
+static inline
+enum lttng_error_code trace_ust_create_event(uint64_t tracer_token,
+ const char *ev_name,
+ struct lttng_map_key *key,
+ enum lttng_event_type ev_type,
+ enum lttng_loglevel_type ev_loglevel_type,
+ enum lttng_loglevel ev_loglevel,
+ char *filter_expression,
+ struct lttng_bytecode *filter,
struct lttng_event_exclusion *exclusion,
- bool internal_event, struct ltt_ust_event **ust_event)
+ bool internal_event,
+ struct ltt_ust_event **ust_event)
{
return LTTNG_ERR_NO_UST;
}
{
}
+static inline
+void trace_ust_destroy_map(struct ltt_ust_map *map)
+{
+}
+
static inline
void trace_ust_destroy_event(struct ltt_ust_event *event)
{
}
static inline
struct ltt_ust_event *trace_ust_find_event(struct lttng_ht *ht,
- char *name, struct lttng_filter_bytecode *filter,
+ uint64_t tracer_token, char *name, struct lttng_bytecode *filter,
enum lttng_ust_loglevel_type loglevel_type, int loglevel_value,
- struct lttng_event_exclusion *exclusion)
+ struct lttng_event_exclusion *exclusion,
+ struct lttng_map_key *key)
{
return NULL;
}
{
return NULL;
}
-static inline
-int trace_ust_track_pid(struct ltt_ust_session *session, int pid)
+static inline int trace_ust_id_tracker_lookup(
+ enum lttng_process_attr process_attr,
+ struct ltt_ust_session *session,
+ int id)
{
return 0;
}
-static inline
-int trace_ust_untrack_pid(struct ltt_ust_session *session, int pid)
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_set_tracking_policy(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr,
+ enum lttng_tracking_policy policy)
{
- return 0;
+ return LTTNG_OK;
}
-static inline
-int trace_ust_pid_tracker_lookup(struct ltt_ust_session *session, int pid)
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_inclusion_set_add_value(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value)
{
- return 0;
+ return LTTNG_OK;
}
-static inline
-ssize_t trace_ust_list_tracker_pids(struct ltt_ust_session *session,
- int32_t **_pids)
+static inline enum lttng_error_code
+trace_ust_process_attr_tracker_inclusion_set_remove_value(
+ struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr,
+ const struct process_attr_value *value)
+{
+ return LTTNG_OK;
+}
+static inline const struct process_attr_tracker *
+trace_ust_get_process_attr_tracker(struct ltt_ust_session *session,
+ enum lttng_process_attr process_attr)
{
- return -1;
+ return NULL;
}
+
#endif /* HAVE_LIBLTTNG_UST_CTL */
#endif /* _LTT_TRACE_UST_H */
projects / lttng-tools.git / blobdiff