projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update TODO
[lttng-ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index 3cb86edc80180f535e8a5773d8413ee11032db64..57218a6bd62765b217a27338104b1cbb88a21061 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-27,8
+27,6
@@
#include <poll.h>
#include <regex.h>
#include <poll.h>
#include <regex.h>
-#include <urcu-bp.h>
-
#include <ust/marker.h>
#include <ust/tracectl.h>
#include "tracer.h"
#include <ust/marker.h>
#include <ust/tracectl.h>
#include "tracer.h"
@@
-125,15
+123,6
@@
static void print_markers(FILE *fp)
static int init_socket(void);
static int init_socket(void);
-/* This needs to be called whenever a new thread is created. It notifies
- * liburcu of the new thread.
- */
-
-void ust_register_thread(void)
-{
- rcu_register_thread();
-}
-
int fd_notif = -1;
void notif_cb(void)
{
int fd_notif = -1;
void notif_cb(void)
{
@@
-357,10
+346,7
@@
static int do_cmd_get_shmid(const char *recvbuf, struct ustcomm_source *src)
}
}
}
}
- if(found) {
- buffers_to_export--;
- }
- else {
+ if(!found) {
ERR("channel not found (%s)", channel_and_cpu);
}
ERR("channel not found (%s)", channel_and_cpu);
}
@@
-695,6
+681,14
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
list_add(&bc->list, &blocked_consumers);
list_add(&bc->list, &blocked_consumers);
+ /* Being here is the proof the daemon has mapped the buffer in its
+ * memory. We may now decrement buffers_to_export.
+ */
+ if(atomic_long_read(&buf->consumed) == 0) {
+ DBG("decrementing buffers_to_export");
+ buffers_to_export--;
+ }
+
break;
}
}
break;
}
}
@@
-823,8
+817,6
@@
void *listener_main(void *p)
{
int result;
{
int result;
- ust_register_thread();
-
DBG("LISTENER");
for(;;) {
DBG("LISTENER");
for(;;) {
@@
-964,7
+956,7
@@
void *listener_main(void *p)
DBG("trace destroy");
DBG("trace destroy");
- result = ltt_trace_destroy(trace_name);
+ result = ltt_trace_destroy(trace_name
, 0
);
if(result < 0) {
ERR("ltt_trace_destroy failed");
return (void *)1;
if(result < 0) {
ERR("ltt_trace_destroy failed");
return (void *)1;
@@
-1186,16
+1178,8
@@
static void __attribute__((constructor)) init()
*/
pidunique = make_pidunique();
*/
pidunique = make_pidunique();
- /* Initialize RCU in case the constructor order is not good. */
- rcu_init();
-
- /* It is important to do this before events start to be generated. */
- ust_register_thread();
-
DBG("Tracectl constructor");
DBG("Tracectl constructor");
- /* Must create socket before signal handler to prevent races.
- */
result = init_socket();
if(result == -1) {
ERR("init_socket error");
result = init_socket();
if(result == -1) {
ERR("init_socket error");
@@
-1348,7
+1332,7
@@
static void destroy_traces(void)
ERR("ltt_trace_stop error");
}
ERR("ltt_trace_stop error");
}
- result = ltt_trace_destroy("auto");
+ result = ltt_trace_destroy("auto"
, 0
);
if(result == -1) {
ERR("ltt_trace_destroy error");
}
if(result == -1) {
ERR("ltt_trace_destroy error");
}
@@
-1453,9
+1437,14
@@
static void ust_fork(void)
struct blocked_consumer *deletable_bc = NULL;
int result;
struct blocked_consumer *deletable_bc = NULL;
int result;
+ /* FIXME: technically, the locks could have been taken before the fork */
DBG("ust: forking");
DBG("ust: forking");
+
+ /* break lock if necessary */
+ ltt_unlock_traces();
+
ltt_trace_stop("auto");
ltt_trace_stop("auto");
- ltt_trace_destroy("auto");
+ ltt_trace_destroy("auto"
, 1
);
/* Delete all active connections */
ustcomm_close_all_connections(&ustcomm_app.server);
/* Delete all active connections */
ustcomm_close_all_connections(&ustcomm_app.server);
@@
-1468,9
+1457,12
@@
static void ust_fork(void)
list_del(&bc->list);
}
list_del(&bc->list);
}
+ ustcomm_free_app(&ustcomm_app);
+
+ buffers_to_export = 0;
have_listener = 0;
have_listener = 0;
- create_listener();
init_socket();
init_socket();
+ create_listener();
ltt_trace_setup("auto");
result = ltt_trace_set_type("auto", "ustrelay");
if(result < 0) {
ltt_trace_setup("auto");
result = ltt_trace_set_type("auto", "ustrelay");
if(result < 0) {
This page took
0.035157 seconds
and
4
git commands to generate.