From: Cyrill Gorcunov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v2 01/10] say: use unsigned format for fiber()->fid Date: Wed, 24 Feb 2021 18:36:17 +0300 [thread overview] Message-ID: <20210224153626.121506-2-gorcunov@gmail.com> (raw) In-Reply-To: <20210224153626.121506-1-gorcunov@gmail.com> The fiber's ID (fiber::fid) is defined as unsigned integer so we should use a proper format specificator when printing it out. Currently logger prints such fibers as negative | main/-244760339/cartridge.failover.task I> Instance state changed why it should be | main/4271292179/cartridge.failover.task I> Instance state changed After the fix all fibers are logged with natural numbers (both in plain logger and json output formats). Fixes #5846 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- changelogs/unreleased/fix-fiber-fid-log.md | 5 +++++ src/lib/core/say.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/fix-fiber-fid-log.md diff --git a/changelogs/unreleased/fix-fiber-fid-log.md b/changelogs/unreleased/fix-fiber-fid-log.md new file mode 100644 index 000000000..fb75af804 --- /dev/null +++ b/changelogs/unreleased/fix-fiber-fid-log.md @@ -0,0 +1,5 @@ +## bugfix/core + +* Fix logger output for fiber id: format specificator has been + using signed integers while fibers actually are defined as + unsigned numbers (gh-5846). diff --git a/src/lib/core/say.c b/src/lib/core/say.c index cbd10e107..76c524872 100644 --- a/src/lib/core/say.c +++ b/src/lib/core/say.c @@ -792,8 +792,8 @@ say_format_plain_tail(char *buf, int len, int level, const char *filename, if (cord) { SNPRINT(total, snprintf, buf, len, " %s", cord->name); if (fiber() && fiber()->fid != FIBER_ID_SCHED) { - SNPRINT(total, snprintf, buf, len, "/%i/%s", - fiber()->fid, fiber_name(fiber())); + SNPRINT(total, snprintf, buf, len, "/%u/%s", + (unsigned)fiber()->fid, fiber_name(fiber())); } } @@ -918,7 +918,7 @@ say_format_json(struct log *log, char *buf, int len, int level, const char *file SNPRINT(total, snprintf, buf, len, "\""); if (fiber() && fiber()->fid != FIBER_ID_SCHED) { SNPRINT(total, snprintf, buf, len, - ", \"fiber_id\": %i, ", fiber()->fid); + ", \"fiber_id\": %u, ", (unsigned)fiber()->fid); SNPRINT(total, snprintf, buf, len, "\"fiber_name\": \""); SNPRINT(total, json_escape, buf, len, -- 2.29.2
next prev parent reply other threads:[~2021-02-24 15:37 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-22 18:20 [Tarantool-patches] [PATCH] say: fix " Cyrill Gorcunov via Tarantool-patches 2021-02-22 18:23 ` Cyrill Gorcunov via Tarantool-patches 2021-02-23 20:41 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-23 21:49 ` Cyrill Gorcunov via Tarantool-patches 2021-02-23 22:47 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-24 8:28 ` Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 00/10] say: fix format strings Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` Cyrill Gorcunov via Tarantool-patches [this message] 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 02/10] popen: fix say_x format arguments Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 7:27 ` Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 03/10] raft: fix say_x arguments Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:39 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 7:50 ` Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 04/10] box/error: fix argument for CustomError Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 05/10] xlog: fix say_x format Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:40 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 06/10] box/vynil: " Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:43 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-26 8:13 ` Nikita Pettik via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 07/10] txn: " Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 08/10] limbo: " Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 09/10] wal: " Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:41 ` Vladislav Shpilevoy via Tarantool-patches 2021-02-25 7:52 ` Cyrill Gorcunov via Tarantool-patches 2021-02-24 15:36 ` [Tarantool-patches] [PATCH v2 10/10] say: fix CFORMAT specification Cyrill Gorcunov via Tarantool-patches 2021-02-24 22:41 ` 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=20210224153626.121506-2-gorcunov@gmail.com \ --to=tarantool-patches@dev.tarantool.org \ --cc=gorcunov@gmail.com \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 01/10] say: use unsigned format for fiber()->fid' \ /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