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

Jump to bottom

maybe: add JUST_MSG and CHECK_JUST_MSG #5904

Merged
merged 16 commits into from
Aug 18, 2021
Merged

maybe: add JUST_MSG and CHECK_JUST_MSG #5904

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
27848fd
maybe: add JUST_MSG and CHECK_JUST_MSG
PragmaTwice Aug 14, 2021
2ead501
maybe: add test
PragmaTwice Aug 17, 2021
f863390
maybe: support ostream && fix test
PragmaTwice Aug 17, 2021
284429a
maybe: put to private_details
PragmaTwice Aug 18, 2021
bd86b4a
maybe: fix name
PragmaTwice Aug 18, 2021
ec91456
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
7d47c68
error: clang format
PragmaTwice Aug 18, 2021
61cd5ff
Merge branch 'maybe-add-just-msg' of github.com:PragmaTwice/oneflow i…
PragmaTwice Aug 18, 2021
f64afd9
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
0e30a97
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
46bd41d
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
c389664
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
f05fd92
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
be64f57
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
211d16d
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
c427cef
Merge branch 'master' into maybe-add-just-msg
oneflow-ci-bot Aug 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
83 changes: 58 additions & 25 deletions oneflow/core/common/maybe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,35 +269,68 @@ inline bool MaybeIsOk(Maybe<void>&& maybe) {

#if defined(__GNUC__) || defined(__CUDACC__) || defined(__clang__)

inline void maybe_error_add_stack_frame(const std::shared_ptr<cfg::ErrorProto>& err,
PragmaTwice marked this conversation as resolved.
Show resolved Hide resolved
const std::string& file, int64_t line,
const std::string& func, const std::string& message) {
auto* stack_frame = err->add_stack_frame();
stack_frame->set_file(file);
stack_frame->set_line(line);
stack_frame->set_function(func);
stack_frame->set_error_msg(message);
}

template<typename... T>
Error&& maybe_error_add_message(Error&& err, T&&... msg) {
__attribute__((unused)) int dummy[] = {((void)(std::move(err) << std::forward<T>(msg)), 0)...};
return std::move(err);
}

#define TRY(...) __MaybeErrorStackCheckWrapper__(__VA_ARGS__)
#define JUST(...) \
({ \
auto&& maybe = __MaybeErrorStackCheckWrapper__(__VA_ARGS__); \
if (!maybe.IsOk()) { \
auto* stack_frame = maybe.error()->add_stack_frame(); \
stack_frame->set_file(__FILE__); \
stack_frame->set_line(__LINE__); \
stack_frame->set_function(__FUNCTION__); \
stack_frame->set_error_msg(OF_PP_STRINGIZE((__VA_ARGS__))); \
return maybe.error(); \
} \
std::move(maybe); \
#define JUST(...) \
({ \
auto&& maybe = __MaybeErrorStackCheckWrapper__(__VA_ARGS__); \
if (!maybe.IsOk()) { \
maybe_error_add_stack_frame(maybe.error(), __FILE__, __LINE__, __FUNCTION__, \
OF_PP_STRINGIZE((__VA_ARGS__))); \
return maybe.error(); \
} \
std::move(maybe); \
}).Data_YouAreNotAllowedToCallThisFuncOutsideThisFile()
#define CHECK_JUST(...) \
([&](const char* func_name) { \
auto&& maybe = __MaybeErrorStackCheckWrapper__(__VA_ARGS__); \
if (!maybe.IsOk()) { \
auto* stack_frame = maybe.error()->add_stack_frame(); \
stack_frame->set_file(__FILE__); \
stack_frame->set_line(__LINE__); \
stack_frame->set_function(func_name); \
stack_frame->set_error_msg(OF_PP_STRINGIZE((__VA_ARGS__))); \
LOG(FATAL) << maybe.GetSerializedError(); \
} \
return std::move(maybe); \
})(__FUNCTION__) \
#define CHECK_JUST(...) \
([&](const char* func_name) { \
auto&& maybe = __MaybeErrorStackCheckWrapper__(__VA_ARGS__); \
if (!maybe.IsOk()) { \
maybe_error_add_stack_frame(maybe.error(), __FILE__, __LINE__, func_name, \
OF_PP_STRINGIZE((__VA_ARGS__))); \
LOG(FATAL) << maybe.GetSerializedError(); \
} \
return std::move(maybe); \
})(__FUNCTION__) \
.Data_YouAreNotAllowedToCallThisFuncOutsideThisFile()

#define JUST_MSG(value, ...) \
({ \
auto&& maybe = value; \
if (!maybe.IsOk()) { \
return maybe_error_add_message( \
Error(maybe.error()).AddStackFrame(__FILE__, __LINE__, __FUNCTION__), \
OF_PP_STRINGIZE((value)), ": ", __VA_ARGS__); \
} \
std::move(maybe); \
}).Data_YouAreNotAllowedToCallThisFuncOutsideThisFile()

#define CHECK_JUST_MSG(value, ...) \
({ \
auto&& maybe = value; \
if (!maybe.IsOk()) { \
LOG(FATAL) << maybe_error_add_message( \
Error(maybe.error()).AddStackFrame(__FILE__, __LINE__, __FUNCTION__), \
OF_PP_STRINGIZE((value)), ": ", __VA_ARGS__) \
->DebugString(); \
} \
std::move(maybe); \
}).Data_YouAreNotAllowedToCallThisFuncOutsideThisFile()

#define CHECK_OK(...) CHECK(MaybeIsOk(__VA_ARGS__))

#define OF_RETURN_IF_ERROR(...) \
Expand Down