Browse Source

Use fatal::abort() rather than assert in places

fixes
Antonio SJ Musumeci 5 days ago
parent
commit
0b4ecc0226
  1. 6
      src/fs_open_fd.cpp
  2. 4
      src/fuse_readdir.cpp
  3. 2
      src/fuse_readdir.hpp
  4. 0
      vendored/libfuse/include/fatal.hpp
  5. 7
      vendored/libfuse/lib/maintenance_thread.cpp

6
src/fs_open_fd.cpp

@ -21,15 +21,15 @@
#if defined(__linux__)
#include "fmt/core.h"
#include "fs_openat.hpp"
#include "fatal.hpp"
#include "procfs.hpp"
#include <cassert>
int
fs::open_fd(const int fd_,
const int flags_)
{
assert(procfs::PROC_SELF_FD_FD > 0);
if(procfs::PROC_SELF_FD_FD <= 0)
fatal::abort("procfs::PROC_SELF_FD_FD must be > 0");
const int flags = (flags_ & ~O_NOFOLLOW);

4
src/fuse_readdir.cpp

@ -21,6 +21,7 @@
#include "fuse_readdir_factory.hpp"
#include "dirinfo.hpp"
#include "fatal.hpp"
#include "fuse_dirents.hpp"
#include "config.hpp"
@ -108,7 +109,8 @@ FUSE::ReadDir::operator()(const fuse_req_ctx_t *ctx_,
std::shared_ptr<FUSE::ReadDirBase> readdir;
readdir = std::atomic_load(&_impl);
assert(readdir);
if(!readdir)
fatal::abort("readdir impl is null");
rv = (*readdir)(ctx_,ffi_,buf_);
if(rv == -ENOENT)

2
src/fuse_readdir.hpp

@ -25,8 +25,6 @@
#include <memory>
#include <mutex>
#include <assert.h>
namespace FUSE
{

0
src/fatal.hpp → vendored/libfuse/include/fatal.hpp

7
vendored/libfuse/lib/maintenance_thread.cpp

@ -1,10 +1,8 @@
#include "maintenance_thread.hpp"
#include "fatal.hpp"
#include "mutex.hpp"
#include "fmt/core.h"
#include <cassert>
#include <vector>
#include <pthread.h>
@ -46,7 +44,8 @@ MaintenanceThread::setup()
int rv;
rv = pthread_create(&g_thread,NULL,_thread_loop,NULL);
assert((rv == 0) && "pthread_create failed");
if(rv != 0)
fatal::abort("pthread_create failed: rv={}",rv);
}
void

Loading…
Cancel
Save