mirror of https://github.com/trapexit/mergerfs.git
Browse Source
Remove splicing features
Remove splicing features
After numerous tests it was found the splice features were at best the same performance as standard IO and at worse actually slower. To simplify the code all splice features are removed.pull/1142/head
Antonio SJ Musumeci
2 years ago
15 changed files with 114 additions and 746 deletions
-
23README.md
-
11libfuse/ecfd/tests/HAVE_SPLICE.c
-
12libfuse/ecfd/tests/HAVE_VMSPLICE.c
-
6libfuse/include/fuse_common.h
-
1libfuse/include/fuse_msgbuf.h
-
6libfuse/lib/fuse_i.h
-
6libfuse/lib/fuse_ll.hpp
-
6libfuse/lib/fuse_loop_mt.cpp
-
515libfuse/lib/fuse_lowlevel.c
-
81libfuse/lib/fuse_msgbuf.cpp
-
10libfuse/lib/fuse_msgbuf.hpp
-
25man/mergerfs.1
-
111src/fuse_write_buf.cpp
-
35src/fuse_write_buf.hpp
-
10src/option_parser.cpp
@ -1,11 +0,0 @@ |
|||
#define _GNU_SOURCE |
|||
#include <fcntl.h> |
|||
|
|||
int |
|||
main(int argc, |
|||
char *argv[]) |
|||
{ |
|||
(void)splice; |
|||
|
|||
return 0; |
|||
} |
|||
@ -1,12 +0,0 @@ |
|||
#define _GNU_SOURCE |
|||
#include <fcntl.h> |
|||
#include <sys/uio.h> |
|||
|
|||
int |
|||
main(int argc, |
|||
char *argv[]) |
|||
{ |
|||
(void)vmsplice; |
|||
|
|||
return 0; |
|||
} |
|||
@ -1,111 +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 "config.hpp"
|
|||
#include "errno.hpp"
|
|||
#include "fileinfo.hpp"
|
|||
#include "fs_movefile.hpp"
|
|||
#include "fuse_write.hpp"
|
|||
|
|||
#include "fuse.h"
|
|||
|
|||
#include <string>
|
|||
#include <vector>
|
|||
|
|||
#include <stdlib.h>
|
|||
#include <unistd.h>
|
|||
|
|||
using std::string; |
|||
using std::vector; |
|||
|
|||
|
|||
namespace l |
|||
{ |
|||
static |
|||
bool |
|||
out_of_space(const int error_) |
|||
{ |
|||
return ((error_ == ENOSPC) || |
|||
(error_ == EDQUOT)); |
|||
} |
|||
|
|||
static |
|||
int |
|||
write_buf(const int fd_, |
|||
fuse_bufvec *src_, |
|||
const off_t offset_) |
|||
{ |
|||
size_t size = fuse_buf_size(src_); |
|||
fuse_bufvec dst = FUSE_BUFVEC_INIT(size); |
|||
const fuse_buf_copy_flags cpflags = |
|||
(fuse_buf_copy_flags)(FUSE_BUF_SPLICE_MOVE|FUSE_BUF_SPLICE_NONBLOCK); |
|||
|
|||
dst.buf->flags = (fuse_buf_flags)(FUSE_BUF_IS_FD|FUSE_BUF_FD_SEEK); |
|||
dst.buf->fd = fd_; |
|||
dst.buf->pos = offset_; |
|||
|
|||
return fuse_buf_copy(&dst,src_,cpflags); |
|||
} |
|||
|
|||
static |
|||
int |
|||
move_and_write_buf(FileInfo *fi_, |
|||
fuse_bufvec *src_, |
|||
off_t offset_, |
|||
int err_) |
|||
{ |
|||
int rv; |
|||
Config::Read cfg; |
|||
|
|||
if(cfg->moveonenospc.enabled == false) |
|||
return err_; |
|||
|
|||
rv = fs::movefile_as_root(cfg->moveonenospc.policy, |
|||
cfg->branches, |
|||
fi_->fusepath, |
|||
&fi_->fd); |
|||
if(rv == -1) |
|||
return err_; |
|||
|
|||
return l::write_buf(fi_->fd,src_,offset_); |
|||
} |
|||
} |
|||
|
|||
namespace FUSE |
|||
{ |
|||
int |
|||
write_buf(const fuse_file_info_t *ffi_, |
|||
fuse_bufvec *src_, |
|||
off_t offset_) |
|||
{ |
|||
int rv; |
|||
FileInfo *fi = reinterpret_cast<FileInfo*>(ffi_->fh); |
|||
|
|||
rv = l::write_buf(fi->fd,src_,offset_); |
|||
if(l::out_of_space(-rv)) |
|||
rv = l::move_and_write_buf(fi,src_,offset_,rv); |
|||
|
|||
return rv; |
|||
} |
|||
|
|||
int |
|||
write_buf_null(const fuse_file_info_t *ffi_, |
|||
fuse_bufvec *src_, |
|||
off_t offset_) |
|||
{ |
|||
return src_->buf[0].size; |
|||
} |
|||
} |
|||
@ -1,35 +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. |
|||
*/ |
|||
|
|||
#pragma once
|
|||
|
|||
#include "fuse.h"
|
|||
|
|||
#include <sys/types.h>
|
|||
|
|||
|
|||
namespace FUSE |
|||
{ |
|||
int |
|||
write_buf(const fuse_file_info_t *ffi, |
|||
struct fuse_bufvec *buf, |
|||
off_t offset); |
|||
|
|||
int |
|||
write_buf_null(const fuse_file_info_t *ffi, |
|||
struct fuse_bufvec *buf, |
|||
off_t offset); |
|||
} |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue