projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Markers: remove channel name from trace_mark()
[ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index e42c0f4e7873ff1f0f1a178fcda6f2c04d051eef..e84a35aecf4e3f979d4cb85163b89e3204ccf45c 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-41,7
+41,7
@@
#include <ust/tracectl.h>
#include <ust/clock.h>
#include "tracer.h"
#include <ust/tracectl.h>
#include <ust/clock.h>
#include "tracer.h"
-#include "usterr.h"
+#include "usterr
_signal_safe
.h"
#include "ustcomm.h"
#include "buffers.h"
#include "marker-control.h"
#include "ustcomm.h"
#include "buffers.h"
#include "marker-control.h"
@@
-1221,37
+1221,41
@@
static void auto_probe_connect(struct marker *m)
static struct ustcomm_sock * init_app_socket(int epoll_fd)
{
static struct ustcomm_sock * init_app_socket(int epoll_fd)
{
- char *name;
+ char *
dir_name, *sock_
name;
int result;
int result;
- struct ustcomm_sock *sock;
+ struct ustcomm_sock *sock
= NULL
;
- result = asprintf(&name, "%s/%d", SOCK_DIR, (int)getpid());
+ dir_name = ustcomm_user_sock_dir();
+ if (!dir_name)
+ return NULL;
+
+ result = asprintf(&sock_name, "%s/%d", dir_name, (int)getpid());
if (result < 0) {
ERR("string overflow allocating socket name, "
"UST thread bailing");
if (result < 0) {
ERR("string overflow allocating socket name, "
"UST thread bailing");
-
return NULL
;
+
goto free_dir_name
;
}
}
- result = ensure_dir_exists(
SOCK_DIR
);
+ result = ensure_dir_exists(
dir_name, S_IRWXU
);
if (result == -1) {
ERR("Unable to create socket directory %s, UST thread bailing",
if (result == -1) {
ERR("Unable to create socket directory %s, UST thread bailing",
-
SOCK_DIR
);
- goto free_name;
+
dir_name
);
+ goto free_
sock_
name;
}
}
- sock = ustcomm_init_named_socket(name, epoll_fd);
+ sock = ustcomm_init_named_socket(
sock_
name, epoll_fd);
if (!sock) {
ERR("Error initializing named socket (%s). Check that directory"
if (!sock) {
ERR("Error initializing named socket (%s). Check that directory"
- "exists and that it is writable. UST thread bailing", name);
- goto free_name;
+ "exists and that it is writable. UST thread bailing",
sock_
name);
+ goto free_
sock_
name;
}
}
- free(name);
- return sock;
+free_sock_name:
+ free(sock_name);
+free_dir_name:
+ free(dir_name);
-free_name:
- free(name);
- return NULL;
+ return sock;
}
static void __attribute__((constructor)) init()
}
static void __attribute__((constructor)) init()
@@
-1572,7
+1576,7
@@
static void __attribute__((destructor)) keepalive()
void ust_potential_exec(void)
{
void ust_potential_exec(void)
{
- trace_mark(
ust,
potential_exec, MARK_NOARGS);
+ trace_mark(potential_exec, MARK_NOARGS);
DBG("test");
DBG("test");
@@
-1591,7
+1595,6
@@
void ust_potential_exec(void)
static void ust_fork(void)
{
static void ust_fork(void)
{
- struct ust_buffer *buf, *buf_tmp;
struct ustcomm_sock *sock, *sock_tmp;
struct ust_trace *trace, *trace_tmp;
int result;
struct ustcomm_sock *sock, *sock_tmp;
struct ust_trace *trace, *trace_tmp;
int result;
This page took
0.025719 seconds
and
4
git commands to generate.