#include <sys/ipc.h>
#include <stdint.h>
#include <stddef.h>
+#include <inttypes.h>
+#include <time.h>
+#include "clock.h"
#include <urcu-bp.h>
#include <urcu/compiler.h>
{
struct cds_hlist_head *head;
struct ust_pending_probe *e;
- size_t name_len = strlen(name) + 1;
- uint32_t hash = jhash(name, name_len - 1, 0);
+ size_t name_len = strlen(name);
+ uint32_t hash;
+ if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) {
+ WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN - 1);
+ name_len = LTTNG_UST_SYM_NAME_LEN - 1;
+ }
+ hash = jhash(name, name_len, 0);
head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
e = zmalloc(sizeof(struct ust_pending_probe) + name_len);
if (!e)
return -ENOMEM;
- memcpy(&e->name[0], name, name_len);
+ memcpy(&e->name[0], name, name_len + 1);
+ e->name[name_len] = '\0';
cds_hlist_add_head(&e->node, head);
e->event = event;
event->pending_probe = e;
struct cds_hlist_node *node, *p;
struct ust_pending_probe *e;
const char *name = desc->name;
- size_t name_len = strlen(name) + 1;
- uint32_t hash = jhash(name, name_len - 1, 0);
int ret = 0;
struct lttng_ust_event event_param;
+ size_t name_len = strlen(name);
+ uint32_t hash;
/*
* For this event, we need to lookup the loglevel. If active (in
}
}
+ if (name_len > LTTNG_UST_SYM_NAME_LEN - 1) {
+ WARN("Truncating tracepoint name %s which exceeds size limits of %u chars", name, LTTNG_UST_SYM_NAME_LEN - 1);
+ name_len = LTTNG_UST_SYM_NAME_LEN - 1;
+ }
+ hash = jhash(name, name_len, 0);
head = &pending_probe_table[hash & (PENDING_PROBE_HASH_SIZE - 1)];
cds_hlist_for_each_entry_safe(e, node, p, head, node) {
struct ltt_event *event;
struct ltt_channel *chan;
- if (strcmp(name, e->name))
+ if (strncmp(name, e->name, LTTNG_UST_SYM_NAME_LEN - 1))
continue;
event = e->event;
chan = event->chan;
size_t subbuf_size, size_t num_subbuf,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
- int *shm_fd, int *wait_fd,
- uint64_t *memory_map_size,
+ int **shm_fd, int **wait_fd,
+ uint64_t **memory_map_size,
struct ltt_channel *chan_priv_init)
{
struct ltt_channel *chan = NULL;
* creation). Might require a hash if we have lots of events.
*/
cds_list_for_each_entry(event, &chan->session->events, list) {
- if (event->desc && !strcmp(event->desc->name, event_param->name)) {
+ if (event->desc && !strncmp(event->desc->name,
+ event_param->name,
+ LTTNG_UST_SYM_NAME_LEN - 1)) {
ret = -EEXIST;
goto exist;
}
{
return lttng_metadata_printf(session,
"struct packet_context {\n"
- " uint64_t timestamp_begin;\n"
- " uint64_t timestamp_end;\n"
+ " uint64_clock_monotonic_t timestamp_begin;\n"
+ " uint64_clock_monotonic_t timestamp_end;\n"
" uint32_t events_discarded;\n"
" uint32_t content_size;\n"
" uint32_t packet_size;\n"
" enum : uint5_t { compact = 0 ... 30, extended = 31 } id;\n"
" variant <id> {\n"
" struct {\n"
- " uint27_t timestamp;\n"
+ " uint27_clock_monotonic_t timestamp;\n"
" } compact;\n"
" struct {\n"
" uint32_t id;\n"
- " uint64_t timestamp;\n"
+ " uint64_clock_monotonic_t timestamp;\n"
" } extended;\n"
" } v;\n"
"} align(%u);\n"
" enum : uint16_t { compact = 0 ... 65534, extended = 65535 } id;\n"
" variant <id> {\n"
" struct {\n"
- " uint32_t timestamp;\n"
+ " uint32_clock_monotonic_t timestamp;\n"
" } compact;\n"
" struct {\n"
" uint32_t id;\n"
- " uint64_t timestamp;\n"
+ " uint64_clock_monotonic_t timestamp;\n"
" } extended;\n"
" } v;\n"
"} align(%u);\n\n",
);
}
+/*
+ * Approximation of NTP time of day to clock monotonic correlation,
+ * taken at start of trace.
+ * Yes, this is only an approximation. Yes, we can (and will) do better
+ * in future versions.
+ */
+static
+uint64_t measure_clock_offset(void)
+{
+ uint64_t offset, monotonic[2], realtime;
+ struct timespec rts = { 0, 0 };
+ int ret;
+
+ monotonic[0] = trace_clock_read64();
+ ret = clock_gettime(CLOCK_REALTIME, &rts);
+ if (ret < 0)
+ return 0;
+ monotonic[1] = trace_clock_read64();
+ offset = (monotonic[0] + monotonic[1]) >> 1;
+ realtime = rts.tv_sec * 1000000000ULL;
+ realtime += rts.tv_nsec;
+ offset = realtime - offset;
+ return offset;
+}
+
/*
* Output metadata into this session's metadata buffers.
*/
if (ret)
goto end;
+ ret = lttng_metadata_printf(session,
+ "clock {\n"
+ " name = %s;\n"
+ " uuid = %s;\n"
+ " description = \"Monotonic Clock\";\n"
+ " freq = %" PRIu64 "; /* Frequency, in Hz */\n"
+ " /* clock value offset from Epoch is: offset * (1/freq) */\n"
+ " offset = %" PRIu64 ";\n"
+ "};\n\n",
+ "monotonic",
+ trace_clock_uuid(),
+ trace_clock_freq(),
+ measure_clock_offset()
+ );
+ if (ret)
+ goto end;
+
+ ret = lttng_metadata_printf(session,
+ "typealias integer {\n"
+ " size = 27; align = 1; signed = false;\n"
+ " map = clock.monotonic.value;\n"
+ "} := uint27_clock_monotonic_t;\n"
+ "\n"
+ "typealias integer {\n"
+ " size = 32; align = %u; signed = false;\n"
+ " map = clock.monotonic.value;\n"
+ "} := uint32_clock_monotonic_t;\n"
+ "\n"
+ "typealias integer {\n"
+ " size = 64; align = %u; signed = false;\n"
+ " map = clock.monotonic.value;\n"
+ "} := uint64_clock_monotonic_t;\n\n",
+ lttng_alignof(uint32_t) * CHAR_BIT,
+ lttng_alignof(uint64_t) * CHAR_BIT
+ );
+ if (ret)
+ goto end;
+
ret = _ltt_stream_packet_context_declare(session);
if (ret)
goto end;
projects / lttng-ust.git / blobdiff