/*
- * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
- * Copyright (C) 2011-2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License 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.
+ * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*/
#include <stdint.h>
uint32_t nr_dimensions;
int64_t global_sum_step;
struct ustctl_counter_dimension dimensions[USTCTL_COUNTER_ATTR_DIMENSION_MAX];
+ bool coalesce_hits;
};
/*
case LTTNG_UST_OBJECT_TYPE_CONTEXT:
case LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER_GROUP:
case LTTNG_UST_OBJECT_TYPE_EVENT_NOTIFIER:
+ case LTTNG_UST_OBJECT_TYPE_COUNTER_EVENT:
break;
case LTTNG_UST_OBJECT_TYPE_COUNTER:
free(data->u.counter.data);
/* Send struct lttng_ust_event_notifier */
len = ustcomm_send_unix_sock(sock, event_notifier, sizeof(*event_notifier));
if (len != sizeof(*event_notifier)) {
+ free(event_notifier_data);
if (len < 0)
return len;
else
}
#elif defined(__FreeBSD__)
#include <sys/ucred.h>
+#include <sys/un.h>
/*
* Override application uid/gid with unix socket credentials. Use the
}
DBG("Unix socket peercred [ uid: %u, gid: %u ], "
"application registered claiming [ pid: %d, ppid: %d, uid: %u, gid: %u ]",
- xucred.uid, xucred.cr_groups[0],
+ xucred.cr_uid, xucred.cr_groups[0],
reg_msg->pid, reg_msg->ppid, reg_msg->uid, reg_msg->gid);
*pid = reg_msg->pid;
*ppid = reg_msg->ppid;
- *uid = xucred.uid;
+ *uid = xucred.cr_uid;
*gid = xucred.cr_groups[0];
return 0;
}
char **signature,
size_t *nr_fields,
struct ustctl_field **fields,
- char **model_emf_uri)
+ char **model_emf_uri,
+ uint64_t *user_token)
{
ssize_t len;
struct ustcomm_notify_event_msg msg;
*loglevel = msg.loglevel;
signature_len = msg.signature_len;
fields_len = msg.fields_len;
+ *user_token = msg.user_token;
if (fields_len % sizeof(*a_fields) != 0) {
return -EINVAL;
* Returns 0 on success, negative error value on error.
*/
int ustctl_reply_register_event(int sock,
- uint32_t id,
+ uint32_t event_id,
+ uint64_t counter_index,
int ret_code)
{
ssize_t len;
memset(&reply, 0, sizeof(reply));
reply.header.notify_cmd = USTCTL_NOTIFY_CMD_EVENT;
reply.r.ret_code = ret_code;
- reply.r.event_id = id;
+ reply.r.event_id = event_id;
+ reply.r.counter_index = counter_index;
len = ustcomm_send_unix_sock(sock, &reply, sizeof(reply));
if (len > 0 && len != sizeof(reply))
return -EIO;
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;
struct lttng_counter_transport *transport;
- struct lttng_counter_dimension ust_dim[LTTNG_COUNTER_DIMENSION_MAX];
- size_t i;
+ struct lttng_ust_counter_dimension ust_dim[LTTNG_COUNTER_DIMENSION_MAX];
+ size_t counter_len[LTTNG_COUNTER_DIMENSION_MAX], i;
if (nr_dimensions > LTTNG_COUNTER_DIMENSION_MAX)
return NULL;
return NULL;
}
+ for (i = 0; i < nr_dimensions; i++) {
+ if (dimensions[i].has_underflow)
+ return NULL;
+ if (dimensions[i].has_overflow)
+ return NULL;
+ counter_len[i] = ust_dim[i].size = dimensions[i].size;
+ }
+
counter = zmalloc(sizeof(*counter));
if (!counter)
return NULL;
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++) {
- ust_dim[i].size = dimensions[i].size;
- ust_dim[i].underflow_index = dimensions[i].underflow_index;
- ust_dim[i].overflow_index = dimensions[i].overflow_index;
- ust_dim[i].has_underflow = dimensions[i].has_underflow;
- ust_dim[i].has_overflow = dimensions[i].has_overflow;
- }
counter->counter = transport->ops.counter_create(nr_dimensions,
- ust_dim, global_sum_step, global_counter_fd,
+ counter_len, global_sum_step, global_counter_fd,
nr_counter_cpu_fds, counter_cpu_fds, true);
if (!counter->counter)
goto free_attr;
}
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;
return ret;
}
+int ustctl_counter_create_event(int sock,
+ struct lttng_ust_counter_event *counter_event,
+ struct lttng_ust_object_data *counter_data,
+ struct lttng_ust_object_data **_counter_event_data)
+{
+ struct ustcomm_ust_msg lum;
+ struct ustcomm_ust_reply lur;
+ struct lttng_ust_object_data *counter_event_data;
+ ssize_t len;
+ int ret;
+
+ if (!counter_data || !_counter_event_data)
+ return -EINVAL;
+
+ counter_event_data = zmalloc(sizeof(*counter_event_data));
+ if (!counter_event_data)
+ return -ENOMEM;
+ counter_event_data->type = LTTNG_UST_OBJECT_TYPE_COUNTER_EVENT;
+ memset(&lum, 0, sizeof(lum));
+ lum.handle = counter_data->handle;
+ lum.cmd = LTTNG_UST_COUNTER_EVENT;
+ lum.u.counter_event.len = sizeof(*counter_event);
+ ret = ustcomm_send_app_msg(sock, &lum);
+ if (ret) {
+ free(counter_event_data);
+ return ret;
+ }
+ /* Send struct lttng_ust_counter_event */
+ len = ustcomm_send_unix_sock(sock, counter_event, sizeof(*counter_event));
+ if (len != sizeof(*counter_event)) {
+ free(counter_event_data);
+ if (len < 0)
+ return len;
+ else
+ return -EIO;
+ }
+ ret = ustcomm_recv_app_reply(sock, &lur, lum.handle, lum.cmd);
+ if (ret) {
+ free(counter_event_data);
+ return ret;
+ }
+ counter_event_data->handle = lur.ret_val;
+ DBG("received counter event handle %u", counter_event_data->handle);
+ *_counter_event_data = counter_event_data;
+ return 0;
+}
+
int ustctl_counter_read(struct ustctl_daemon_counter *counter,
const size_t *dimension_indexes,
int cpu, int64_t *value,
projects / deliverable / lttng-ust.git / blobdiff