From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id E66C2560EBC; Mon, 31 Jul 2023 23:31:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E66C2560EBC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1690835474; bh=7yTpHCO7QkUvQu9vFfEg2xL4jszfNEyT22IAngeLiNI=; 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=XxzMlSwrT8VJDKKpLobU9NMdb65TaMppfad4Mfof47r2AMCuEys4r3Ie4/kBhOgVO OTSSTQgoNuy7VbS60OmEl5CQdilBUkceUvTOWTFdbTEw4u4qmaDOc9mKKmUPbTV7T7 4XZGGThFTpP3v4N92KTaGt1aaiXq8hoeNRvzm8Pk= Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) (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 55E8955C707 for ; Mon, 31 Jul 2023 23:30:20 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 55E8955C707 Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-4fe0d5f719dso8184415e87.2 for ; Mon, 31 Jul 2023 13:30:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690835419; x=1691440219; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9ELiK4oVamN8SGHkzgcX9ck2gBQppOwDOoSqi9Fbnvg=; b=R+0EckH0lPYoH74D6wM+iXMmHl9Lqx5kzUEoUeDsmw/Mg/jgZFO+nEkFiqBmPVcMM+ OgTjdakZF/qsOLrRDUmEtj8o6/FFTDCD2FRbIUl/O/jeEGQ430w8SdPD7vCZYmVBox0z pNIJyEoqsKoc32cavsFttNPGomGxYuEOvy/RVGGH1k7BB4LkddbGR7RYPMMR/YsqTz1N yIRXXIRQOspreispbY2RmM1nAR/FRcgnHp8hSpq+Ey4kZpVMlJr4jRpp2ucUqXDVgvx6 54j2yqiUeseiLxu1jl7YOAU0iHhNc8QdQIa7tzkBbxYrwyjXh9G8SwMFVZ+klZjqbCNB 7ziQ== X-Gm-Message-State: ABy/qLZxDr/fU3mMweCLJQrnaqmi5Uh0KCKmzoLc6mem9m7gXZRbYPOl bqRJEsua2Owj6qBAFe5+7/PV8Rfflzeo2g== X-Google-Smtp-Source: APBJJlFvOsoNCIvkqt1Wtj/qmU1+8KV8DZ7B/+6zTGLn+FvErAkuQveA8ppM7HOTT4snw9LYWebe6w== X-Received: by 2002:a05:6512:250b:b0:4f9:556b:93c5 with SMTP id be11-20020a056512250b00b004f9556b93c5mr707601lfb.40.1690835419243; Mon, 31 Jul 2023 13:30:19 -0700 (PDT) Received: from localhost.localdomain (95-24-1-220.broadband.corbina.ru. [95.24.1.220]) by smtp.gmail.com with ESMTPSA id r25-20020ac24d19000000b004fe1f1c0ee4sm1814906lfi.82.2023.07.31.13.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 13:30:18 -0700 (PDT) X-Google-Original-From: Maxim Kokryashkin To: tarantool-patches@dev.tarantool.org, skaplun@tarantool.org, imun@tarantool.org Date: Mon, 31 Jul 2023 23:30:04 +0300 Message-ID: <2b57c59938395c0e2ce491e7bdf3b8d08a246b8f.1690834846.git.m.kokryashkin@tarantool.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit v3 2/4] sysprof: remove `split by vmstate` option X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Maxim Kokryashkin via Tarantool-patches Reply-To: Maxim Kokryashkin Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" This option is unneeded and was never used by anybody. There is no reason to maintain it in the scope of refactoring. Needed for tarantool/tarantool#8700 --- tools/sysprof.lua | 9 +-------- tools/sysprof/collapse.lua | 10 +++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/tools/sysprof.lua b/tools/sysprof.lua index 1afab195..22c724e9 100644 --- a/tools/sysprof.lua +++ b/tools/sysprof.lua @@ -6,8 +6,6 @@ local misc = require "sysprof.collapse" local stdout, stderr = io.stdout, io.stderr local match, gmatch = string.match, string.gmatch -local split_by_vmstate = false - -- Program options. local opt_map = {} @@ -23,15 +21,10 @@ luajit-parse-sysprof [options] sysprof.bin Supported options are: --help Show this help and exit - --split Split callchains by vmstate ]] os.exit(0) end -function opt_map.split() - split_by_vmstate = true -end - -- Print error and exit with error status. local function opterror(...) stderr:write("luajit-parse-sysprof.lua: ERROR: ", ...) @@ -103,7 +96,7 @@ local function dump(inputfile) local symbols = symtab.parse(reader) local events = sysprof.parse(reader, symbols) - local calltree = misc.collapse(events, symbols, split_by_vmstate) + local calltree = misc.collapse(events, symbols) traverse_calltree(calltree, '') diff --git a/tools/sysprof/collapse.lua b/tools/sysprof/collapse.lua index 3d83d5ea..ac5269ea 100755 --- a/tools/sysprof/collapse.lua +++ b/tools/sysprof/collapse.lua @@ -75,7 +75,7 @@ end -- merge lua and host callchains into one callchain representing -- transfer of control -local function merge(event, symbols, sep_vmst) +local function merge(event, symbols) local cc = {} for _,h_fr in pairs(event.host.callchain) do @@ -98,19 +98,15 @@ local function merge(event, symbols, sep_vmst) end - if sep_vmst == true then - table.insert(cc, { name = VMST_NAMES[event.lua.vmstate] }) - end - return cc end -- Collapse all the events into call tree -function M.collapse(events, symbols, sep_vmst) +function M.collapse(events, symbols) local root = new_node('root', false) for _,ev in pairs(events) do - local callchain = merge(ev, symbols, sep_vmst) + local callchain = merge(ev, symbols) local curr_node = root for i=#callchain,1,-1 do curr_node = insert(callchain[i].name, curr_node, false) -- 2.41.0