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 04C806E237; Sat, 23 Jul 2022 09:33:10 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 04C806E237 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1658557990; bh=3OnvtdxYx0v4Dxb5oiGtbAUYInDOmCD7swq2a7OkgHg=; h=To:Cc:Date:In-Reply-To:References:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=YUobOcNL0ElidcvoVUzGFwNeIxXcTihtDiCjwIEWVI1rYUMqcpCuUan2GpM/ud+cr 1s9xid9FgspeshrSmEzV0MMjTXMthnjwz6xo6jkq+4ALaLK6rTalTAykyiIwrKRn+5 pmO1gAeVzOI7aMRg3wWLik+thmKzdnX0nERqjs1Q= Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) (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 31BC16ECE3 for ; Sat, 23 Jul 2022 03:11:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 31BC16ECE3 Received: by mail-lf1-f45.google.com with SMTP id p10so2450478lfd.9 for ; Fri, 22 Jul 2022 17:11:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MpfLpouAUfTo5+ptRWqtrNhu3R7lb9upxehm86LCna8=; b=Z4N0Ygcg3yvYtxtCju5sU9+9qORSe5ArZg53gjdiDVu0lhxFeRz3FwuRfxHTM7GElM bxLLYFq9DSv+yhMZRu+lH7iNRUKVWrLWg2bcducqEG2sHf0lUyqnpqGLHFqf3k/gW+TP QSWvCHdamtga2Vb/enpnuEJyUjbHsvbBFpWx66H/luy5baXPyOCZNFDS2qJD2L7HZOj9 o0kmD/fW+b+QUkeEIl7nm1xeXxGlf3PeT8kTVlVKFEx4tt2yiAY5VYmk1v3LpH8q950Q SLo+HoIEkEJt2buTaQ2eEpPAfaJz01GGUoxahXKBisWq85BGJ3W2fZ25Gvl2+fRFhq0f 1zBA== X-Gm-Message-State: AJIora/mh2T/5ZlXH379iKeqxMf+7cdEwk/xKKVb/vM32DyzXvv2XIXk +c6oCIDN/VeH/mUr3C3NPX+BbvdPwyCK8g== X-Google-Smtp-Source: AGRyM1vNf0MN7LgY3sq/jmMpsA7t7J1RrQEhHuy0mHTBlTYqiANdTf/KOucPj8SJM9qNZ+0bps9RuQ== X-Received: by 2002:a05:6512:2282:b0:489:fdb3:2351 with SMTP id f2-20020a056512228200b00489fdb32351mr851197lfu.209.1658535110561; Fri, 22 Jul 2022 17:11:50 -0700 (PDT) Received: from m1book8749.mail.msk ([178.176.77.142]) by smtp.gmail.com with ESMTPSA id f2-20020a056512360200b004870ef4a0c7sm1338115lfs.17.2022.07.22.17.11.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Jul 2022 17:11:50 -0700 (PDT) X-Google-Original-From: Mikhail Elhimov To: tarantool-patches@dev.tarantool.org Cc: Mikhail Elhimov Date: Sat, 23 Jul 2022 03:11:19 +0300 Message-Id: <9eaffd397e8ebb3ccb898d50686249b9edd3f02f.1658531255.git.m.elhimov@vk.team> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Sat, 23 Jul 2022 09:33:06 +0300 Subject: [Tarantool-patches] [PATCH 1/2] gdb: adjust to support python2 (centos 7) 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: Mikhail Elhimov via Tarantool-patches Reply-To: Mikhail Elhimov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Stop using unpacking arguments within list initialization as python2 only supports it in function call fixes tarantool/luajit#7458 --- src/luajit-gdb.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py index baf66f66..1e9a96fb 100644 --- a/src/luajit-gdb.py +++ b/src/luajit-gdb.py @@ -432,15 +432,16 @@ def dump_stack(L, base=None, top=None): maxstack = mref('TValue *', L['maxstack']) red = 5 + 2 * LJ_FR2 - dump = '\n'.join([ - '{padding} Red zone: {nredslots: >2} slots {padding}'.format( - padding = '-' * len(PADDING), - nredslots = red, - ), - *( - dump_stack_slot(L, maxstack + offset, base, top, '') - for offset in range(red, 0, -1) - ), + dump = [] + dump.append('{padding} Red zone: {nredslots: >2} slots {padding}'.format( + padding = '-' * len(PADDING), + nredslots = red, + )) + dump.extend([ + dump_stack_slot(L, maxstack + offset, base, top, '') + for offset in range(red, 0, -1) + ]) + dump.extend([ '{padding} Stack: {nstackslots: >5} slots {padding}'.format( padding = '-' * len(PADDING), nstackslots = int((tou64(maxstack) - tou64(stack)) >> 3), @@ -451,7 +452,8 @@ def dump_stack(L, base=None, top=None): end = strx64(maxstack - 1), nfreeslots = int((tou64(maxstack) - tou64(top) - 8) >> 3), ), - ]) + '\n' + ]) + dump = '\n'.join(dump) + '\n' slot = top framelink = base - (1 + LJ_FR2) -- 2.34.1