oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

{input,storage}/nfs: use C++ exceptions instead of class Error

Browse Source
This commit is contained in:
Max Kellermann
2016-09-16 16:55:57 +02:00
parent 553365b942
commit 539c0ed171
15 changed files with 213 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/nfs/FileReader.hxx
View File

@@ -27,6 +27,7 @@
#include "Compiler.h"
#include <string>
#include <exception>
#include <stdint.h>
#include <stddef.h>
@@ -66,7 +67,10 @@ public:
*/
void Open(const char *uri);
bool Read(uint64_t offset, size_t size, Error &error);
/**
* Throws std::runtime_error on error.
*/
void Read(uint64_t offset, size_t size);
void CancelRead();
bool IsIdle() const {
@@ -76,7 +80,7 @@ public:
protected:
virtual void OnNfsFileOpen(uint64_t size) = 0;
virtual void OnNfsFileRead(const void *data, size_t size) = 0;
virtual void OnNfsFileError(Error &&error) = 0;
virtual void OnNfsFileError(std::exception_ptr &&e) = 0;
private:
/**
@@ -90,12 +94,12 @@ private:
/* virtual methods from NfsLease */
void OnNfsConnectionReady() final;
void OnNfsConnectionFailed(const Error &error) final;
void OnNfsConnectionDisconnected(const Error &error) final;
void OnNfsConnectionFailed(std::exception_ptr e) final;
void OnNfsConnectionDisconnected(std::exception_ptr e) final;
/* virtual methods from NfsCallback */
void OnNfsCallback(unsigned status, void *data) final;
void OnNfsError(Error &&error) final;
void OnNfsError(std::exception_ptr &&e) final;
/* virtual methods from DeferredMonitor */
void RunDeferred() final;