aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/nfs
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/nfs')
-rw-r--r--src/lib/nfs/Cancellable.hxx48
-rw-r--r--src/lib/nfs/Connection.cxx6
-rw-r--r--src/lib/nfs/Connection.hxx4
3 files changed, 18 insertions, 40 deletions
diff --git a/src/lib/nfs/Cancellable.hxx b/src/lib/nfs/Cancellable.hxx
index 50762b582..1f287c329 100644
--- a/src/lib/nfs/Cancellable.hxx
+++ b/src/lib/nfs/Cancellable.hxx
@@ -22,13 +22,15 @@
#include "Compiler.h"
-#include <list>
+#include <boost/intrusive/list.hpp>
+
#include <algorithm>
#include <assert.h>
template<typename T>
-class CancellablePointer {
+class CancellablePointer
+ : public boost::intrusive::list_base_hook<boost::intrusive::link_mode<boost::intrusive::normal_link>> {
public:
typedef T *pointer_type;
typedef T &reference_type;
@@ -38,7 +40,7 @@ private:
pointer_type p;
public:
- explicit constexpr CancellablePointer(reference_type _p):p(&_p) {}
+ explicit CancellablePointer(reference_type _p):p(&_p) {}
CancellablePointer(const CancellablePointer &) = delete;
@@ -70,7 +72,8 @@ public:
typedef typename CT::const_reference_type const_reference_type;
private:
- typedef std::list<CT> List;
+ typedef boost::intrusive::list<CT,
+ boost::intrusive::constant_time_size<false>> List;
typedef typename List::iterator iterator;
typedef typename List::const_iterator const_iterator;
List list;
@@ -97,28 +100,14 @@ private:
return std::find_if(list.begin(), list.end(), MatchPointer(p));
}
- class MatchReference {
- const CT &c;
-
- public:
- constexpr explicit MatchReference(const CT &_c):c(_c) {}
-
- gcc_pure
- bool operator()(const CT &a) const {
- return &a == &c;
- }
- };
-
gcc_pure
iterator Find(CT &c) {
- return std::find_if(list.begin(), list.end(),
- MatchReference(c));
+ return list.iterator_to(c);
}
gcc_pure
const_iterator Find(const CT &c) const {
- return std::find_if(list.begin(), list.end(),
- MatchReference(c));
+ return list.iterator_to(c);
}
public:
@@ -142,21 +131,9 @@ public:
CT &Add(reference_type p, Args&&... args) {
assert(Find(p) == list.end());
- list.emplace_back(p, std::forward<Args>(args)...);
- return list.back();
- }
-
- void RemoveLast() {
- list.pop_back();
- }
-
- bool RemoveOptional(CT &ct) {
- auto i = Find(ct);
- if (i == list.end())
- return false;
-
- list.erase(i);
- return true;
+ CT *c = new CT(p, std::forward<Args>(args)...);
+ list.push_back(*c);
+ return *c;
}
void Remove(CT &ct) {
@@ -164,6 +141,7 @@ public:
assert(i != list.end());
list.erase(i);
+ delete &ct;
}
void Cancel(reference_type p) {
diff --git a/src/lib/nfs/Connection.cxx b/src/lib/nfs/Connection.cxx
index d37817a86..13f7cd89c 100644
--- a/src/lib/nfs/Connection.cxx
+++ b/src/lib/nfs/Connection.cxx
@@ -161,7 +161,7 @@ NfsConnection::Open(const char *path, int flags, NfsCallback &callback,
auto &c = callbacks.Add(callback, *this);
if (!c.Open(context, path, flags, error)) {
- callbacks.RemoveLast();
+ callbacks.Remove(c);
return false;
}
@@ -176,7 +176,7 @@ NfsConnection::Stat(struct nfsfh *fh, NfsCallback &callback, Error &error)
auto &c = callbacks.Add(callback, *this);
if (!c.Stat(context, fh, error)) {
- callbacks.RemoveLast();
+ callbacks.Remove(c);
return false;
}
@@ -192,7 +192,7 @@ NfsConnection::Read(struct nfsfh *fh, uint64_t offset, size_t size,
auto &c = callbacks.Add(callback, *this);
if (!c.Read(context, fh, offset, size, error)) {
- callbacks.RemoveLast();
+ callbacks.Remove(c);
return false;
}
diff --git a/src/lib/nfs/Connection.hxx b/src/lib/nfs/Connection.hxx
index cb4126d25..ff3b3658d 100644
--- a/src/lib/nfs/Connection.hxx
+++ b/src/lib/nfs/Connection.hxx
@@ -41,8 +41,8 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
NfsConnection &connection;
public:
- explicit constexpr CancellableCallback(NfsCallback &_callback,
- NfsConnection &_connection)
+ explicit CancellableCallback(NfsCallback &_callback,
+ NfsConnection &_connection)
:CancellablePointer<NfsCallback>(_callback),
connection(_connection) {}