projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Use list rather than ptr array for trace streams
[babeltrace.git]
/
formats
/
lttng-live
/
lttng-live.h
diff --git
a/formats/lttng-live/lttng-live.h
b/formats/lttng-live/lttng-live.h
index 276051dafeb82adf3cfd2bc3559e603964681a59..9739078a52e67278ca3b9d85962700e9a317cfc1 100644
(file)
--- a/
formats/lttng-live/lttng-live.h
+++ b/
formats/lttng-live/lttng-live.h
@@
-26,6
+26,7
@@
#include <stdint.h>
#include <sys/param.h>
#include <stdint.h>
#include <sys/param.h>
+#include <babeltrace/list.h>
#include "lttng-viewer-abi.h"
#define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344
#include "lttng-viewer-abi.h"
#define LTTNG_DEFAULT_NETWORK_VIEWER_PORT 5344
@@
-65,6
+66,9
@@
struct lttng_live_viewer_stream {
struct lttng_live_session *session;
struct lttng_live_ctf_trace *ctf_trace;
struct lttng_viewer_index current_index;
struct lttng_live_session *session;
struct lttng_live_ctf_trace *ctf_trace;
struct lttng_viewer_index current_index;
+ struct bt_list_head session_stream_node; /* Owns stream. */
+ struct bt_list_head trace_stream_node;
+ int in_trace;
char path[PATH_MAX];
};
char path[PATH_MAX];
};
@@
-72,14
+76,16
@@
struct lttng_live_session {
uint64_t live_timer_interval;
uint64_t stream_count;
struct lttng_live_ctx *ctx;
uint64_t live_timer_interval;
uint64_t stream_count;
struct lttng_live_ctx *ctx;
- struct lttng_live_viewer_stream *streams;
+ /* The session stream list owns the lttng_live_viewer_stream object. */
+ struct bt_list_head stream_list;
GHashTable *ctf_traces;
};
struct lttng_live_ctf_trace {
uint64_t ctf_trace_id;
struct lttng_live_viewer_stream *metadata_stream;
GHashTable *ctf_traces;
};
struct lttng_live_ctf_trace {
uint64_t ctf_trace_id;
struct lttng_live_viewer_stream *metadata_stream;
- GPtrArray *streams;
+ /* The trace has a list of streams, but it has no ownership on them. */
+ struct bt_list_head stream_list;
FILE *metadata_fp;
struct bt_trace_handle *handle;
int trace_id;
FILE *metadata_fp;
struct bt_trace_handle *handle;
int trace_id;
This page took
0.024882 seconds
and
4
git commands to generate.