Remove failed handler.

4 files changed, 6 insertions, 76 deletions

diff --git a/fastos/src/vespa/fastos/file.cpp b/fastos/src/vespa/fastos/file.cpp
index cacdf4da836..9ff2cad0381 100644
--- a/fastos/src/vespa/fastos/file.cpp
+++ b/fastos/src/vespa/fastos/file.cpp
@@ -28,7 +28,6 @@ DirectIOException::DirectIOException(const char * fileName, const void * buffer,
 
 DirectIOException::~DirectIOException() {}
 
-FastOS_FileInterface::FailedHandler FastOS_FileInterface::_failedHandler = nullptr;
 #ifdef __linux__
 int FastOS_FileInterface::_defaultFAdviseOptions = POSIX_FADV_NORMAL;
 #else
diff --git a/fastos/src/vespa/fastos/file.h b/fastos/src/vespa/fastos/file.h
index 3d2194229e7..c987a9715b8 100644
--- a/fastos/src/vespa/fastos/file.h
+++ b/fastos/src/vespa/fastos/file.h
@@ -87,20 +87,11 @@ private:
     size_t        _writeChunkSize;
     void WriteBufInternal(const void *buffer, size_t length);
 
-public:
-    using FailedHandler = void (*)(const char *op,
-                                   const char *file,
-                                   int error,
-                                   int64_t offset,
-                                   size_t len,
-                                   ssize_t rlen);
-
 protected:
     char         *_filename;
     unsigned int  _openFlags;
     bool          _directIOEnabled;
     bool          _syncWritesEnabled;
-    static FailedHandler _failedHandler;
 
 public:
     static void setDefaultFAdviseOptions(int options) { _defaultFAdviseOptions = options; }
@@ -122,14 +113,6 @@ public:
     static bool CleanupClass ();
 
     /**
-     * Set the handler called on fatal file errors.
-     * @param failedHandler new handler routine.
-     */
-    static void SetFailedHandler(FailedHandler failedHandler) {
-        _failedHandler = failedHandler;
-    }
-
-    /**
      * Copy a single file. Will overwrite destination if it already exists.
      *
      * @author Sveinar Rasmussen
diff --git a/fastos/src/vespa/fastos/linux_file.cpp b/fastos/src/vespa/fastos/linux_file.cpp
index 0f91a8ff41c..b841d25af1f 100644
--- a/fastos/src/vespa/fastos/linux_file.cpp
+++ b/fastos/src/vespa/fastos/linux_file.cpp
@@ -37,57 +37,27 @@ FastOS_Linux_File::FastOS_Linux_File(const char *filename)
 ssize_t
 FastOS_Linux_File::readInternal(int fh, void *buffer, size_t length, int64_t readOffset)
 {
-    ssize_t readResult = File_RW_Ops::pread(fh, buffer, length, readOffset);
-    if (readResult < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        const char *fileName = GetFileName();
-        _failedHandler("read", fileName, error, readOffset, length, readResult);
-        errno = error;
-    }
-    return readResult;
+    return File_RW_Ops::pread(fh, buffer, length, readOffset);
 }
 
 
 ssize_t
 FastOS_Linux_File::readInternal(int fh, void *buffer, size_t length)
 {
-    ssize_t readResult = File_RW_Ops::read(fh, buffer, length);
-    if (readResult < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        int64_t readOffset = GetPosition();
-        const char *fileName = GetFileName();
-        _failedHandler("read", fileName, error, readOffset, length, readResult);
-        errno = error;
-    }
-    return readResult;
+    return File_RW_Ops::read(fh, buffer, length);
 }
 
 
 ssize_t
 FastOS_Linux_File::writeInternal(int fh, const void *buffer, size_t length, int64_t writeOffset)
 {
-    ssize_t writeRes = File_RW_Ops::pwrite(fh, buffer, length, writeOffset);
-    if (writeRes < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        const char *fileName = GetFileName();
-        _failedHandler("write", fileName, error, writeOffset, length, writeRes);
-        errno = error;
-    }
-    return writeRes;
+    return File_RW_Ops::pwrite(fh, buffer, length, writeOffset);
 }
 
 ssize_t
 FastOS_Linux_File::writeInternal(int fh, const void *buffer, size_t length)
 {
-    ssize_t writeRes = File_RW_Ops::write(fh, buffer, length);
-    if (writeRes < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        int64_t writeOffset = GetPosition();
-        const char *fileName = GetFileName();
-        _failedHandler("write", fileName, error, writeOffset, length, writeRes);
-        errno = error;
-    }
-    return writeRes;
+    return File_RW_Ops::write(fh, buffer, length);
 }
 
 
diff --git a/fastos/src/vespa/fastos/unix_file.cpp b/fastos/src/vespa/fastos/unix_file.cpp
index ef52d34e49f..98480d0b217 100644
--- a/fastos/src/vespa/fastos/unix_file.cpp
+++ b/fastos/src/vespa/fastos/unix_file.cpp
@@ -32,30 +32,14 @@ using fastos::File_RW_Ops;
 ssize_t
 FastOS_UNIX_File::Read(void *buffer, size_t len)
 {
-    ssize_t nRead = File_RW_Ops::read(_filedes, buffer, len);
-    if (nRead < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        int64_t readOffset = GetPosition();
-        const char *fileName = GetFileName();
-        _failedHandler("read", fileName, error, readOffset, len, nRead);
-        errno = error;
-    }
-    return nRead;
+    return File_RW_Ops::read(_filedes, buffer, len);
 }
 
 
 ssize_t
 FastOS_UNIX_File::Write2(const void *buffer, size_t len)
 {
-    ssize_t writeRes = File_RW_Ops::write(_filedes, buffer, len);
-    if (writeRes < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        int64_t writeOffset = GetPosition();
-        const char *fileName = GetFileName();
-        _failedHandler("write", fileName, error, writeOffset, len, writeRes);
-        errno = error;
-    }
-    return writeRes;
+    return File_RW_Ops::write(_filedes, buffer, len);
 }
 
 bool
@@ -79,12 +63,6 @@ void FastOS_UNIX_File::ReadBuf(void *buffer, size_t length,
     ssize_t readResult;
 
     readResult = File_RW_Ops::pread(_filedes, buffer, length, readOffset);
-    if (readResult < 0 && _failedHandler != nullptr) {
-        int error = errno;
-        const char *fileName = GetFileName();
-        _failedHandler("read", fileName, error, readOffset, length, readResult);
-        errno = error;
-    }
     if (static_cast<size_t>(readResult) != length) {
         std::string errorString = readResult != -1 ?
                                   std::string("short read") :