#include <lttng/event-rule/event-rule.h>
#include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/tracepoint.h>
+#include <lttng/event-rule/jul-logging.h>
+#include <lttng/event-rule/log4j-logging.h>
+#include <lttng/event-rule/python-logging.h>
#include <lttng/condition/condition.h>
-#include <lttng/condition/event-rule.h>
+#include <lttng/condition/event-rule-matches.h>
#include <lttng/domain-internal.h>
+#include <lttng/log-level-rule-internal.h>
#include <common/common.h>
#include <common/sessiond-comm/agent.h>
#define AGENT_RET_CODE_INDEX(code) (code - AGENT_RET_CODE_SUCCESS)
+typedef enum lttng_event_rule_status (*event_rule_logging_get_name_pattern)(
+ const struct lttng_event_rule *rule, const char **pattern);
+typedef enum lttng_event_rule_status (*event_rule_logging_get_log_level_rule)(
+ const struct lttng_event_rule *rule,
+ const struct lttng_log_level_rule **log_level_rule);
+
/*
* Agent application context representation.
*/
rcu_read_lock();
- cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+ cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
node.node) {
if (app->domain != domain) {
continue;
rcu_read_lock();
- cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+ cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
node.node) {
struct agent_app_ctx *agent_ctx;
rcu_read_lock();
- cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+ cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
node.node) {
if (app->domain != domain) {
continue;
rcu_read_lock();
DBG2("Disabling agent application context %s:%s",
ctx->provider_name, ctx->ctx_name);
- cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+ cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
node.node) {
if (app->domain != domain) {
continue;
}
rcu_read_lock();
- cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, app,
+ cds_lfht_for_each_entry(the_agent_apps_ht_by_sock->ht, &iter.iter, app,
node.node) {
ssize_t nb_ev;
struct lttng_event *agent_events;
assert(sock >= 0);
- lttng_ht_lookup(agent_apps_ht_by_sock, (void *)((unsigned long) sock), &iter);
+ lttng_ht_lookup(the_agent_apps_ht_by_sock,
+ (void *) ((unsigned long) sock), &iter);
node = lttng_ht_iter_get_node_ulong(&iter);
if (node == NULL) {
goto error;
assert(app);
DBG3("Agent adding app sock: %d and pid: %d to ht", app->sock->fd, app->pid);
- lttng_ht_add_unique_ulong(agent_apps_ht_by_sock, &app->node);
+ lttng_ht_add_unique_ulong(the_agent_apps_ht_by_sock, &app->node);
}
/*
DBG3("Agent deleting app pid: %d and sock: %d", app->pid, app->sock->fd);
iter.iter.node = &app->node.node;
- ret = lttng_ht_del(agent_apps_ht_by_sock, &iter);
+ ret = lttng_ht_del(the_agent_apps_ht_by_sock, &iter);
assert(!ret);
}
*/
struct agent_event *agent_create_event(const char *name,
enum lttng_loglevel_type loglevel_type, int loglevel_value,
- struct lttng_filter_bytecode *filter, char *filter_expression)
+ struct lttng_bytecode *filter, char *filter_expression)
{
struct agent_event *event = NULL;
const struct lttng_event_rule *rule;
const char *name;
const char *filter_expression;
+ const struct lttng_log_level_rule *log_level_rule;
/* Unused when loglevel_type is 'ALL'. */
int loglevel_value = 0;
enum lttng_loglevel_type loglevel_type;
+ event_rule_logging_get_name_pattern logging_get_name_pattern;
+ event_rule_logging_get_log_level_rule logging_get_log_level_rule;
assert(agt);
assert(agt->events);
condition = lttng_trigger_get_const_condition(trigger);
assert(lttng_condition_get_type(condition) ==
- LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
+ LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
- c_status = lttng_condition_event_rule_get_rule(condition, &rule);
+ c_status = lttng_condition_event_rule_matches_get_rule(
+ condition, &rule);
assert(c_status == LTTNG_CONDITION_STATUS_OK);
- assert(lttng_event_rule_get_type(rule) ==
- LTTNG_EVENT_RULE_TYPE_TRACEPOINT);
+ switch (lttng_event_rule_get_type(rule)) {
+ case LTTNG_EVENT_RULE_TYPE_JUL_LOGGING:
+ logging_get_name_pattern =
+ lttng_event_rule_jul_logging_get_name_pattern;
+ logging_get_log_level_rule =
+ lttng_event_rule_jul_logging_get_log_level_rule;
+ break;
+ case LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING:
+ logging_get_name_pattern =
+ lttng_event_rule_log4j_logging_get_name_pattern;
+ logging_get_log_level_rule =
+ lttng_event_rule_log4j_logging_get_log_level_rule;
+ break;
+ case LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING:
+ logging_get_name_pattern =
+ lttng_event_rule_python_logging_get_name_pattern;
+ logging_get_log_level_rule =
+ lttng_event_rule_python_logging_get_log_level_rule;
+ break;
+ default:
+ abort();
+ break;
+ }
domain = lttng_event_rule_get_domain_type(rule);
assert(domain == LTTNG_DOMAIN_JUL || domain == LTTNG_DOMAIN_LOG4J ||
domain == LTTNG_DOMAIN_PYTHON);
- /* Get the event's pattern ('name' in the legacy terminology). */
- er_status = lttng_event_rule_tracepoint_get_pattern(rule, &name);
+ /* Get the event's pattern name ('name' in the legacy terminology). */
+ er_status = logging_get_name_pattern(rule, &name);
assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
/* Get the internal filter expression. */
filter_expression = lttng_event_rule_get_filter(rule);
- er_status = lttng_event_rule_tracepoint_get_log_level_type(
- rule, &loglevel_type);
- assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
-
- if (loglevel_type != LTTNG_EVENT_LOGLEVEL_ALL) {
- er_status = lttng_event_rule_tracepoint_get_log_level(
- rule, &loglevel_value);
- assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
+ /* Map log_level_rule to loglevel value. */
+ er_status = logging_get_log_level_rule(rule, &log_level_rule);
+ if (er_status == LTTNG_EVENT_RULE_STATUS_UNSET) {
+ loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+ loglevel_value = 0;
+ } else if (er_status == LTTNG_EVENT_RULE_STATUS_OK) {
+ lttng_log_level_rule_to_loglevel(log_level_rule, &loglevel_type, &loglevel_value);
+ } else {
+ abort();
}
return agent_find_event(name, loglevel_type, loglevel_value,
*/
int agent_app_ht_alloc(void)
{
- agent_apps_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
- return agent_apps_ht_by_sock ? 0 : -1;
+ the_agent_apps_ht_by_sock = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
+ return the_agent_apps_ht_by_sock ? 0 : -1;
}
/*
struct lttng_ht_node_ulong *node;
struct lttng_ht_iter iter;
- if (!agent_apps_ht_by_sock) {
+ if (!the_agent_apps_ht_by_sock) {
return;
}
rcu_read_lock();
- cds_lfht_for_each_entry(agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
+ cds_lfht_for_each_entry(
+ the_agent_apps_ht_by_sock->ht, &iter.iter, node, node) {
struct agent_app *app;
app = caa_container_of(node, struct agent_app, node);
}
rcu_read_unlock();
- lttng_ht_destroy(agent_apps_ht_by_sock);
+ lttng_ht_destroy(the_agent_apps_ht_by_sock);
}
/*
*/
int agent_by_event_notifier_domain_ht_create(void)
{
- trigger_agents_ht_by_domain = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
- return trigger_agents_ht_by_domain ? 0 : -1;
+ the_trigger_agents_ht_by_domain = lttng_ht_new(0, LTTNG_HT_TYPE_U64);
+ return the_trigger_agents_ht_by_domain ? 0 : -1;
}
/*
struct lttng_ht_node_u64 *node;
struct lttng_ht_iter iter;
- if (!trigger_agents_ht_by_domain) {
+ if (!the_trigger_agents_ht_by_domain) {
return;
}
rcu_read_lock();
- cds_lfht_for_each_entry (trigger_agents_ht_by_domain->ht, &iter.iter,
- node, node) {
+ cds_lfht_for_each_entry(the_trigger_agents_ht_by_domain->ht,
+ &iter.iter, node, node) {
struct agent *agent =
caa_container_of(node, struct agent, node);
const int ret = lttng_ht_del(
- trigger_agents_ht_by_domain, &iter);
+ the_trigger_agents_ht_by_domain, &iter);
assert(ret == 0);
agent_destroy(agent);
}
rcu_read_unlock();
- lttng_ht_destroy(trigger_agents_ht_by_domain);
+ lttng_ht_destroy(the_trigger_agents_ht_by_domain);
}
struct agent *agent_find_by_event_notifier_domain(
struct lttng_ht_iter iter;
const uint64_t key = (uint64_t) domain_type;
- assert(trigger_agents_ht_by_domain);
+ assert(the_trigger_agents_ht_by_domain);
DBG3("Per-event notifier domain agent lookup for domain '%s'",
lttng_domain_type_str(domain_type));
- lttng_ht_lookup(trigger_agents_ht_by_domain, &key, &iter);
+ lttng_ht_lookup(the_trigger_agents_ht_by_domain, &key, &iter);
node = lttng_ht_iter_get_node_u64(&iter);
if (!node) {
goto end;
projects / lttng-tools.git / blobdiff