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 E0F9E12EBF80; Thu, 20 Feb 2025 14:26:07 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org E0F9E12EBF80 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1740050768; bh=4ThYVC3PQxXCTaUGB7EmWptVIH5D/DD7YVExT9+hQhM=; 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=SVZkEKA5+yp6feEfix20hFL7gHnsOhOwJhya8teEtXlXicUmzuJBOjSDIxxkXXJyR 9mB0QN1qWTRVIrTVQOlpubKznotHqINLcKfl0FNgrUFdFGsa5uy1EA8p1ZEhtHZeea 8hyfMTjhce1tAX7hOVj8YwqbvcwQQIzt/QRVN/WQ= Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 DE79612EB022 for ; Thu, 20 Feb 2025 14:22:51 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DE79612EB022 Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5ded1395213so1414520a12.2 for ; Thu, 20 Feb 2025 03:22:51 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740050571; x=1740655371; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WVc7VxOi2VL2oJohKWD4wHB22R0FCIcwx8Eur6qXzss=; b=VdJk5eNgb30ha3EzM0MlH1XT8eyzBy4QuylCbvMUrhdPh28dJTSluFVAmUHjdfshA9 2B0mrS6oRNCO9jR1xpdEYlahGhHbIN1+GOfkKuy+hsBMQlR4h966Hgse6bebUnXLTipj TRxhvpgqSQvzJcHUa60zTyLrxBvkSeN2Gif05BbT2QcpxYvyItelF+qwApqvitCrHBrH 1V/fMFwWAfjxI+FJF6Az22fpmEUfpkRAiS1aNOMaE/gOuDtkFHi27h5jiGjUMJpmpwEB iF5r7Rzf4lmJDefIrqnQ0oNSPQQPsmZhL8rH2icJklc9Sm0fNpMYp7c4psQU9BtB6iON cWow== X-Gm-Message-State: AOJu0Yzc9JQTpQOooSOhfVKhBsjA0UdCPcywt0nx2egreymoX3uqdxV4 gKUlrHSQKBQK/WuYrwsXjj2tgMt+KE5sFWE7EwqwGXjzU6QMLGaTx9q0TNUR X-Gm-Gg: ASbGnctYyNlPkI0IDyMnNwknABdFw0Ugxg7oGb2MLg4D0lMOAhUxagGZbb5wdcJBXB/ xSUFeMvuMN8xU5+71xfLJM9C7p+XIYiIJR50StzlCBlP/CvYzmAsT0kSv06E6MxdSG1OGubmIEM F7u92VFtmr2SiD3HLKCcZbMX4MZjGzL1cr83Ago5y3glLTmZ0NVsjBgnv5keloj3C9qKRn795kb bD5NCFEohR+eFp5eRfZz73wfbPzG/I545ivXwBY1Knu6Jd1qDFMacDT4pFziuTdudH7mCYdRo6g o0vC X-Google-Smtp-Source: AGHT+IE6Iob1IamkDlUdhm8G77RzuTZjC1mpkMuP11JbWTf5YWOObM8sEgNTcQTx9aRao/G9+xG/LA== X-Received: by 2002:a17:907:3d8d:b0:abb:eec3:391b with SMTP id a640c23a62f3a-abbeec351c4mr231326966b.36.1740050570731; Thu, 20 Feb 2025 03:22:50 -0800 (PST) Received: from localhost ([5.181.62.98]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-abb1e1bef3esm1131313666b.146.2025.02.20.03.22.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 03:22:50 -0800 (PST) X-Google-Original-From: Sergey Bronnikov To: tarantool-patches@dev.tarantool.org, Sergey Kaplun , sergos@tarantool.org Date: Thu, 20 Feb 2025 14:21:56 +0300 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit 8/8][v3] memprof: set default path to profiling output file 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: Sergey Bronnikov via Tarantool-patches Reply-To: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" sysprof has an optional parameter `path`, that sets a path to the profiling output file. By default the path is `sysprof.bin`. `misc.memprof.start()` requires to set a path to profiling output file. The patch fixes this inconsistency by introducing a default path to the memprof profiling output file - `memprof.bin`. --- src/lib_misc.c | 5 ++- ...misclib-memprof-lapi-default-file.test.lua | 37 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 test/tarantool-tests/profilers/misclib-memprof-lapi-default-file.test.lua diff --git a/src/lib_misc.c b/src/lib_misc.c index d98cf3f0..92dc6e2a 100644 --- a/src/lib_misc.c +++ b/src/lib_misc.c @@ -387,11 +387,14 @@ LJLIB_CF(misc_sysprof_report) #define LJLIB_MODULE_misc_memprof +#define MEMPROF_DEFAULT_OUTPUT "memprof.bin" + /* local started, err, errno = misc.memprof.start(fname) */ LJLIB_CF(misc_memprof_start) { struct lj_memprof_options opt = {0}; - const char *fname = strdata(lj_lib_checkstr(L, 1)); + GCstr *s = lj_lib_optstr(L, 1); + const char *fname = s ? strdata(s) : MEMPROF_DEFAULT_OUTPUT; struct profile_ctx *ctx; int memprof_status; if (!LJ_HASMEMPROF) { diff --git a/test/tarantool-tests/profilers/misclib-memprof-lapi-default-file.test.lua b/test/tarantool-tests/profilers/misclib-memprof-lapi-default-file.test.lua new file mode 100644 index 00000000..ae8a73c9 --- /dev/null +++ b/test/tarantool-tests/profilers/misclib-memprof-lapi-default-file.test.lua @@ -0,0 +1,37 @@ +local tap = require('tap') +local test = tap.test('misc-memprof-lapi-default-file'):skipcond({ + ['Memprof is implemented for x86_64 only'] = jit.arch ~= 'x86' and + jit.arch ~= 'x64', + ['Memprof is disabled'] = os.getenv('LUAJIT_DISABLE_MEMPROF'), +}) + +test:plan(1) + +local tools = require('utils.tools') + +test:test('default-output-file', function(subtest) + + subtest:plan(1) + + local default_output_file = 'memprof.bin' + os.remove(default_output_file) + + local _, _ = misc.memprof.start() + + local res, err = misc.memprof.stop() + + -- Want to cleanup carefully if something went wrong. + if not res then + os.remove(default_output_file) + error(err) + end + + local profile_buf = tools.read_file(default_output_file) + subtest:ok(profile_buf ~= nil and #profile_buf ~= 0, + 'default output file is not empty') + + -- We don't need it any more. + os.remove(default_output_file) +end) + +test:done(true) -- 2.43.0