projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save and restore error in ctf_fs_iterator_next, muxer_msg_iter_do_next
[babeltrace.git]
/
src
/
plugins
/
ctf
/
fs-src
/
fs.h
diff --git
a/src/plugins/ctf/fs-src/fs.h
b/src/plugins/ctf/fs-src/fs.h
index 33e1f5685d701367bddbcd9d5fc54ece59acecf9..a6594b1c234ab603e9998349cf0ec794ccac55e6 100644
(file)
--- a/
src/plugins/ctf/fs-src/fs.h
+++ b/
src/plugins/ctf/fs-src/fs.h
@@
-29,7
+29,7
@@
*/
#include <stdbool.h>
*/
#include <stdbool.h>
-#include "common/
babeltrace
.h"
+#include "common/
macros
.h"
#include <babeltrace2/babeltrace.h>
#include "data-stream-file.h"
#include "metadata.h"
#include <babeltrace2/babeltrace.h>
#include "data-stream-file.h"
#include "metadata.h"
@@
-39,6
+39,11
@@
BT_HIDDEN
extern bool ctf_fs_debug;
struct ctf_fs_file {
extern bool ctf_fs_debug;
struct ctf_fs_file {
+ bt_logging_level log_level;
+
+ /* Weak */
+ bt_self_component *self_comp;
+
/* Owned by this */
GString *path;
/* Owned by this */
GString *path;
@@
-58,8
+63,6
@@
struct ctf_fs_metadata {
/* Weak (owned by `decoder` above) */
struct ctf_trace_class *tc;
/* Weak (owned by `decoder` above) */
struct ctf_trace_class *tc;
- /* Owned by this */
-
/* Owned by this */
char *text;
/* Owned by this */
char *text;
@@
-67,19
+70,28
@@
struct ctf_fs_metadata {
};
struct ctf_fs_component {
};
struct ctf_fs_component {
- /* Weak, guaranteed to exist */
- bt_self_component_source *self_comp;
+ bt_logging_level log_level;
/* Array of struct ctf_fs_port_data *, owned by this */
GPtrArray *port_data;
/* Array of struct ctf_fs_port_data *, owned by this */
GPtrArray *port_data;
- /*
Array of struct ctf_fs_trace *, o
wned by this */
-
GPtrArray *traces
;
+ /*
O
wned by this */
+
struct ctf_fs_trace *trace
;
struct ctf_fs_metadata_config metadata_config;
};
struct ctf_fs_trace {
struct ctf_fs_metadata_config metadata_config;
};
struct ctf_fs_trace {
+ bt_logging_level log_level;
+
+ /*
+ * Weak. These are mostly used to generate log messages or to append
+ * error causes. They are mutually exclusive, only one of them must be
+ * set.
+ */
+ bt_self_component *self_comp;
+ bt_self_component_class *self_comp_class;
+
/* Owned by this */
struct ctf_fs_metadata *metadata;
/* Owned by this */
struct ctf_fs_metadata *metadata;
@@
-92,14
+104,14
@@
struct ctf_fs_trace {
/* Owned by this */
GString *path;
/* Owned by this */
GString *path;
- /* Owned by this */
- GString *name;
-
/* Next automatic stream ID when not provided by packet header */
uint64_t next_stream_id;
};
struct ctf_fs_ds_index_entry {
/* Next automatic stream ID when not provided by packet header */
uint64_t next_stream_id;
};
struct ctf_fs_ds_index_entry {
+ /* Weak, belongs to ctf_fs_ds_file_info. */
+ const char *path;
+
/* Position, in bytes, of the packet from the beginning of the file. */
uint64_t offset;
/* Position, in bytes, of the packet from the beginning of the file. */
uint64_t offset;
@@
-120,7
+132,7
@@
struct ctf_fs_ds_index_entry {
};
struct ctf_fs_ds_index {
};
struct ctf_fs_ds_index {
- /* Array of pointer to struct ctf_fs_
fd
_index_entry. */
+ /* Array of pointer to struct ctf_fs_
ds
_index_entry. */
GPtrArray *entries;
};
GPtrArray *entries;
};
@@
-149,12
+161,7
@@
struct ctf_fs_ds_file_group {
struct ctf_fs_trace *ctf_fs_trace;
/*
struct ctf_fs_trace *ctf_fs_trace;
/*
- * Owned by this. May be NULL.
- *
- * A stream cannot be assumed to be indexed as the indexing might have
- * been skipped. Moreover, the index's fields may not all be available
- * depending on the producer (e.g. timestamp_begin/end are not
- * mandatory).
+ * Owned by this.
*/
struct ctf_fs_ds_index *index;
};
*/
struct ctf_fs_ds_index *index;
};
@@
-168,8
+175,13
@@
struct ctf_fs_port_data {
};
struct ctf_fs_msg_iter_data {
};
struct ctf_fs_msg_iter_data {
+ bt_logging_level log_level;
+
+ /* Weak */
+ bt_self_component *self_comp;
+
/* Weak */
/* Weak */
- bt_self_message_iterator *
pc
_msg_iter;
+ bt_self_message_iterator *
self
_msg_iter;
/* Weak, belongs to ctf_fs_trace */
struct ctf_fs_ds_file_group *ds_file_group;
/* Weak, belongs to ctf_fs_trace */
struct ctf_fs_ds_file_group *ds_file_group;
@@
-181,27
+193,37
@@
struct ctf_fs_msg_iter_data {
size_t ds_file_info_index;
/* Owned by this */
size_t ds_file_info_index;
/* Owned by this */
- struct bt_msg_iter *msg_iter;
+ struct ctf_msg_iter *msg_iter;
+
+ /*
+ * Saved error. If we hit an error in the _next method, but have some
+ * messages ready to return, we save the error here and return it on
+ * the next _next call.
+ */
+ bt_component_class_message_iterator_next_method_status next_saved_status;
+ const struct bt_error *next_saved_error;
};
BT_HIDDEN
};
BT_HIDDEN
-bt_
self_component
_status ctf_fs_init(
+bt_
component_class_initialize_method
_status ctf_fs_init(
bt_self_component_source *source,
bt_self_component_source *source,
+ bt_self_component_source_configuration *config,
const bt_value *params, void *init_method_data);
BT_HIDDEN
void ctf_fs_finalize(bt_self_component_source *component);
BT_HIDDEN
const bt_value *params, void *init_method_data);
BT_HIDDEN
void ctf_fs_finalize(bt_self_component_source *component);
BT_HIDDEN
-bt_
query
_status ctf_fs_query(
+bt_
component_class_query_method
_status ctf_fs_query(
bt_self_component_class_source *comp_class,
bt_self_component_class_source *comp_class,
-
const bt_query_executor *
query_exec,
+
bt_private_query_executor *priv_
query_exec,
const char *object, const bt_value *params,
const char *object, const bt_value *params,
- const bt_value **result);
+
void *method_data,
const bt_value **result);
BT_HIDDEN
BT_HIDDEN
-bt_
self_message_iterator
_status ctf_fs_iterator_init(
+bt_
component_class_message_iterator_initialize_method
_status ctf_fs_iterator_init(
bt_self_message_iterator *self_msg_iter,
bt_self_message_iterator *self_msg_iter,
+ bt_self_message_iterator_configuration *config,
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port);
bt_self_component_source *self_comp,
bt_self_component_port_output *self_port);
@@
-209,30
+231,40
@@
BT_HIDDEN
void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
BT_HIDDEN
void ctf_fs_iterator_finalize(bt_self_message_iterator *it);
BT_HIDDEN
-bt_
self_message_iterator
_status ctf_fs_iterator_next(
+bt_
component_class_message_iterator_next_method
_status ctf_fs_iterator_next(
bt_self_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
BT_HIDDEN
bt_self_message_iterator *iterator,
bt_message_array_const msgs, uint64_t capacity,
uint64_t *count);
BT_HIDDEN
-bt_
self_message_iterator
_status ctf_fs_iterator_seek_beginning(
+bt_
component_class_message_iterator_seek_beginning_method
_status ctf_fs_iterator_seek_beginning(
bt_self_message_iterator *message_iterator);
/* Create and initialize a new, empty ctf_fs_component. */
BT_HIDDEN
bt_self_message_iterator *message_iterator);
/* Create and initialize a new, empty ctf_fs_component. */
BT_HIDDEN
-struct ctf_fs_component *ctf_fs_component_create(void);
+struct ctf_fs_component *ctf_fs_component_create(bt_logging_level log_level,
+ bt_self_component *self_comp);
/*
/*
- * Search recursively under all paths in `paths_value` (an array of strings),
- * for CTF traces. For each CTF trace found, create a ctf_fs_trace in
- * `ctf_fs` representing that trace.
+ * Create one `struct ctf_fs_trace` from one trace, or multiple traces sharing
+ * the same UUID.
+ *
+ * `paths_value` must be an array of strings,
+ *
+ * The created `struct ctf_fs_trace` is assigned to `ctf_fs->trace`.
+ *
+ * `self_comp` and `self_comp_class` are used for logging, only one of them
+ * should be set.
*/
BT_HIDDEN
*/
BT_HIDDEN
-int ctf_fs_component_create_ctf_fs_trace
s(bt_self_component_source *self_comp,
+int ctf_fs_component_create_ctf_fs_trace
(
struct ctf_fs_component *ctf_fs,
struct ctf_fs_component *ctf_fs,
- const bt_value *paths_value);
+ const bt_value *paths_value,
+ const bt_value *trace_name_value,
+ bt_self_component *self_comp,
+ bt_self_component_class *self_comp_class);
/* Free `ctf_fs` and everything it owns. */
/* Free `ctf_fs` and everything it owns. */
@@
-245,13
+277,22
@@
void ctf_fs_destroy(struct ctf_fs_component *ctf_fs);
* - The mandatory `paths` parameter is returned in `*paths`.
* - The optional `clock-class-offset-s` and `clock-class-offset-ns`, if
* present, are recorded in the `ctf_fs` structure.
* - The mandatory `paths` parameter is returned in `*paths`.
* - The optional `clock-class-offset-s` and `clock-class-offset-ns`, if
* present, are recorded in the `ctf_fs` structure.
+ * - The optional `trace-name` parameter is returned in `*trace_name` if
+ * present, else `*trace_name` is set to NULL.
+ *
+ * `self_comp` and `self_comp_class` are used for logging, only one of them
+ * should be set.
*
* Return true on success, false if any parameter didn't pass validation.
*/
BT_HIDDEN
bool read_src_fs_parameters(const bt_value *params,
*
* Return true on success, false if any parameter didn't pass validation.
*/
BT_HIDDEN
bool read_src_fs_parameters(const bt_value *params,
- const bt_value **paths, struct ctf_fs_component *ctf_fs);
+ const bt_value **paths,
+ const bt_value **trace_name,
+ struct ctf_fs_component *ctf_fs,
+ bt_self_component *self_comp,
+ bt_self_component_class *self_comp_class);
/*
* Generate the port name to be used for a given data stream file group.
/*
* Generate the port name to be used for a given data stream file group.
This page took
0.026533 seconds
and
4
git commands to generate.