projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Create libuuid/libc uuid wrapper"
[lttng-ust.git]
/
liblttng-ust
/
ltt-events.c
diff --git
a/liblttng-ust/ltt-events.c
b/liblttng-ust/ltt-events.c
index b79eea518d1e6852776f28482902bcc1fd337014..c9d35dde199e11929e6307cfe3eb31c1dc272406 100644
(file)
--- a/
liblttng-ust/ltt-events.c
+++ b/
liblttng-ust/ltt-events.c
@@
-13,6
+13,7
@@
#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
#include <urcu/list.h>
#include <urcu/hlist.h>
#include <pthread.h>
+#include <uuid/uuid.h>
#include <errno.h>
#include <sys/shm.h>
#include <sys/ipc.h>
#include <errno.h>
#include <sys/shm.h>
#include <sys/ipc.h>
@@
-35,7
+36,6
@@
#include <helper.h>
#include "error.h"
#include "compat.h"
#include <helper.h>
#include "error.h"
#include "compat.h"
-#include "uuid.h"
#include "tracepoint-internal.h"
#include "ltt-tracer.h"
#include "tracepoint-internal.h"
#include "ltt-tracer.h"
@@
-295,7
+295,6
@@
void synchronize_trace(void)
struct ltt_session *ltt_session_create(void)
{
struct ltt_session *session;
struct ltt_session *ltt_session_create(void)
{
struct ltt_session *session;
- int ret;
session = zmalloc(sizeof(struct ltt_session));
if (!session)
session = zmalloc(sizeof(struct ltt_session));
if (!session)
@@
-303,10
+302,7
@@
struct ltt_session *ltt_session_create(void)
CDS_INIT_LIST_HEAD(&session->chan);
CDS_INIT_LIST_HEAD(&session->events);
CDS_INIT_LIST_HEAD(&session->wildcards);
CDS_INIT_LIST_HEAD(&session->chan);
CDS_INIT_LIST_HEAD(&session->events);
CDS_INIT_LIST_HEAD(&session->wildcards);
- ret = lttng_ust_uuid_generate(session->uuid);
- if (ret != 0) {
- session->uuid[0] = '\0';
- }
+ uuid_generate(session->uuid);
cds_list_add(&session->list, &sessions);
return session;
}
cds_list_add(&session->list, &sessions);
return session;
}
@@
-1091,8
+1087,7
@@
static
int _ltt_session_metadata_statedump(struct ltt_session *session)
{
unsigned char *uuid_c = session->uuid;
int _ltt_session_metadata_statedump(struct ltt_session *session)
{
unsigned char *uuid_c = session->uuid;
- char uuid_s[LTTNG_UST_UUID_STR_LEN],
- clock_uuid_s[LTTNG_UST_UUID_STR_LEN];
+ char uuid_s[37], clock_uuid_s[CLOCK_UUID_LEN];
struct ltt_channel *chan;
struct ltt_event *event;
int ret = 0;
struct ltt_channel *chan;
struct ltt_event *event;
int ret = 0;
This page took
0.026109 seconds
and
4
git commands to generate.