mirror of https://github.com/trapexit/mergerfs.git
Browse Source
Merge pull request #1143 from trapexit/rework-read
Merge pull request #1143 from trapexit/rework-read
Rework fuse read to use same buffers as messagespull/1145/head
trapexit
2 years ago
committed by
GitHub
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 188 additions and 202 deletions
-
4libfuse/include/fuse.h
-
16libfuse/include/fuse_lowlevel.h
-
111libfuse/lib/fuse.c
-
21libfuse/lib/fuse_lowlevel.c
-
38src/fs_pread.hpp
-
70src/fuse_read.cpp
-
8src/fuse_read.hpp
-
98src/fuse_read_buf.cpp
-
4src/mergerfs.cpp
@ -0,0 +1,38 @@ |
|||
/*
|
|||
ISC License |
|||
|
|||
Copyright (c) 2023, Antonio SJ Musumeci <trapexit@spawn.link> |
|||
|
|||
Permission to use, copy, modify, and/or distribute this software for any |
|||
purpose with or without fee is hereby granted, provided that the above |
|||
copyright notice and this permission notice appear in all copies. |
|||
|
|||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
|||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
|||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
|||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
|||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
|||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|||
*/ |
|||
|
|||
#pragma once
|
|||
|
|||
#include <unistd.h>
|
|||
|
|||
namespace fs |
|||
{ |
|||
static |
|||
int |
|||
pread(const int fd_, |
|||
void *buf_, |
|||
const size_t count_, |
|||
const off_t offset_) |
|||
{ |
|||
int rv; |
|||
|
|||
rv = ::pread(fd_,buf_,count_,offset_); |
|||
|
|||
return ((rv == -1) ? -errno : rv); |
|||
} |
|||
} |
|||
@ -0,0 +1,70 @@ |
|||
/*
|
|||
Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link> |
|||
|
|||
Permission to use, copy, modify, and/or distribute this software for any |
|||
purpose with or without fee is hereby granted, provided that the above |
|||
copyright notice and this permission notice appear in all copies. |
|||
|
|||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
|||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
|||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
|||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
|||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
|||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|||
*/ |
|||
|
|||
#include "errno.hpp"
|
|||
#include "fileinfo.hpp"
|
|||
#include "fs_pread.hpp"
|
|||
|
|||
#include "fuse.h"
|
|||
|
|||
#include <stdlib.h>
|
|||
#include <string.h>
|
|||
|
|||
typedef struct fuse_bufvec fuse_bufvec; |
|||
|
|||
|
|||
namespace l |
|||
{ |
|||
static |
|||
int |
|||
read(const int fd_, |
|||
char *buf_, |
|||
const size_t size_, |
|||
const off_t offset_) |
|||
{ |
|||
int rv; |
|||
|
|||
rv = fs::pread(fd_,buf_,size_,offset_); |
|||
|
|||
return rv; |
|||
} |
|||
} |
|||
|
|||
namespace FUSE |
|||
{ |
|||
int |
|||
read(const fuse_file_info_t *ffi_, |
|||
char *buf_, |
|||
size_t size_, |
|||
off_t offset_) |
|||
{ |
|||
FileInfo *fi = reinterpret_cast<FileInfo*>(ffi_->fh); |
|||
|
|||
return l::read(fi->fd, |
|||
buf_, |
|||
size_, |
|||
offset_); |
|||
} |
|||
|
|||
int |
|||
read_null(const fuse_file_info_t *ffi_, |
|||
char *buf_, |
|||
size_t size_, |
|||
off_t offset_) |
|||
{ |
|||
return size_; |
|||
} |
|||
} |
|||
@ -1,98 +0,0 @@ |
|||
/*
|
|||
Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link> |
|||
|
|||
Permission to use, copy, modify, and/or distribute this software for any |
|||
purpose with or without fee is hereby granted, provided that the above |
|||
copyright notice and this permission notice appear in all copies. |
|||
|
|||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
|||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
|||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
|||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
|||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
|||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
|||
*/ |
|||
|
|||
#include "errno.hpp"
|
|||
#include "fileinfo.hpp"
|
|||
|
|||
#include "fuse.h"
|
|||
|
|||
#include <stdlib.h>
|
|||
#include <string.h>
|
|||
|
|||
typedef struct fuse_bufvec fuse_bufvec; |
|||
|
|||
|
|||
namespace l |
|||
{ |
|||
static |
|||
int |
|||
read_buf(const int fd_, |
|||
fuse_bufvec **bufp_, |
|||
const size_t size_, |
|||
const off_t offset_) |
|||
{ |
|||
fuse_bufvec *src; |
|||
|
|||
src = (fuse_bufvec*)malloc(sizeof(fuse_bufvec)); |
|||
if(src == NULL) |
|||
return -ENOMEM; |
|||
|
|||
*src = FUSE_BUFVEC_INIT(size_); |
|||
|
|||
src->buf->flags = (fuse_buf_flags)(FUSE_BUF_IS_FD|FUSE_BUF_FD_SEEK|FUSE_BUF_FD_RETRY); |
|||
src->buf->fd = fd_; |
|||
src->buf->pos = offset_; |
|||
|
|||
*bufp_ = src; |
|||
|
|||
return 0; |
|||
} |
|||
} |
|||
|
|||
namespace FUSE |
|||
{ |
|||
int |
|||
read_buf(const fuse_file_info_t *ffi_, |
|||
fuse_bufvec **bufp_, |
|||
size_t size_, |
|||
off_t offset_) |
|||
{ |
|||
FileInfo *fi = reinterpret_cast<FileInfo*>(ffi_->fh); |
|||
|
|||
return l::read_buf(fi->fd, |
|||
bufp_, |
|||
size_, |
|||
offset_); |
|||
} |
|||
|
|||
int |
|||
read_buf_null(const fuse_file_info_t *ffi_, |
|||
fuse_bufvec **bufp_, |
|||
size_t size_, |
|||
off_t offset_) |
|||
{ |
|||
void *mem; |
|||
struct fuse_bufvec *buf; |
|||
|
|||
buf = (struct fuse_bufvec*)malloc(sizeof(struct fuse_bufvec)); |
|||
if(buf == NULL) |
|||
return -ENOMEM; |
|||
|
|||
mem = (void*)calloc(1,size_); |
|||
if(mem == NULL) |
|||
{ |
|||
free(buf); |
|||
return -ENOMEM; |
|||
} |
|||
|
|||
*buf = FUSE_BUFVEC_INIT(size_); |
|||
buf->buf[0].mem = mem; |
|||
|
|||
*bufp_ = buf; |
|||
|
|||
return 0; |
|||
} |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue