/*
* Copyright 2016 - Philippe Proulx <pproulx@efficios.com>
+ * Copyright 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
* Copyright 2010-2011 - EfficiOS Inc. and Linux Foundation
*
- * Some functions are based on older functions written by Mathieu Desnoyers.
- *
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
#include <inttypes.h>
#include <sys/mman.h>
#include <babeltrace/ctf-ir/stream.h>
-
-#define PRINT_ERR_STREAM ctf_fs->error_fp
-#define PRINT_PREFIX "ctf-fs-data-stream"
-#include "print.h"
-
+#include <babeltrace/plugin/notification/iterator.h>
#include "file.h"
#include "metadata.h"
#include "../common/notif-iter/notif-iter.h"
+#include <assert.h>
+#include "data-stream.h"
-static void ctf_fs_stream_destroy(struct ctf_fs_stream *stream)
-{
- if (stream->file) {
- ctf_fs_file_destroy(stream->file);
- }
-
- if (stream->stream) {
- BT_PUT(stream->stream);
- }
-
- if (stream->notif_iter) {
- bt_ctf_notif_iter_destroy(stream->notif_iter);
- }
-
- g_free(stream);
-}
+#define PRINT_ERR_STREAM ctf_fs->error_fp
+#define PRINT_PREFIX "ctf-fs-data-stream"
+#include "print.h"
-static size_t remaining_mmap_bytes(struct ctf_fs_stream *stream)
+static
+size_t remaining_mmap_bytes(struct ctf_fs_stream *stream)
{
- return stream->mmap_offset + stream->mmap_len -
- stream->request_offset;
+ return stream->mmap_valid_len - stream->request_offset;
}
-static int stream_munmap(struct ctf_fs_stream *stream)
+static
+int stream_munmap(struct ctf_fs_stream *stream)
{
+ int ret = 0;
struct ctf_fs_component *ctf_fs = stream->file->ctf_fs;
if (munmap(stream->mmap_addr, stream->mmap_len)) {
stream->mmap_addr, stream->mmap_len,
stream->file->path->str, stream->file->fp,
strerror(errno));
- return -1;
+ ret = -1;
+ goto end;
}
-
- return 0;
+end:
+ return ret;
}
-static int mmap_next(struct ctf_fs_stream *stream)
+static
+int mmap_next(struct ctf_fs_stream *stream)
{
- struct ctf_fs_component *ctf_fs = stream->file->ctf_fs;
int ret = 0;
+ struct ctf_fs_component *ctf_fs = stream->file->ctf_fs;
/* Unmap old region */
if (stream->mmap_addr) {
goto error;
}
- stream->mmap_offset += stream->mmap_len;
- stream->request_offset = stream->mmap_offset;
+ stream->mmap_offset += stream->mmap_valid_len;
+ stream->request_offset = 0;
}
+ stream->mmap_valid_len = MIN(stream->file->size - stream->mmap_offset,
+ stream->mmap_max_len);
+ /* Round up to next page, assuming page size being a power of 2. */
+ stream->mmap_len = (stream->mmap_valid_len + ctf_fs->page_size - 1)
+ & ~(ctf_fs->page_size - 1);
/* Map new region */
stream->mmap_addr = mmap((void *) 0, stream->mmap_len,
- PROT_READ, MAP_PRIVATE, fileno(stream->file->fp),
- stream->mmap_offset);
+ PROT_READ, MAP_PRIVATE, fileno(stream->file->fp),
+ stream->mmap_offset);
if (stream->mmap_addr == MAP_FAILED) {
PERR("Cannot memory-map address (size %zu) of file \"%s\" (%p) at offset %zu: %s\n",
- stream->mmap_len, stream->file->path->str,
- stream->file->fp, stream->mmap_offset,
- strerror(errno));
+ stream->mmap_len, stream->file->path->str,
+ stream->file->fp, stream->mmap_offset,
+ strerror(errno));
goto error;
}
goto end;
-
error:
stream_munmap(stream);
ret = -1;
-
end:
return ret;
}
-static enum bt_ctf_notif_iter_medium_status medop_request_bytes(
+static
+enum bt_ctf_notif_iter_medium_status medop_request_bytes(
size_t request_sz, uint8_t **buffer_addr,
size_t *buffer_sz, void *data)
{
/* Check if we have at least one memory-mapped byte left */
if (remaining_mmap_bytes(stream) == 0) {
/* Are we at the end of the file? */
- if (stream->request_offset == stream->file->size) {
+ if (stream->request_offset >= stream->file->size) {
PDBG("Reached end of file \"%s\" (%p)\n",
stream->file->path->str, stream->file->fp);
status = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF;
}
*buffer_sz = MIN(remaining_mmap_bytes(stream), request_sz);
- *buffer_addr = ((uint8_t *) stream->mmap_addr) +
- stream->request_offset - stream->mmap_offset;
+ *buffer_addr = ((uint8_t *) stream->mmap_addr) + stream->request_offset;
stream->request_offset += *buffer_sz;
goto end;
return status;
}
-static struct bt_ctf_stream *medop_get_stream(
+static
+struct bt_ctf_stream *medop_get_stream(
struct bt_ctf_stream_class *stream_class, void *data)
{
struct ctf_fs_stream *fs_stream = data;
PDBG("Creating stream out of stream class %" PRId64 "\n", id);
fs_stream->stream = bt_ctf_stream_create(stream_class,
- fs_stream->file->path->str);
+ fs_stream->file->path->str);
if (!fs_stream->stream) {
PERR("Cannot create stream (stream class %" PRId64 ")\n",
- id);
+ id);
}
}
.get_stream = medop_get_stream,
};
-static struct ctf_fs_stream *ctf_fs_stream_create(
+BT_HIDDEN
+struct ctf_fs_stream *ctf_fs_stream_create(
struct ctf_fs_component *ctf_fs, struct ctf_fs_file *file)
{
struct ctf_fs_stream *stream = g_new0(struct ctf_fs_stream, 1);
}
stream->file = file;
- stream->notif_iter = bt_ctf_notif_iter_create(ctf_fs->metadata.trace,
- 12, medops, stream, ctf_fs->error_fp);
+ stream->notif_iter = bt_ctf_notif_iter_create(ctf_fs->metadata->trace,
+ ctf_fs->page_size, medops, stream, ctf_fs->error_fp);
if (!stream->notif_iter) {
goto error;
}
- stream->mmap_len = ctf_fs->page_size;
+ stream->mmap_max_len = ctf_fs->page_size * 2048;
goto end;
-
error:
- /* Do not touch borrowed file */
+ /* Do not touch "borrowed" file. */
stream->file = NULL;
ctf_fs_stream_destroy(stream);
stream = NULL;
-
end:
return stream;
}
-int ctf_fs_data_stream_open_streams(struct ctf_fs_component *ctf_fs)
+BT_HIDDEN
+void ctf_fs_stream_destroy(struct ctf_fs_stream *stream)
{
- int ret = 0;
- GError *error = NULL;
- GDir *dir = g_dir_open(ctf_fs->trace_path->str, 0, &error);
- const char *name;
-
- if (!dir) {
- PERR("Cannot open directory \"%s\": %s (code %d)\n",
- ctf_fs->trace_path->str, error->message,
- error->code);
- goto error;
- }
-
- while ((name = g_dir_read_name(dir))) {
- struct ctf_fs_file *file = NULL;
- struct ctf_fs_stream *stream = NULL;
-
- if (strcmp(name, CTF_FS_METADATA_FILENAME) == 0) {
- /* Ignore the metadata stream */
- PDBG("Ignoring metadata file \"%s\"\n",
- name);
- continue;
- }
-
- if (name[0] == '.') {
- PDBG("Ignoring hidden file \"%s\"\n",
- name);
- continue;
- }
-
- /* Create the file */
- file = ctf_fs_file_create(ctf_fs);
- if (!file) {
- PERR("Cannot create stream file object\n");
- goto error;
- }
-
- /* Create full path string */
- g_string_append(file->path, ctf_fs->trace_path->str);
- g_string_append(file->path, "/");
- g_string_append(file->path, name);
-
- if (!g_file_test(file->path->str, G_FILE_TEST_IS_REGULAR)) {
- PDBG("Ignoring non-regular file \"%s\"\n", name);
- ctf_fs_file_destroy(file);
- continue;
- }
-
- /* Open the file */
- if (ctf_fs_file_open(ctf_fs, file, "rb")) {
- ctf_fs_file_destroy(file);
- goto error;
- }
-
- /* Create a private stream */
- stream = ctf_fs_stream_create(ctf_fs, file);
- if (!stream) {
- ctf_fs_file_destroy(file);
- goto error;
- }
-
- /* Append file to the array of files */
- g_ptr_array_add(ctf_fs->data_stream.streams, stream);
- }
-
- goto end;
-
-error:
- ret = -1;
-
-end:
- if (dir) {
- g_dir_close(dir);
- dir = NULL;
+ if (!stream) {
+ return;
}
- if (error) {
- g_error_free(error);
+ if (stream->file) {
+ ctf_fs_file_destroy(stream->file);
}
- return ret;
-}
-
-int ctf_fs_data_stream_init(struct ctf_fs_component *ctf_fs,
- struct ctf_fs_data_stream *data_stream)
-{
- int ret = 0;
-
- data_stream->streams = g_ptr_array_new_with_free_func(
- (GDestroyNotify) ctf_fs_stream_destroy);
- if (!data_stream->streams) {
- PERR("Cannot allocate array of streams\n");
- goto error;
+ if (stream->stream) {
+ BT_PUT(stream->stream);
}
- goto end;
-
-error:
- ret = -1;
-
-end:
- return ret;
-}
-
-void ctf_fs_data_stream_fini(struct ctf_fs_data_stream *data_stream)
-{
- g_ptr_array_free(data_stream->streams, TRUE);
-}
-
-int ctf_fs_data_stream_get_next_notification(
- struct ctf_fs_component *ctf_fs,
- struct bt_ctf_notif_iter_notif **notification)
-{
- int ret = 0;
- struct ctf_fs_stream *stream = g_ptr_array_index(
- ctf_fs->data_stream.streams, 0);
- enum bt_ctf_notif_iter_status status;
-
- status = bt_ctf_notif_iter_get_next_notification(
- stream->notif_iter, notification);
- if (status != BT_CTF_NOTIF_ITER_STATUS_OK &&
- status != BT_CTF_NOTIF_ITER_STATUS_EOF) {
- goto error;
- }
- if (status == BT_CTF_NOTIF_ITER_STATUS_EOF) {
- *notification = NULL;
+ if (stream->notif_iter) {
+ bt_ctf_notif_iter_destroy(stream->notif_iter);
}
- goto end;
-
-error:
- ret = -1;
-
-end:
- return ret;
+ g_free(stream);
}
projects / babeltrace.git / blobdiff