projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve keepalive by changing the location of the unconnected buffers counter
[lttng-ust.git]
/
libust
/
tracectl.c
diff --git
a/libust/tracectl.c
b/libust/tracectl.c
index d4cb3efbcb7a97b5963106143b37640090b38822..916b3548eee3de1f953713159c44794431c9874f 100644
(file)
--- a/
libust/tracectl.c
+++ b/
libust/tracectl.c
@@
-357,10
+357,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);
}
@@
-509,7
+506,7
@@
static int do_cmd_get_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
return retval;
}
return retval;
}
-unsigned int poweroftwo(unsigned int x)
+
static
unsigned int poweroftwo(unsigned int x)
{
unsigned int power2 = 1;
unsigned int hardcoded = 2147483648; /* FIX max 2^31 */
{
unsigned int power2 = 1;
unsigned int hardcoded = 2147483648; /* FIX max 2^31 */
@@
-552,7
+549,6
@@
static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
- ltt_unlock_traces();
retval = -1;
goto end;
}
retval = -1;
goto end;
}
@@
-573,9
+569,8
@@
static int do_cmd_set_subbuf_size(const char *recvbuf, struct ustcomm_source *sr
ERR("unable to find channel");
}
ERR("unable to find channel");
}
- ltt_unlock_traces();
-
end:
end:
+ ltt_unlock_traces();
return retval;
}
return retval;
}
@@
-608,7
+603,6
@@
static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
trace = _ltt_trace_find_setup(trace_name);
if(trace == NULL) {
ERR("cannot find trace!");
- ltt_unlock_traces();
retval = -1;
goto end;
}
retval = -1;
goto end;
}
@@
-629,9
+623,8
@@
static int do_cmd_set_subbuf_num(const char *recvbuf, struct ustcomm_source *src
ERR("unable to find channel");
}
ERR("unable to find channel");
}
- ltt_unlock_traces();
-
end:
end:
+ ltt_unlock_traces();
return retval;
}
return retval;
}
@@
-662,24
+655,19
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
- ltt_unlock_traces();
if(trace == NULL) {
if(trace == NULL) {
- char *reply;
int result;
WARN("Cannot find trace. It was likely destroyed by the user.");
int result;
WARN("Cannot find trace. It was likely destroyed by the user.");
- asprintf(&reply, "%s", "NOTFOUND");
- result = ustcomm_send_reply(&ustcomm_app.server, reply, src);
+ result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
if(result) {
ERR("ustcomm_send_reply failed");
- free(reply);
retval = -1;
retval = -1;
- goto
free_short_chan_name
;
+ goto
unlock_traces
;
}
}
- free(reply);
- goto free_short_chan_name;
+ goto unlock_traces;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-694,7
+682,7
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer));
if(bc == NULL) {
ERR("malloc returned NULL");
bc = (struct blocked_consumer *) malloc(sizeof(struct blocked_consumer));
if(bc == NULL) {
ERR("malloc returned NULL");
- goto
free_short_chan_name
;
+ goto
unlock_traces
;
}
bc->fd_consumer = src->fd;
bc->fd_producer = buf->data_ready_fd_read;
}
bc->fd_consumer = src->fd;
bc->fd_producer = buf->data_ready_fd_read;
@@
-704,6
+692,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;
}
}
@@
-711,6
+707,9
@@
static int do_cmd_get_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ERR("unable to find channel");
}
ERR("unable to find channel");
}
+ unlock_traces:
+ ltt_unlock_traces();
+
free_short_chan_name:
free(ch_name);
free_short_chan_name:
free(ch_name);
@@
-765,21
+764,17
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
ltt_lock_traces();
trace = _ltt_trace_find(trace_name);
- ltt_unlock_traces();
if(trace == NULL) {
WARN("Cannot find trace. It was likely destroyed by the user.");
if(trace == NULL) {
WARN("Cannot find trace. It was likely destroyed by the user.");
- asprintf(&reply, "%s", "NOTFOUND");
- result = ustcomm_send_reply(&ustcomm_app.server, reply, src);
+ result = ustcomm_send_reply(&ustcomm_app.server, "NOTFOUND", src);
if(result) {
ERR("ustcomm_send_reply failed");
if(result) {
ERR("ustcomm_send_reply failed");
- free(reply);
retval = -1;
retval = -1;
- goto
free_short_chan_name
;
+ goto
unlock_traces
;
}
}
- free(reply);
- goto free_short_chan_name;
+ goto unlock_traces;
}
for(i=0; i<trace->nr_channels; i++) {
}
for(i=0; i<trace->nr_channels; i++) {
@@
-805,7
+800,7
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ERR("ustcomm_send_reply failed");
free(reply);
retval = -1;
ERR("ustcomm_send_reply failed");
free(reply);
retval = -1;
- goto
free_channel_and_cpu
;
+ goto
unlock_traces
;
}
free(reply);
}
free(reply);
@@
-816,6
+811,8
@@
static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
ERR("unable to find channel");
}
ERR("unable to find channel");
}
+ unlock_traces:
+ ltt_unlock_traces();
free_short_chan_name:
free(ch_name);
free_consumed_old_str:
free_short_chan_name:
free(ch_name);
free_consumed_old_str:
@@
-972,7
+969,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;
@@
-1356,7
+1353,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");
}
@@
-1461,9
+1458,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);
@@
-1477,8
+1479,8
@@
static void ust_fork(void)
}
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.028612 seconds
and
4
git commands to generate.