projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename struct lttng_event to struct lttng_ust_event_recorder
[lttng-ust.git]
/
liblttng-ust-ctl
/
ustctl.c
diff --git
a/liblttng-ust-ctl/ustctl.c
b/liblttng-ust-ctl/ustctl.c
index a149e9d6ba6d875878f4a15860820d9e9d8a19d3..041434bda666a524814749c5ee8390474e520d89 100644
(file)
--- a/
liblttng-ust-ctl/ustctl.c
+++ b/
liblttng-ust-ctl/ustctl.c
@@
-15,8
+15,8
@@
#include <lttng/ust-config.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
#include <lttng/ust-config.h>
#include <lttng/ust-ctl.h>
#include <lttng/ust-abi.h>
-#include <lttng/ust-events.h>
#include <lttng/ust-endian.h>
#include <lttng/ust-endian.h>
+
#include <usterr-signal-safe.h>
#include <ust-comm.h>
#include <ust-helper.h>
#include <usterr-signal-safe.h>
#include <ust-comm.h>
#include <ust-helper.h>
@@
-24,6
+24,7
@@
#include "../libringbuffer/backend.h"
#include "../libringbuffer/frontend.h"
#include "../libringbuffer/backend.h"
#include "../libringbuffer/frontend.h"
+#include "../liblttng-ust/ust-events-internal.h"
#include "../liblttng-ust/wait.h"
#include "../liblttng-ust/lttng-rb-clients.h"
#include "../liblttng-ust/clock.h"
#include "../liblttng-ust/wait.h"
#include "../liblttng-ust/lttng-rb-clients.h"
#include "../liblttng-ust/clock.h"
@@
-71,6
+72,7
@@
struct ustctl_counter_attr {
uint32_t nr_dimensions;
int64_t global_sum_step;
struct ustctl_counter_dimension dimensions[USTCTL_COUNTER_ATTR_DIMENSION_MAX];
uint32_t nr_dimensions;
int64_t global_sum_step;
struct ustctl_counter_dimension dimensions[USTCTL_COUNTER_ATTR_DIMENSION_MAX];
+ bool coalesce_hits;
};
/*
};
/*
@@
-1998,7
+2000,7
@@
int ustctl_get_instance_id(struct ustctl_consumer_stream *stream,
return client_cb->instance_id(buf, handle, id);
}
return client_cb->instance_id(buf, handle, id);
}
-#ifdef
LTTNG_UST_
HAVE_PERF_EVENT
+#ifdef HAVE_PERF_EVENT
int ustctl_has_perf_counters(void)
{
int ustctl_has_perf_counters(void)
{
@@
-2567,7
+2569,8
@@
struct ustctl_daemon_counter *
const int *counter_cpu_fds,
enum ustctl_counter_bitness bitness,
enum ustctl_counter_arithmetic arithmetic,
const int *counter_cpu_fds,
enum ustctl_counter_bitness bitness,
enum ustctl_counter_arithmetic arithmetic,
- uint32_t alloc_flags)
+ uint32_t alloc_flags,
+ bool coalesce_hits)
{
const char *transport_name;
struct ustctl_daemon_counter *counter;
{
const char *transport_name;
struct ustctl_daemon_counter *counter;
@@
-2633,6
+2636,7
@@
struct ustctl_daemon_counter *
counter->attr->arithmetic = arithmetic;
counter->attr->nr_dimensions = nr_dimensions;
counter->attr->global_sum_step = global_sum_step;
counter->attr->arithmetic = arithmetic;
counter->attr->nr_dimensions = nr_dimensions;
counter->attr->global_sum_step = global_sum_step;
+ counter->attr->coalesce_hits = coalesce_hits;
for (i = 0; i < nr_dimensions; i++)
counter->attr->dimensions[i] = dimensions[i];
for (i = 0; i < nr_dimensions; i++)
counter->attr->dimensions[i] = dimensions[i];
@@
-2688,6
+2692,7
@@
int ustctl_create_counter_data(struct ustctl_daemon_counter *counter,
}
counter_conf.number_dimensions = counter->attr->nr_dimensions;
counter_conf.global_sum_step = counter->attr->global_sum_step;
}
counter_conf.number_dimensions = counter->attr->nr_dimensions;
counter_conf.global_sum_step = counter->attr->global_sum_step;
+ counter_conf.coalesce_hits = counter->attr->coalesce_hits;
for (i = 0; i < counter->attr->nr_dimensions; i++) {
counter_conf.dimensions[i].size = counter->attr->dimensions[i].size;
counter_conf.dimensions[i].underflow_index = counter->attr->dimensions[i].underflow_index;
for (i = 0; i < counter->attr->nr_dimensions; i++) {
counter_conf.dimensions[i].size = counter->attr->dimensions[i].size;
counter_conf.dimensions[i].underflow_index = counter->attr->dimensions[i].underflow_index;
This page took
0.032522 seconds
and
4
git commands to generate.