From: Vladislav Shpilevoy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, sergepetrenko@tarantool.org Subject: [Tarantool-patches] [PATCH v2 01/11] diag: return created error from diag_set() Date: Fri, 12 Nov 2021 00:54:20 +0100 [thread overview] Message-ID: <e0947bd988f26718259e3d78f78df9b9bff10f79.1636674803.git.v.shpilevoy@tarantool.org> (raw) In-Reply-To: <cover.1636674803.git.v.shpilevoy@tarantool.org> And from diag_add(). This will be helpful not to bother with box_error_last() and diag_last_error(diag_get()) in the future patch. It will change some attributes of a just created ER_READONLY error to add more details. Part of #5568 --- src/lib/core/diag.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/core/diag.h b/src/lib/core/diag.h index fa85326ad..d7d09f6fb 100644 --- a/src/lib/core/diag.h +++ b/src/lib/core/diag.h @@ -347,7 +347,7 @@ struct error * BuildSocketError(const char *file, unsigned line, const char *socketname, const char *format, ...); -#define diag_set_detailed(file, line, class, ...) do { \ +#define diag_set_detailed(file, line, class, ...) ({ \ /* Preserve the original errno. */ \ int save_errno = errno; \ say_debug("%s at %s:%i", #class, file, line); \ @@ -356,19 +356,21 @@ BuildSocketError(const char *file, unsigned line, const char *socketname, diag_set_error(diag_get(), e); \ /* Restore the errno which might have been reset. */ \ errno = save_errno; \ -} while (0) + e; \ +}) #define diag_set(...) \ diag_set_detailed(__FILE__, __LINE__, __VA_ARGS__) -#define diag_add(class, ...) do { \ +#define diag_add(class, ...) ({ \ int save_errno = errno; \ say_debug("%s at %s:%i", #class, __FILE__, __LINE__); \ struct error *e; \ e = Build##class(__FILE__, __LINE__, ##__VA_ARGS__); \ diag_add_error(diag_get(), e); \ errno = save_errno; \ -} while (0) + e; \ +}) #if defined(__cplusplus) } /* extern "C" */ -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-11-11 23:55 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-11 23:54 [Tarantool-patches] [PATCH v2 00/11] ER_READONLY reason Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` Vladislav Shpilevoy via Tarantool-patches [this message] 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 10/11] box: enrich ER_READONLY with new details Vladislav Shpilevoy via Tarantool-patches 2021-11-12 7:30 ` Serge Petrenko via Tarantool-patches 2021-11-12 23:24 ` Vladislav Shpilevoy via Tarantool-patches 2021-11-15 6:51 ` Serge Petrenko via Tarantool-patches 2021-11-15 21:56 ` Vladislav Shpilevoy via Tarantool-patches 2021-11-16 9:53 ` Serge Petrenko via Tarantool-patches 2021-11-16 22:08 ` Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 11/11] error: report ER_READONLY reason in message Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 02/11] uuid: move into libcore Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 03/11] error: introduce error_payload Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 04/11] error: move code to struct error from ClientError Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 05/11] error: use error_payload to store optional members Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 06/11] error: use error_payload in MessagePack codecs Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 07/11] error: use error_payload in Lua Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 08/11] luatest: copy config in cluster:build_server() Vladislav Shpilevoy via Tarantool-patches 2021-11-11 23:54 ` [Tarantool-patches] [PATCH v2 09/11] luatest: add new helpers for 'server' object Vladislav Shpilevoy via Tarantool-patches 2021-11-12 23:25 ` [Tarantool-patches] [PATCH v2 12/11] error: introduce box.info.ro_reason Vladislav Shpilevoy via Tarantool-patches 2021-11-15 6:53 ` Serge Petrenko via Tarantool-patches 2021-11-16 22:08 ` [Tarantool-patches] [PATCH v2 00/11] ER_READONLY reason Vladislav Shpilevoy via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=e0947bd988f26718259e3d78f78df9b9bff10f79.1636674803.git.v.shpilevoy@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=sergepetrenko@tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 01/11] diag: return created error from diag_set()' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox