Remove unused syscalls

Author: alexbaden

omniscidb/OSDependent/Unix/omnisci_fs.cpp

@@ -35,32 +35,6 @@ size_t file_size(const int fd) {
   return buf.st_size;
 }
 
-void* checked_mmap(const int fd, const size_t sz) {
-  auto ptr = mmap(nullptr, sz, PROT_WRITE | PROT_READ, MAP_SHARED, fd, 0);
-  CHECK(ptr != reinterpret_cast<void*>(-1));
-#ifdef __linux__
-#ifdef MADV_HUGEPAGE
-  madvise(ptr, sz, MADV_RANDOM | MADV_WILLNEED | MADV_HUGEPAGE);
-#else
-  madvise(ptr, sz, MADV_RANDOM | MADV_WILLNEED);
-#endif
-#endif
-  return ptr;
-}
-
-void checked_munmap(void* addr, size_t length) {
-  CHECK_EQ(0, munmap(addr, length));
-}
-
-int msync(void* addr, size_t length, bool async) {
-  // TODO: support MS_INVALIDATE?
-  return ::msync(addr, length, async ? MS_ASYNC : MS_SYNC);
-}
-
-int fsync(int fd) {
-  return ::fsync(fd);
-}
-
 int open(const char* path, int flags, int mode) {
   return ::open(path, flags, mode);
 }
@@ -69,10 +43,6 @@ void close(const int fd) {
   ::close(fd);
 }
 
-::FILE* fopen(const char* filename, const char* mode) {
-  return ::fopen(filename, mode);
-}
-
 ::FILE* popen(const char* command, const char* type) {
   return ::popen(command, type);
 }

omniscidb/OSDependent/Windows/omnisci_fs.cpp

@@ -37,32 +37,6 @@ size_t file_size(const int fd) {
   return buf.st_size;
 }
 
-void* checked_mmap(const int fd, const size_t sz) {
-  auto handle = _get_osfhandle(fd);
-  HANDLE map_handle =
-      CreateFileMapping(reinterpret_cast<HANDLE>(handle), NULL, PAGE_READWRITE, 0, 0, 0);
-  CHECK(map_handle);
-  auto map_ptr = MapViewOfFile(map_handle, FILE_MAP_WRITE | FILE_MAP_READ, 0, 0, sz);
-  CHECK(map_ptr);
-  CHECK(CloseHandle(map_handle) != 0);
-  return map_ptr;
-}
-
-void checked_munmap(void* addr, size_t length) {
-  CHECK(UnmapViewOfFile(addr) != 0);
-}
-
-int msync(void* addr, size_t length, bool async) {
-  auto err = FlushViewOfFile(addr, length);
-  return err != 0 ? 0 : -1;
-}
-
-int fsync(int fd) {
-  // TODO: FlushFileBuffers
-  auto file = _fdopen(fd, "a+");
-  return fflush(file);
-}
-
 int open(const char* path, int flags, int mode) {
   return _open(path, flags, mode);
 }
@@ -71,24 +45,6 @@ void close(const int fd) {
   _close(fd);
 }
 
-::FILE* fopen(const char* filename, const char* mode) {
-  FILE* f;
-  auto err = fopen_s(&f, filename, mode);
-  // Handle 'too many open files' error
-  if (err == EMFILE) {
-    auto max_handles = _getmaxstdio();
-    if (max_handles < 8192) {
-      auto res = _setmaxstdio(8192);
-      if (res < 0) {
-        LOG(FATAL) << "Cannot increase maximum number of open files";
-      }
-      err = fopen_s(&f, filename, mode);
-    }
-  }
-  CHECK(!err) << "ERROR [" << filename << ":" << mode << "[" << err << "]";
-  return f;
-}
-
 ::FILE* popen(const char* command, const char* type) {
   return _popen(command, type);
 }

omniscidb/OSDependent/omnisci_fs.h

@@ -24,20 +24,10 @@ namespace omnisci {
 
 size_t file_size(const int fd);
 
-void* checked_mmap(const int fd, const size_t sz);
-
-void checked_munmap(void* addr, size_t length);
-
-int msync(void* addr, size_t length, bool async);
-
-int fsync(int fd);
-
 int open(const char* path, int flags, int mode);
 
 void close(const int fd);
 
-::FILE* fopen(const char* filename, const char* mode);
-
 ::FILE* popen(const char* command, const char* type);
 
 int32_t pclose(::FILE* fh);