RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #38378 from xxhdx1985126/wip-obc-with-lock-issue

Browse Source 
crimson/osd: add _with_lock method to obc

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-12-02 11:19:25 +08:00 committed by GitHub
commit 406fd1a80a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/crimson/osd/object_context.h
View File

@ -111,18 +111,28 @@ private:
make_blocking_future(std::forward<LockF>(lockf)));
}
template <typename Lock, typename Func>
auto _with_lock(Lock&& lock, Func&& func) {
Ref obc = this;
return lock.lock().then([&lock, func = std::forward<Func>(func), obc]() mutable {
return seastar::futurize_invoke(func).finally([&lock, obc] {
lock.unlock();
});
});
}
public:
template<RWState::State Type, typename Func>
auto with_lock(Func&& func) {
switch (Type) {
case RWState::RWWRITE:
return seastar::with_lock(lock.for_write(), std::forward<Func>(func));
return _with_lock(lock.for_write(), std::forward<Func>(func));
case RWState::RWREAD:
return seastar::with_lock(lock.for_read(), std::forward<Func>(func));
return _with_lock(lock.for_read(), std::forward<Func>(func));
case RWState::RWEXCL:
return seastar::with_lock(lock.for_excl(), std::forward<Func>(func));
return _with_lock(lock.for_excl(), std::forward<Func>(func));
case RWState::RWNONE:
return seastar::futurize_invoke(func);
return seastar::futurize_invoke(std::forward<Func>(func));
default:
assert(0 == "noop");
}
@ -131,11 +141,11 @@ public:
auto with_promoted_lock(Func&& func) {
switch (Type) {
case RWState::RWWRITE:
return seastar::with_lock(lock.excl_from_write(), std::forward<Func>(func));
return _with_lock(lock.excl_from_write(), std::forward<Func>(func));
case RWState::RWREAD:
return seastar::with_lock(lock.excl_from_read(), std::forward<Func>(func));
return _with_lock(lock.excl_from_read(), std::forward<Func>(func));
case RWState::RWEXCL:
return seastar::with_lock(lock.excl_from_excl(), std::forward<Func>(func));
return _with_lock(lock.excl_from_excl(), std::forward<Func>(func));
default:
assert(0 == "noop");
}