From: Mikhail Shishatskiy via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, imun@tarantool.org, skaplun@tarantool.org Subject: [Tarantool-patches] [PATCH luajit v4 2/4] memprof: refactor location parsing Date: Wed, 29 Sep 2021 23:07:56 +0300 [thread overview] Message-ID: <20210929200758.149446-3-m.shishatskiy@tarantool.org> (raw) In-Reply-To: <20210929200758.149446-1-m.shishatskiy@tarantool.org> As it is hard to keep function `id_location` easily usable in the function `parse_location` with a growing number of fields in the <loc> table, the code is refactored to make it more understandable. The API of <utils/symtab.lua> module changed with adding a function `id(loc)` returning the same id-string, as `id_location` did. This function is useful to "stringify" the location and use it as a key in the key/value storage. Part of tarantool/tarantool#5814 --- Issue: https://github.com/tarantool/tarantool/issues/5814 Branch: https://github.com/tarantool/luajit/tree/shishqa/gh-5814-group-allocations-on-trace-by-trace-number CI: https://github.com/tarantool/tarantool/tree/shishqa/gh-5814-group-allocations-on-trace-by-trace-number tools/memprof/parse.lua | 26 +++++++++++++------------- tools/utils/symtab.lua | 4 ++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/memprof/parse.lua b/tools/memprof/parse.lua index 12e2758f..34ff8aef 100644 --- a/tools/memprof/parse.lua +++ b/tools/memprof/parse.lua @@ -8,6 +8,8 @@ local bit = require "bit" local band = bit.band local lshift = bit.lshift +local symtab = require "utils.symtab" + local string_format = string.format local LJM_MAGIC = "ljm" @@ -59,22 +61,20 @@ local function link_to_previous(heap_chunk, e, nsize) end end -local function id_location(addr, line) - return string_format("f%#xl%d", addr, line), { - addr = addr, - line = line, - } -end - local function parse_location(reader, asource) - if asource == ASOURCE_INT then - return id_location(0, 0) - elseif asource == ASOURCE_CFUNC then - return id_location(reader:read_uleb128(), 0) + local loc = { + addr = 0, + line = 0, + } + if asource == ASOURCE_CFUNC then + loc.addr = reader:read_uleb128() elseif asource == ASOURCE_LFUNC then - return id_location(reader:read_uleb128(), reader:read_uleb128()) + loc.addr = reader:read_uleb128() + loc.line = reader:read_uleb128() + elseif asource ~= ASOURCE_INT then + error("Unknown asource "..asource) end - error("Unknown asource "..asource) + return symtab.id(loc), loc end local function parse_alloc(reader, asource, events, heap) diff --git a/tools/utils/symtab.lua b/tools/utils/symtab.lua index 3ed1dd13..e01daa62 100644 --- a/tools/utils/symtab.lua +++ b/tools/utils/symtab.lua @@ -73,6 +73,10 @@ function M.parse(reader) return symtab end +function M.id(loc) + return string_format("f%#xl%d", loc.addr, loc.line) +end + function M.demangle(symtab, loc) local addr = loc.addr -- 2.33.0
next prev parent reply other threads:[~2021-09-29 20:09 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-20 7:05 [Tarantool-patches] [PATCH luajit v3 0/4] memprof: group allocations on traces by trace number Mikhail Shishatskiy via Tarantool-patches 2021-08-20 7:05 ` [Tarantool-patches] [PATCH luajit v3 1/5] core: add const to lj_debug_line proto parameter Mikhail Shishatskiy via Tarantool-patches 2021-09-16 15:29 ` Igor Munkin via Tarantool-patches 2021-08-20 7:05 ` [Tarantool-patches] [PATCH luajit v3 2/5] test: separate memprof Lua API tests into subtests Mikhail Shishatskiy via Tarantool-patches 2021-09-16 15:29 ` Igor Munkin via Tarantool-patches 2021-08-20 7:05 ` [Tarantool-patches] [PATCH luajit v3 3/5] memprof: dump traceno if allocate from trace Mikhail Shishatskiy via Tarantool-patches 2021-09-16 15:32 ` Igor Munkin via Tarantool-patches 2021-09-29 19:21 ` Mikhail Shishatskiy via Tarantool-patches 2021-08-20 7:05 ` [Tarantool-patches] [PATCH luajit v3 4/5] memprof: extend symtab with info about traces Mikhail Shishatskiy via Tarantool-patches 2021-09-16 15:32 ` Igor Munkin via Tarantool-patches 2021-09-29 19:21 ` Mikhail Shishatskiy via Tarantool-patches 2021-08-20 7:05 ` [Tarantool-patches] [PATCH luajit v3 5/5] luajit: change order of modules Mikhail Shishatskiy via Tarantool-patches 2021-09-16 15:32 ` Igor Munkin via Tarantool-patches 2021-09-29 20:07 ` [Tarantool-patches] [PATCH luajit v4 0/4] memprof: group allocations on traces by traceno Mikhail Shishatskiy via Tarantool-patches 2021-09-29 20:07 ` [Tarantool-patches] [PATCH luajit v4 1/4] test: separate memprof Lua API tests into subtests Mikhail Shishatskiy via Tarantool-patches 2021-10-27 13:56 ` Igor Munkin via Tarantool-patches 2021-10-27 15:07 ` Sergey Kaplun via Tarantool-patches 2021-09-29 20:07 ` Mikhail Shishatskiy via Tarantool-patches [this message] 2021-10-27 13:56 ` [Tarantool-patches] [PATCH luajit v4 2/4] memprof: refactor location parsing Igor Munkin via Tarantool-patches [not found] ` <20211104130010.mcvnra6e4yl5moo2@surf.localdomain> 2021-11-10 15:38 ` Igor Munkin via Tarantool-patches 2021-09-29 20:07 ` [Tarantool-patches] [PATCH luajit v4 3/4] memprof: group allocations on traces by traceno Mikhail Shishatskiy via Tarantool-patches 2021-10-27 13:56 ` Igor Munkin via Tarantool-patches [not found] ` <20211104130156.f2botlihlfhwd3yh@surf.localdomain> 2021-11-11 15:34 ` Igor Munkin via Tarantool-patches 2021-09-29 20:07 ` [Tarantool-patches] [PATCH luajit v4 4/4] memprof: add info about trace start to symtab Mikhail Shishatskiy via Tarantool-patches 2021-11-01 16:31 ` Igor Munkin via Tarantool-patches [not found] ` <20211104130228.x6qcne5xeh544hm7@surf.localdomain> 2021-11-12 13:34 ` Igor Munkin via Tarantool-patches 2021-11-17 8:17 ` Sergey Kaplun via Tarantool-patches 2021-11-22 15:11 ` Mikhail Shishatskiy via Tarantool-patches 2021-11-24 12:42 ` Mikhail Shishatskiy via Tarantool-patches 2021-11-24 16:44 ` Igor Munkin via Tarantool-patches 2022-01-27 23:29 ` [Tarantool-patches] [PATCH luajit v4 0/4] memprof: group allocations on traces by traceno Igor Munkin 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=20210929200758.149446-3-m.shishatskiy@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=imun@tarantool.org \ --cc=m.shishatskiy@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit v4 2/4] memprof: refactor location parsing' \ /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