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

lib/nfs/Connection: make in_service and in_event debug-only flags

This commit is contained in:
Max Kellermann 2014-12-14 15:20:40 +01:00
parent 4b8d258cff
commit ab4bb26a0a
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,17 +407,21 @@ NfsConnection::OnSocketReady(unsigned flags)
re-register it each time */
SocketMonitor::Steal();
#ifndef NDEBUG
assert(!in_event);
in_event = true;
assert(!in_service);
in_service = true;
#endif
int result = nfs_service(context, events_to_libnfs(flags));
#ifndef NDEBUG
assert(context != nullptr);
assert(in_service);
in_service = false;
#endif
while (!deferred_close.empty()) {
nfs_close_async(context, deferred_close.front(),
@ -460,8 +464,10 @@ NfsConnection::OnSocketReady(unsigned flags)
closed = true;
}
#ifndef NDEBUG
assert(in_event);
in_event = false;
#endif
if (context != nullptr)
ScheduleSocket();
@ -509,8 +515,11 @@ NfsConnection::MountInternal(Error &error)
postponed_mount_error.Clear();
mount_finished = false;
#ifndef NDEBUG
in_service = false;
in_event = false;
#endif
if (nfs_mount_async(context, server.c_str(), export_name.c_str(),
MountCallback, this) != 0) {

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

@ -111,6 +111,7 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
Error postponed_mount_error;
#ifndef NDEBUG
/**
* True when nfs_service() is being called.
*/
@ -121,6 +122,7 @@ class NfsConnection : SocketMonitor, DeferredMonitor {
* event updates are omitted.
*/
bool in_event;
#endif
bool mount_finished;