tqcq/sled
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

fix Except
All checks were successful
linux-x64-gcc / linux-gcc (Debug) (push) Successful in 1m42s
Details
linux-x64-gcc / linux-gcc (Release) (push) Successful in 1m22s
Details

Browse Source
This commit is contained in:
tqcq 2024-03-25 14:00:37 +08:00
parent 19309ca1d1
commit 13cafbf4d1
2 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/sled/futures/promise.h
View File

@ -715,14 +715,14 @@ public:
// resolve/reject
//
bool Resolve() { return state_->resolve(); }
bool Resolve() { return state_->Resolve(); }
bool Reject(std::exception_ptr e) noexcept { return state_->reject(e); }
bool Reject(std::exception_ptr e) noexcept { return state_->Reject(e); }
template<typename E>
bool Reject(E &&e)
{
return state_->reject(std::make_exception_ptr(std::forward<E>(e)));
return state_->Reject(std::make_exception_ptr(std::forward<E>(e)));
}
//
@ -890,7 +890,7 @@ private:
: promise_wait_status::timeout;
}
bool resolve()
bool Resolve()
{
sled::MutexLock lock(&mutex_);
// std::unique_lock lock(mutex_);
@ -902,7 +902,7 @@ private:
return true;
}
bool reject(std::exception_ptr e) noexcept
bool Reject(std::exception_ptr e) noexcept
{
sled::MutexLock lock(&mutex_);
// std::lock_guard guard(mutex_);
@ -923,21 +923,21 @@ private:
if (has_reject) {
try {
eggs::invoke(std::forward<decltype(f)>(f), e);
n.resolve();
n.Resolve();
} catch (...) {
n.reject(std::current_exception());
n.Reject(std::current_exception());
}
} else {
n.reject(e);
n.Reject(e);
}
};
auto resolve_h = [n = next, f = std::forward<ResolveF>(on_resolve)]() mutable {
try {
eggs::invoke(std::forward<decltype(f)>(f));
n.resolve();
n.Resolve();
} catch (...) {
n.reject(std::current_exception());
n.Reject(std::current_exception());
}
};
@ -954,21 +954,21 @@ private:
if (has_reject) {
try {
auto r = eggs::invoke(std::forward<decltype(f)>(f), e);
n.resolve(std::move(r));
n.Resolve(std::move(r));
} catch (...) {
n.reject(std::current_exception());
n.Reject(std::current_exception());
}
} else {
n.reject(e);
n.Reject(e);
}
};
auto resolve_h = [n = next, f = std::forward<ResolveF>(on_resolve)]() mutable {
try {
auto r = eggs::invoke(std::forward<decltype(f)>(f));
n.resolve(std::move(r));
n.Resolve(std::move(r));
} catch (...) {
n.reject(std::current_exception());
n.Reject(std::current_exception());
}
};

16
src/futures/promise_test.cc
View File

@ -35,3 +35,19 @@ TEST(Future, Basic)
p.Resolve(1);
EXPECT_EQ(future.Get(), 21);
}
TEST(Future, Except)
{
auto p = sled::Promise<int>();
p.Resolve(1);
p.GetFuture()
.Then([](int) { throw std::runtime_error("test"); })
.Except([](std::exception_ptr e) {
try {
std::rethrow_exception(e);
} catch (const std::exception &e) {
EXPECT_STREQ(e.what(), "test");
}
})
.Get();
}