From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <tarantool-patches-bounces@dev.tarantool.org>
Received: from [87.239.111.99] (localhost [127.0.0.1])
by dev.tarantool.org (Postfix) with ESMTP id B27326EC55;
Fri, 23 Jul 2021 15:41:30 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B27326EC55
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev;
t=1627044090; bh=on1nKEfLmzM/YDYtKN8WRhsEaTs2UxBxT+Lq57tMRGs=;
h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:
List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:
From;
b=oBPkzElERWFhXlNkSOoJ6ngVQnDofQkNfr14ibeWWcy4e0HhaAkbrEJ4hv4gQRntL
98jdkH0DJhFxbymvdgXe9Pu/sg4gjHcs8Qt0d4IqSbXs4VTRmhdo7Dv0ahy/XNSY+1
Q3kmYihZ12u6fB3AQTSH42YsjWrtNrMg2VSXFfNI=
Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com
[209.85.208.181])
(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by dev.tarantool.org (Postfix) with ESMTPS id D3B036EC6E
for <tarantool-patches@dev.tarantool.org>;
Fri, 23 Jul 2021 15:40:01 +0300 (MSK)
DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org D3B036EC6E
Received: by mail-lj1-f181.google.com with SMTP id x7so1494657ljn.10
for <tarantool-patches@dev.tarantool.org>;
Fri, 23 Jul 2021 05:40:01 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=ge9j39ev9vu3YLSQz41YmhCwr2s9mGUbdDF7TXxCmvo=;
b=puVKdX2mKjMEw5nBbxJ2yyXeYxZzrvk9TntpS/GxvD0HHyZ3qy0GzCumEamoVdXWvO
pIODbqM//dS9faER85ekQiwUYwow3IyMTd951jO40NarzZfLw/C04AN49sk/rxoiDYLM
gK/7rf++LGWHcabjEbHOU/HaC683DG1n0mE0EXZpEhCWRVfFT2h6sXHC0nlxHCC5E/mW
/VyswDIB3jW9ToyoEAw9ZLDyQZqioPmY/cAITWMxHn6IscKJg2qmyWmcy6aGOILP5RbP
aNZJiSgFL6Tes/09nyc7KG6+yPf5+2N5ztfvex572aHYcZNKqd9m2ZIM3WRmUf/XF6iR
TwaQ==
X-Gm-Message-State: AOAM533F3ytUHUIk3VcSpThEMio5z2MrF8JNY4+tzaMcjoturGmAXr4V
RYjV2YQfzhoog5yDllJmuDHr+M7b27uwXXZP
X-Google-Smtp-Source: ABdhPJx/RSjPN94iDj+2cysHVUe7qX12Z0L3KUcsYVHXyi+3LADnktI0+po/OzOi0jGVFxEomepO2g==
X-Received: by 2002:a05:651c:169c:: with SMTP id
bd28mr3135267ljb.286.1627044001225;
Fri, 23 Jul 2021 05:40:01 -0700 (PDT)
Received: from localhost.localdomain ([2a00:1370:8131:3d05:9ca1:57e9:6bb:c500])
by smtp.gmail.com with ESMTPSA id z23sm2224545lfg.153.2021.07.23.05.40.00
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 23 Jul 2021 05:40:00 -0700 (PDT)
X-Google-Original-From: Maxim Kokryashkin <m.kokryashkin@tarantool.org>
To: tarantool-patches@dev.tarantool.org, imun@tarantool.org,
skaplun@tarantool.org
Date: Fri, 23 Jul 2021 15:39:52 +0300
Message-Id: <3c2e148f787e9c1d1506f23f38d938157817c0ef.1627043674.git.m.kokryashkin@tarantool.org>
X-Mailer: git-send-email 2.32.0
In-Reply-To: <cover.1627043674.git.m.kokryashkin@tarantool.org>
References: <cover.1627043674.git.m.kokryashkin@tarantool.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [Tarantool-patches] [PATCH 3/3] test: adapt memprof tests to new
symbol table format
X-BeenThere: tarantool-patches@dev.tarantool.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Tarantool development patches <tarantool-patches.dev.tarantool.org>
List-Unsubscribe: <https://lists.tarantool.org/mailman/options/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=unsubscribe>
List-Archive: <https://lists.tarantool.org/pipermail/tarantool-patches/>
List-Post: <mailto:tarantool-patches@dev.tarantool.org>
List-Help: <mailto:tarantool-patches-request@dev.tarantool.org?subject=help>
List-Subscribe: <https://lists.tarantool.org/mailman/listinfo/tarantool-patches>,
<mailto:tarantool-patches-request@dev.tarantool.org?subject=subscribe>
From: Maxim Kokryashkin via Tarantool-patches
<tarantool-patches@dev.tarantool.org>
Reply-To: Maxim Kokryashkin <max.kokryashkin@gmail.com>
Errors-To: tarantool-patches-bounces@dev.tarantool.org
Sender: "Tarantool-patches" <tarantool-patches-bounces@dev.tarantool.org>
Since memprof's symbol table format has changed to support demangling, it is
necessary to adapt tests to it.
Closes tarantool/tarantool#5813
---
test/tarantool-tests/misclib-memprof-lapi.test.lua | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua
index 06d96b3b..65b6afa6 100644
--- a/test/tarantool-tests/misclib-memprof-lapi.test.lua
+++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua
@@ -53,6 +53,7 @@ local function generate_output(filename)
end
local function fill_ev_type(events, symbols, event_type)
+ local SYMTAB_LFUNC = 0
local ev_type = {}
for _, event in pairs(events[event_type]) do
local addr = event.loc.addr
@@ -61,10 +62,10 @@ local function fill_ev_type(events, symbols, event_type)
name = "INTERNAL",
num = event.num,
}
- elseif symbols[addr] then
+ elseif symbols[SYMTAB_LFUNC][addr] then
ev_type[event.loc.line] = {
name = string.format(
- "%s:%d", symbols[addr].source, symbols[addr].linedefined
+ "%s:%d", symbols[SYMTAB_LFUNC][addr].source, symbols[SYMTAB_LFUNC][addr].linedefined
),
num = event.num,
}
--
2.32.0