From: Maxim Kokryashkin via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Bronnikov <sergeyb@tarantool.org>
Cc: Maxim Kokryashkin <max.kokryashkin@gmail.com>,
tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit v1] profilers: print user-friendly errors
Date: Mon, 8 Apr 2024 12:33:26 +0300 [thread overview]
Message-ID: <npzekaqlqepkdasuplrti7il3k4d3xmexkuwkujkym6kkdfstx@cics7gxf5bxz> (raw)
In-Reply-To: <e68f9acc-1d94-41be-a246-4dcc0bab31b2@tarantool.org>
Hi, Sergey!
Thanks for the review!
Fixed your comments, branch is rebased and force-pushed.
Here is the diff with fixes:
===
diff --git a/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua b/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua
index c2e0f0a6..0b7ee2dd 100644
--- a/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua
+++ b/test/tarantool-tests/gh-9217-profile-parsers-error-handling.test.lua
@@ -16,7 +16,7 @@ local utils = require('utils')
local BAD_PATH = utils.tools.profilename('bad-path-tmp.bin')
local NON_PROFILE_DATA = utils.tools.profilename('not-profile-data.tmp.bin')
-local CORRUPT_PROFILE = utils.tools.profilename('profdata.tmp.bin')
+local CORRUPT_PROFILE_DATA = utils.tools.profilename('profdata.tmp.bin')
local EXECUTABLE = utils.exec.luacmd(arg)
local PARSERS = {
@@ -37,7 +37,7 @@ local TEST_CASES = {
err_msg = 'Failed to parse symtab from'
},
{
- path = CORRUPT_PROFILE,
+ path = CORRUPT_PROFILE_DATA,
err_msg = 'Failed to parse profile data from'
},
}
@@ -50,7 +50,7 @@ local function generate_non_profile_data(path)
file:close()
end
-local function generate_corrupt_profile(path)
+local function generate_corrupt_profile_data(path)
local res, err = misc.memprof.start(path)
-- Should start successfully.
assert(res, err)
@@ -74,7 +74,7 @@ local function generate_corrupt_profile(path)
end
generate_non_profile_data(NON_PROFILE_DATA)
-generate_corrupt_profile(CORRUPT_PROFILE)
+generate_corrupt_profile_data(CORRUPT_PROFILE_DATA)
for _, case in ipairs(TEST_CASES) do
for profiler, parser in pairs(PARSERS) do
@@ -86,5 +86,5 @@ for _, case in ipairs(TEST_CASES) do
end
os.remove(NON_PROFILE_DATA)
-os.remove(CORRUPT_PROFILE)
+os.remove(CORRUPT_PROFILE_DATA)
test:done(true)
diff --git a/tools/utils/symtab.lua b/tools/utils/symtab.lua
index e80b9f33..f00d6bc0 100644
--- a/tools/utils/symtab.lua
+++ b/tools/utils/symtab.lua
@@ -100,8 +100,8 @@ function M.parse(reader)
if string.byte(version) ~= LJS_CURRENT_VERSION then
error(string_format(
- "LuaJIT symbol table format version mismatch:"..
- " the tool expects %d, but your data is %d",
+ "LuaJIT symbol table format version mismatch: "..
+ "the tool expects %d, but your data is %d",
LJS_CURRENT_VERSION,
string.byte(version)
))
===
next prev parent reply other threads:[~2024-04-08 9:33 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-26 16:09 Maxim Kokryashkin via Tarantool-patches
2024-04-04 11:19 ` Sergey Bronnikov via Tarantool-patches
2024-04-04 13:33 ` Sergey Kaplun via Tarantool-patches
2024-04-08 9:33 ` Maxim Kokryashkin via Tarantool-patches [this message]
2024-04-08 15:42 ` Sergey Bronnikov via Tarantool-patches
2024-04-11 17:06 ` Sergey Kaplun 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=npzekaqlqepkdasuplrti7il3k4d3xmexkuwkujkym6kkdfstx@cics7gxf5bxz \
--to=tarantool-patches@dev.tarantool.org \
--cc=m.kokryashkin@tarantool.org \
--cc=max.kokryashkin@gmail.com \
--cc=sergeyb@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit v1] profilers: print user-friendly errors' \
/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