projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change benign WARN()s to DBG()s
[lttng-ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index c34a3ce4ad3f673393ef3df9da5f89baa965d7e8..5d06f28264a18d4c69b991afbfd25f32700c4a90 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-17,6
+17,7
@@
#define _GNU_SOURCE
#include <stdio.h>
#define _GNU_SOURCE
#include <stdio.h>
+#include <stdlib.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
#include <stdint.h>
#include <signal.h>
#include <sys/types.h>
@@
-26,8
+27,7
@@
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
#include <fcntl.h>
#include <poll.h>
#include <regex.h>
-
-#include <urcu-bp.h>
+#include <urcu/uatomic_arch.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
#include <ust/marker.h>
#include <ust/tracectl.h>
@@
-125,15
+125,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)
{
@@
-241,9
+232,13
@@
void process_blocked_consumers(void)
continue;
}
if(result == 0) {
continue;
}
if(result == 0) {
+ int res;
DBG("PRODUCER END");
DBG("PRODUCER END");
- close(bc->fd_producer);
+ res = close(bc->fd_producer);
+ if(res == -1) {
+ PERROR("close");
+ }
list_del(&bc->list);
list_del(&bc->list);
@@
-357,10
+352,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);
}
@@
-662,7
+654,7
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
if(trace == NULL) {
int result;
if(trace == NULL) {
int result;
-
WARN
("Cannot find trace. It was likely destroyed by the user.");
+
DBG
("Cannot find trace. It was likely destroyed by the user.");
result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
@@
-695,6
+687,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(uatomic_read(&buf->consumed) == 0) {
+ DBG("decrementing buffers_to_export");
+ buffers_to_export--;
+ }
+
break;
}
}
break;
}
}
@@
-761,7
+761,7
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
trace = _ltt_trace_find(trace_name);
if(trace == NULL) {
trace = _ltt_trace_find(trace_name);
if(trace == NULL) {
-
WARN
("Cannot find trace. It was likely destroyed by the user.");
+
DBG
("Cannot find trace. It was likely destroyed by the user.");
result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
@@
-823,8
+823,6
@@
void *listener_main(void *p)
{
int result;
{
int result;
- ust_register_thread();
-
DBG("LISTENER");
for(;;) {
DBG("LISTENER");
for(;;) {
@@
-1186,16
+1184,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");
@@
-1425,7
+1415,7
@@
static void __attribute__((destructor)) keepalive()
destroy_traces();
destroy_traces();
- ustcomm_fini_app(&ustcomm_app);
+ ustcomm_fini_app(&ustcomm_app
, 0
);
}
void ust_potential_exec(void)
}
void ust_potential_exec(void)
@@
-1473,6
+1463,10
@@
static void ust_fork(void)
list_del(&bc->list);
}
list_del(&bc->list);
}
+ /* free app, keeping socket file */
+ ustcomm_fini_app(&ustcomm_app, 1);
+
+ buffers_to_export = 0;
have_listener = 0;
init_socket();
create_listener();
have_listener = 0;
init_socket();
create_listener();
This page took
0.026467 seconds
and
4
git commands to generate.