projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use off_t type for lseek function return value to avoid overflow
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
stream.c
diff --git
a/src/bin/lttng-relayd/stream.c
b/src/bin/lttng-relayd/stream.c
index 02bf9dd54995ed2aab6d026ecb578d9127610908..e467cfa6c44e797ad65c4b741f0f2eea43aebf8c 100644
(file)
--- a/
src/bin/lttng-relayd/stream.c
+++ b/
src/bin/lttng-relayd/stream.c
@@
-17,7
+17,6
@@
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <common/common.h>
#include <common/utils.h>
#define _LGPL_SOURCE
#include <common/common.h>
#include <common/utils.h>
@@
-87,7
+86,6
@@
struct relay_stream *stream_create(struct ctf_trace *trace,
stream = zmalloc(sizeof(struct relay_stream));
if (stream == NULL) {
PERROR("relay stream zmalloc");
stream = zmalloc(sizeof(struct relay_stream));
if (stream == NULL) {
PERROR("relay stream zmalloc");
- ret = -1;
goto error_no_alloc;
}
goto error_no_alloc;
}
@@
-307,9
+305,9
@@
static void stream_release(struct urcu_ref *ref)
stream_fd_put(stream->stream_fd);
stream->stream_fd = NULL;
}
stream_fd_put(stream->stream_fd);
stream->stream_fd = NULL;
}
- if (stream->index_f
d
) {
-
stream_fd_put(stream->index_fd
);
- stream->index_f
d
= NULL;
+ if (stream->index_f
ile
) {
+
lttng_index_file_put(stream->index_file
);
+ stream->index_f
ile
= NULL;
}
if (stream->trace) {
ctf_trace_put(stream->trace);
}
if (stream->trace) {
ctf_trace_put(stream->trace);
@@
-346,7
+344,15
@@
void stream_put(struct relay_stream *stream)
void try_stream_close(struct relay_stream *stream)
{
void try_stream_close(struct relay_stream *stream)
{
+ bool session_aborted;
+ struct relay_session *session = stream->trace->session;
+
DBG("Trying to close stream %" PRIu64, stream->stream_handle);
DBG("Trying to close stream %" PRIu64, stream->stream_handle);
+
+ pthread_mutex_lock(&session->lock);
+ session_aborted = session->aborted;
+ pthread_mutex_unlock(&session->lock);
+
pthread_mutex_lock(&stream->lock);
/*
* Can be called concurently by connection close and reception of last
pthread_mutex_lock(&stream->lock);
/*
* Can be called concurently by connection close and reception of last
@@
-388,7
+394,8
@@
void try_stream_close(struct relay_stream *stream)
}
if (stream->last_net_seq_num != -1ULL &&
}
if (stream->last_net_seq_num != -1ULL &&
- ((int64_t) (stream->prev_seq - stream->last_net_seq_num)) < 0) {
+ ((int64_t) (stream->prev_seq - stream->last_net_seq_num)) < 0
+ && !session_aborted) {
/*
* Don't close since we still have data pending. This
* handles cases where an explicit close command has
/*
* Don't close since we still have data pending. This
* handles cases where an explicit close command has
@@
-447,6
+454,10
@@
void print_relay_streams(void)
struct lttng_ht_iter iter;
struct relay_stream *stream;
struct lttng_ht_iter iter;
struct relay_stream *stream;
+ if (!relay_streams_ht) {
+ return;
+ }
+
rcu_read_lock();
cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
node.node) {
rcu_read_lock();
cds_lfht_for_each_entry(relay_streams_ht->ht, &iter.iter, stream,
node.node) {
This page took
0.024822 seconds
and
4
git commands to generate.