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

lib/nfs/Connection: add DisposablePointer parameter to CancelAndClose()

Browse Source 
Just in case somebody needs to free a buffer after the NFS
cancellation has completed.
This commit is contained in:
Max Kellermann 2024-05-14 19:39:49 +02:00
parent f5092cb73d
commit 98f53b6d3d
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/nfs/Connection.cxx
View File

@ -91,14 +91,18 @@ NfsConnection::CancellableCallback::Read(nfs_context *ctx, struct nfsfh *fh,
} }
inline void inline void
NfsConnection::CancellableCallback::CancelAndScheduleClose(struct nfsfh *fh) noexcept NfsConnection::CancellableCallback::CancelAndScheduleClose(struct nfsfh *fh,
DisposablePointer &&_dispose_value) noexcept
{ {
assert(connection.GetEventLoop().IsInside()); assert(connection.GetEventLoop().IsInside());
assert(!open); assert(!open);
assert(close_fh == nullptr); assert(close_fh == nullptr);
assert(!dispose_value);
assert(fh != nullptr); assert(fh != nullptr);
close_fh = fh; close_fh = fh;
dispose_value = std::move(_dispose_value);
Cancel(); Cancel();
} }
@ -371,10 +375,11 @@ NfsConnection::Close(struct nfsfh *fh) noexcept
} }
void void
NfsConnection::CancelAndClose(struct nfsfh *fh, NfsCallback &callback) noexcept NfsConnection::CancelAndClose(struct nfsfh *fh, DisposablePointer dispose_value,
NfsCallback &callback) noexcept
{ {
CancellableCallback &cancel = callbacks.Get(callback); CancellableCallback &cancel = callbacks.Get(callback);
cancel.CancelAndScheduleClose(fh); cancel.CancelAndScheduleClose(fh, std::move(dispose_value));
} }
void void

16
src/lib/nfs/Connection.hxx
View File

@ -7,6 +7,7 @@
#include "event/SocketEvent.hxx" #include "event/SocketEvent.hxx"
#include "event/CoarseTimerEvent.hxx" #include "event/CoarseTimerEvent.hxx"
#include "event/DeferEvent.hxx" #include "event/DeferEvent.hxx"
#include "util/DisposablePointer.hxx"
#include "util/IntrusiveList.hxx" #include "util/IntrusiveList.hxx"
#include <cstdint> #include <cstdint>
@ -41,6 +42,12 @@ class NfsConnection {
*/ */
struct nfsfh *close_fh; struct nfsfh *close_fh;
/**
* An arbitrary value that will be disposed of after
* cancellation completes.
*/
DisposablePointer dispose_value;
public: public:
explicit CancellableCallback(NfsCallback &_callback, explicit CancellableCallback(NfsCallback &_callback,
NfsConnection &_connection, NfsConnection &_connection,
@ -61,7 +68,8 @@ class NfsConnection {
* Cancel the operation and schedule a call to * Cancel the operation and schedule a call to
* nfs_close_async() with the given file handle. * nfs_close_async() with the given file handle.
*/ */
void CancelAndScheduleClose(struct nfsfh *fh) noexcept; void CancelAndScheduleClose(struct nfsfh *fh,
DisposablePointer &&_dispose_value) noexcept;
/** /**
* Called by NfsConnection::DestroyContext() right * Called by NfsConnection::DestroyContext() right
@ -226,8 +234,12 @@ public:
/** /**
* Like Cancel(), but also close the specified NFS file * Like Cancel(), but also close the specified NFS file
* handle. * handle.
*
* @param dispose_value an arbitrary value that will be
* disposed of after cancellation completes
*/ */
void CancelAndClose(struct nfsfh *fh, NfsCallback &callback) noexcept; void CancelAndClose(struct nfsfh *fh, DisposablePointer dispose_value,
NfsCallback &callback) noexcept;
protected: protected:
virtual void OnNfsConnectionError(std::exception_ptr e) noexcept = 0; virtual void OnNfsConnectionError(std::exception_ptr e) noexcept = 0;

2
src/lib/nfs/FileReader.cxx
View File

@ -59,7 +59,7 @@ NfsFileReader::CancelOrClose() noexcept
else if (state > State::OPEN) else if (state > State::OPEN)
/* one async operation in progress: cancel it and /* one async operation in progress: cancel it and
defer the nfs_close_async() call */ defer the nfs_close_async() call */
connection->CancelAndClose(fh, *this); connection->CancelAndClose(fh, {}, *this);
else if (state > State::MOUNT) else if (state > State::MOUNT)
/* we don't have a file handle yet - just cancel the /* we don't have a file handle yet - just cancel the
async operation */ async operation */