projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove logically dead code
[babeltrace.git]
/
plugins
/
ctf
/
fs-src
/
metadata.c
diff --git
a/plugins/ctf/fs-src/metadata.c
b/plugins/ctf/fs-src/metadata.c
index 13cc816e124596c3b9560c4bc659decfdec1325d..6ae43df90212d7773d3bf26d0902ff92a62bfe2b 100644
(file)
--- a/
plugins/ctf/fs-src/metadata.c
+++ b/
plugins/ctf/fs-src/metadata.c
@@
-32,50
+32,35
@@
#include <babeltrace/compat/uuid-internal.h>
#include <babeltrace/compat/memstream-internal.h>
#include <babeltrace/compat/uuid-internal.h>
#include <babeltrace/compat/memstream-internal.h>
-#define PRINT_ERR_STREAM ctf_fs->error_fp
-#define PRINT_PREFIX "ctf-fs-metadata"
-#include "print.h"
-
#include "fs.h"
#include "file.h"
#include "metadata.h"
#include "../common/metadata/decoder.h"
#include "fs.h"
#include "file.h"
#include "metadata.h"
#include "../common/metadata/decoder.h"
-#define NSEC_PER_SEC 1000000000LL
+#define BT_LOG_TAG "PLUGIN-CTF-FS-METADATA-SRC"
+#include "logging.h"
BT_HIDDEN
FILE *ctf_fs_metadata_open_file(const char *trace_path)
{
BT_HIDDEN
FILE *ctf_fs_metadata_open_file(const char *trace_path)
{
- GString *metadata_path
= g_string_new(trace_path)
;
+ GString *metadata_path;
FILE *fp = NULL;
FILE *fp = NULL;
+ metadata_path = g_string_new(trace_path);
if (!metadata_path) {
if (!metadata_path) {
- goto e
rror
;
+ goto e
nd
;
}
g_string_append(metadata_path, "/" CTF_FS_METADATA_FILENAME);
fp = fopen(metadata_path->str, "rb");
}
g_string_append(metadata_path, "/" CTF_FS_METADATA_FILENAME);
fp = fopen(metadata_path->str, "rb");
- if (!fp) {
- goto error;
- }
-
- goto end;
-
-error:
- if (fp) {
- fclose(fp);
- fp = NULL;
- }
-
-end:
g_string_free(metadata_path, TRUE);
g_string_free(metadata_path, TRUE);
+end:
return fp;
}
return fp;
}
-static struct ctf_fs_file *get_file(struct ctf_fs_component *ctf_fs,
- const char *trace_path)
+static struct ctf_fs_file *get_file(const char *trace_path)
{
{
- struct ctf_fs_file *file = ctf_fs_file_create(
ctf_fs
);
+ struct ctf_fs_file *file = ctf_fs_file_create();
if (!file) {
goto error;
if (!file) {
goto error;
@@
-84,7
+69,7
@@
static struct ctf_fs_file *get_file(struct ctf_fs_component *ctf_fs,
g_string_append(file->path, trace_path);
g_string_append(file->path, "/" CTF_FS_METADATA_FILENAME);
g_string_append(file->path, trace_path);
g_string_append(file->path, "/" CTF_FS_METADATA_FILENAME);
- if (ctf_fs_file_open(
ctf_fs,
file, "rb")) {
+ if (ctf_fs_file_open(file, "rb")) {
goto error;
}
goto error;
}
@@
-100,37
+85,42
@@
end:
return file;
}
return file;
}
-int ctf_fs_metadata_set_trace(struct ctf_fs_component *ctf_fs)
+int ctf_fs_metadata_set_trace(struct ctf_fs_trace *ctf_fs_trace,
+ struct ctf_fs_metadata_config *config)
{
int ret = 0;
struct ctf_fs_file *file = NULL;
struct ctf_metadata_decoder *metadata_decoder = NULL;
{
int ret = 0;
struct ctf_fs_file *file = NULL;
struct ctf_metadata_decoder *metadata_decoder = NULL;
+ struct ctf_metadata_decoder_config decoder_config = {
+ .clock_class_offset_s = config ? config->clock_class_offset_s : 0,
+ .clock_class_offset_ns = config ? config->clock_class_offset_ns : 0,
+ };
- file = get_file(ctf_fs
, ctf_fs->trace_
path->str);
+ file = get_file(ctf_fs
_trace->
path->str);
if (!file) {
if (!file) {
-
PERR("Cannot create metadata file object\n
");
+
BT_LOGE("Cannot create metadata file object
");
ret = -1;
goto end;
}
ret = -1;
goto end;
}
- metadata_decoder = ctf_metadata_decoder_create(
ctf_fs->error_fp,
- c
tf_fs->options.clock_offset * NSEC_PER_SEC +
- ctf_fs
->options.clock_offset_ns
);
+ metadata_decoder = ctf_metadata_decoder_create(
+ c
onfig ? &decoder_config : NULL,
+ ctf_fs
_trace->name->str
);
if (!metadata_decoder) {
if (!metadata_decoder) {
-
PERR("Cannot create metadata decoder object\n
");
+
BT_LOGE("Cannot create metadata decoder object
");
ret = -1;
goto end;
}
ret = ctf_metadata_decoder_decode(metadata_decoder, file->fp);
if (ret) {
ret = -1;
goto end;
}
ret = ctf_metadata_decoder_decode(metadata_decoder, file->fp);
if (ret) {
-
PERR("Cannot decode metadata file\n
");
+
BT_LOGE("Cannot decode metadata file
");
goto end;
}
goto end;
}
- ctf_fs->metadata->trace = ctf_metadata_decoder_get_trace(
+ ctf_fs
_trace
->metadata->trace = ctf_metadata_decoder_get_trace(
metadata_decoder);
metadata_decoder);
- assert(ctf_fs->metadata->trace);
+ assert(ctf_fs
_trace
->metadata->trace);
end:
ctf_fs_file_destroy(file);
end:
ctf_fs_file_destroy(file);
This page took
0.029337 seconds
and
4
git commands to generate.