projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up all use of /dev/stderr for portability to busybox /bin/sh
[ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index f59edd35902eacd94c7b8c52bbead9f397a753d5..96053b7b523773000560b70a86a2b717056005a5 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"
@@
-77,8
+77,6
@@
static struct ustcomm_sock *listen_sock;
extern struct chan_info_struct chan_infos[];
extern struct chan_info_struct chan_infos[];
-static struct cds_list_head open_buffers_list = CDS_LIST_HEAD_INIT(open_buffers_list);
-
static struct cds_list_head ust_socks = CDS_LIST_HEAD_INIT(ust_socks);
/* volatile because shared between the listener and the main thread */
static struct cds_list_head ust_socks = CDS_LIST_HEAD_INIT(ust_socks);
/* volatile because shared between the listener and the main thread */
@@
-489,11
+487,6
@@
static int notify_buffer_mapped(const char *trace_name,
CMM_STORE_SHARED(buffers_to_export, CMM_LOAD_SHARED(buffers_to_export)-1);
}
CMM_STORE_SHARED(buffers_to_export, CMM_LOAD_SHARED(buffers_to_export)-1);
}
- /* The buffer has been exported, ergo, we can add it to the
- * list of open buffers
- */
- cds_list_add(&buf->open_buffers_list, &open_buffers_list);
-
unlock_traces:
ltt_unlock_traces();
unlock_traces:
ltt_unlock_traces();
@@
-1228,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()
@@
-1598,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;
@@
-1622,12
+1618,6
@@
static void ust_fork(void)
ustcomm_del_sock(sock, 1);
}
ustcomm_del_sock(sock, 1);
}
- /* Delete all blocked consumers */
- cds_list_for_each_entry_safe(buf, buf_tmp, &open_buffers_list,
- open_buffers_list) {
- cds_list_del(&buf->open_buffers_list);
- }
-
/*
* FIXME: This could be prettier, we loop over the list twice and
* following good locking practice should lock around the loop
/*
* FIXME: This could be prettier, we loop over the list twice and
* following good locking practice should lock around the loop
This page took
0.027553 seconds
and
4
git commands to generate.