Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use mode parameter only in open call #612

Merged
merged 1 commit into from
May 31, 2024
Merged

Use mode parameter only in open call #612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions blosc/blosc2-stdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,21 +145,25 @@ void *blosc2_stdio_mmap_open(const char *urlpath, const char *mode, void* params
if (strcmp(mmap_file->mode, "r") == 0) {
mmap_file->access_flags = PAGE_READONLY;
mmap_file->map_flags = FILE_MAP_READ;
mmap_file->is_memory_only = false;
open_mode = "rb";
use_initial_mapping_size = false;
} else if (strcmp(mmap_file->mode, "r+") == 0) {
mmap_file->access_flags = PAGE_READWRITE;
mmap_file->map_flags = FILE_MAP_WRITE;
mmap_file->is_memory_only = false;
open_mode = "rb+";
use_initial_mapping_size = true;
} else if (strcmp(mmap_file->mode, "w+") == 0) {
mmap_file->access_flags = PAGE_READWRITE;
mmap_file->map_flags = FILE_MAP_WRITE;
mmap_file->is_memory_only = false;
open_mode = "wb+";
use_initial_mapping_size = true;
} else if (strcmp(mmap_file->mode, "c") == 0) {
mmap_file->access_flags = PAGE_WRITECOPY;
mmap_file->map_flags = FILE_MAP_COPY;
mmap_file->is_memory_only = true;
open_mode = "rb";
use_initial_mapping_size = false;
} else {
Expand All @@ -172,21 +176,25 @@ void *blosc2_stdio_mmap_open(const char *urlpath, const char *mode, void* params
if (strcmp(mmap_file->mode, "r") == 0) {
mmap_file->access_flags = PROT_READ;
mmap_file->map_flags = MAP_SHARED;
mmap_file->is_memory_only = false;
open_mode = "rb";
use_initial_mapping_size = false;
} else if (strcmp(mmap_file->mode, "r+") == 0) {
mmap_file->access_flags = PROT_READ | PROT_WRITE;
mmap_file->map_flags = MAP_SHARED;
mmap_file->is_memory_only = false;
open_mode = "rb+";
use_initial_mapping_size = true;
} else if (strcmp(mmap_file->mode, "w+") == 0) {
mmap_file->access_flags = PROT_READ | PROT_WRITE;
mmap_file->map_flags = MAP_SHARED;
mmap_file->is_memory_only = false;
open_mode = "wb+";
use_initial_mapping_size = true;
} else if (strcmp(mmap_file->mode, "c") == 0) {
mmap_file->access_flags = PROT_READ | PROT_WRITE;
mmap_file->map_flags = MAP_PRIVATE;
mmap_file->is_memory_only = true;
open_mode = "rb";
use_initial_mapping_size = true;
} else {
Expand Down Expand Up @@ -258,7 +266,7 @@ void *blosc2_stdio_mmap_open(const char *urlpath, const char *mode, void* params
mmap_file->addr = mmap(
NULL, mmap_file->mapping_size, mmap_file->access_flags, mmap_file->map_flags, mmap_file->fd, offset);
if (mmap_file->addr == MAP_FAILED) {
BLOSC_TRACE_ERROR("Memory mapping failed for file %s.", urlpath);
BLOSC_TRACE_ERROR("Memory mapping failed for file %s (error: %s).", urlpath, strerror(errno));
return NULL;
}
#endif
Expand All @@ -269,6 +277,12 @@ void *blosc2_stdio_mmap_open(const char *urlpath, const char *mode, void* params
mmap_file->mode,
mmap_file->mapping_size
);

/* The mmap_file->mode parameter is only available during the opening call and cannot be used in any of the other
I/O functions since this string is managed by the caller (e.g., from Python) and the memory of the string may not
be available anymore at a later point. */
mmap_file->mode = NULL;

return mmap_file;
}

Expand Down Expand Up @@ -349,7 +363,7 @@ int64_t blosc2_stdio_mmap_write(const void *ptr, int64_t size, int64_t nitems, i
if (mmap_file->file_size < new_size) {
mmap_file->file_size = new_size;

if (strcmp(mmap_file->mode, "c") != 0) {
if (!mmap_file->is_memory_only) {
int rc = ftruncate(mmap_file->fd, new_size);
if (rc < 0) {
BLOSC_TRACE_ERROR("Cannot extend the file size to %" PRId64 " bytes (error: %s).", new_size, strerror(errno));
Expand All @@ -367,7 +381,7 @@ int64_t blosc2_stdio_mmap_write(const void *ptr, int64_t size, int64_t nitems, i
is no POSIX standard and only available on Linux */
char* new_address = mremap(mmap_file->addr, old_mapping_size, mmap_file->mapping_size, MREMAP_MAYMOVE);
#else
if (strcmp(mmap_file->mode, "c") == 0) {
if (mmap_file->is_memory_only) {
BLOSC_TRACE_ERROR("Remapping a memory-mapping in c mode is only possible on Linux."
"Please specify either a different mode or set initial_mapping_size to a large enough number.");
return 0;
Expand Down Expand Up @@ -431,7 +445,7 @@ int blosc2_stdio_mmap_truncate(void *stream, int64_t size) {
mmap_file->file_size = size;

/* No file operations in c mode */
if (strcmp(mmap_file->mode, "c") == 0) {
if (mmap_file->is_memory_only) {
return 0;
}

Expand Down
4 changes: 3 additions & 1 deletion include/blosc2/blosc2-stdio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ typedef struct {
//!< The size of the file.
int64_t mapping_size;
//!< The size of the mapping (mapping_size >= file_size).
bool is_memory_only;
//!< Whether the mapping is only in-memory and changes are not reflected to the file on disk (c mode).
FILE* file;
//!< The underlying file handle.
int fd;
Expand All @@ -93,7 +95,7 @@ typedef struct {
* @brief Default struct for memory-mapped I/O for user initialization.
*/
static const blosc2_stdio_mmap BLOSC2_STDIO_MMAP_DEFAULTS = {
"r", (1 << 30), false, NULL, NULL, -1, -1, NULL, -1, -1, -1
"r", (1 << 30), false, NULL, NULL, -1, -1, false, NULL, -1, -1, -1
#if defined(_WIN32)
, INVALID_HANDLE_VALUE
#endif
Expand Down