Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor Status to avoid large stack size in happy path #1368

Merged
merged 5 commits into from
Apr 5, 2023
Merged

Refactor Status to avoid large stack size in happy path #1368

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b0158c
Refactor Status to avoid large stack size in happy path
PragmaTwice Mar 21, 2023
24606ac
fix
PragmaTwice Mar 21, 2023
b6bd0b3
fix
PragmaTwice Mar 22, 2023
fcc672a
Revert "fix"
PragmaTwice Apr 4, 2023
a23c0fa
Merge branch 'unstable' into status-impl
PragmaTwice Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 29 additions & 12 deletions src/common/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,41 @@ class [[nodiscard]] Status {
BlockingCmd,
};

Status() : Status(cOK) {}
Status() : impl_{nullptr} {}

Status(Code code, std::string msg = {}) : code_(code), msg_(std::move(msg)) {} // NOLINT
Status(Code code, std::string msg = {}) : impl_{new Impl{code, std::move(msg)}} { // NOLINT
CHECK(code != cOK);
}

Status(const Status& s) : impl_{s.impl_ ? new Impl{s.impl_->code_, s.impl_->msg_} : nullptr} {}
Status(Status&&) = default;

Status& operator=(const Status& s) {
Status tmp = s;
return *this = std::move(tmp);
}
Status& operator=(Status&& s) = default;

~Status() = default;

template <Code code>
bool Is() const {
return code_ == code;
return impl_ && impl_->code_ == code;
}

bool IsOK() const { return Is<cOK>(); }
bool IsOK() const { return !impl_; }
explicit operator bool() const { return IsOK(); }

Code GetCode() const { return code_; }
Code GetCode() const { return impl_ ? impl_->code_ : cOK; }

std::string Msg() const& {
if (*this) return ok_msg;
return msg_;
return impl_->msg_;
}

std::string Msg() && {
if (*this) return ok_msg;
return std::move(msg_);
return std::move(impl_->msg_);
}

static Status OK() { return {}; }
Expand All @@ -99,16 +112,20 @@ class [[nodiscard]] Status {
if (*this) {
return {};
}
return {code_, fmt::format("{}: {}", prefix, msg_)};
return {impl_->code_, fmt::format("{}: {}", prefix, impl_->msg_)};
}

void GetValue() {}

static constexpr const char* ok_msg = "ok";

private:
Code code_;
std::string msg_;
struct Impl {
Code code_;
std::string msg_;
};

std::unique_ptr<Impl> impl_;

static constexpr Code cOK = static_cast<Code>(0);

Expand Down Expand Up @@ -195,9 +212,9 @@ struct [[nodiscard]] StatusOr {

using Code = Status::Code;

StatusOr(Status s) : code_(s.code_) { // NOLINT
StatusOr(Status s) : code_(s.GetCode()) { // NOLINT
CHECK(!s);
new (&error_) error_type(std::move(s.msg_));
new (&error_) error_type(std::move(s.impl_->msg_));
}

StatusOr(Code code, std::string msg = {}) : code_(code) { // NOLINT
Expand Down