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 487FC13101A5; Thu, 6 Mar 2025 19:20:13 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 487FC13101A5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1741278013; bh=5fK3MO6OuN57FG9xLyTHlaQjyFcDXb5Q+GqHUxITf08=; 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=X2be4nQoThSvuXiQdKn6xpa/99lTDYvvVCpHq2CwCCU02V+KX4hBo0MDsYiDoSW74 ovxmW+yhjy4KDnJsFeKXNn/950HARcs4Gksk5j8dk+b+ypxFPJBOhfQ0ayRDV1phQD 9nqzH58+cAIFNKoxVfyk+44pBtx9/FAsAI/q3P+8= Received: from mail-lj1-f175.google.com (mail-lj1-f175.google.com [209.85.208.175]) (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 CD8C7131018F for ; Thu, 6 Mar 2025 19:19:56 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org CD8C7131018F Received: by mail-lj1-f175.google.com with SMTP id 38308e7fff4ca-30bf251025aso1365981fa.1 for ; Thu, 06 Mar 2025 08:19:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741277994; x=1741882794; 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=JwRiEA/81Q2211PuMypIh5ZGGEnDSOagxBvGqGM0wJo=; b=msSkNr1frr6lGoX3I5gXOm1uOkJSF9t5QvbpJHVmy88tZ9h58BReWRAs4unHCfjuTl UaC8qDcNZOz+7c7gpL7Z4tX1p+uZx+GEofxdcD+zg69gU/Lj449TxmMT6UhF/f480P5C z1uTPn97ksex+Sp8Nf+36pcSjRPKrn1aQs++aO9D0Vw9kIJUnGfnZhtnoW8YguQ3A5v1 cUJoEM8nFFmNZ8sD3l+xKPx/ZsIGRr6PVY3BaHeHkbmIYC0baN3H+65g9qFMWoKtr8ep Os9Nh/QnkBnww84zYLSZAjalOzS+UrzlJwGeTxvIBJndUHwTtmQXRunA58pBVqTFl9hO JrLA== X-Gm-Message-State: AOJu0YweHldZFVXqNy7vfFh1jaoVQzjwYXCUkikx9CU+wPNK63ltd+wT 8DgwTwLURwazi9mZ2Fuzsj/MjjBexHzGRha+Ct2+QqVtsm6GP957SiF7DK/A X-Gm-Gg: ASbGncsdCgM2UTxvdjAdoN/7wJZXQSvyeTQJMaV6LOI01gOFkz0z0uLy02+6/zI/Gia QtjDp7cly8/6OfRXr6DbyHDtO+ROSJZY53JagOo5ek/TW+O+LO7g5C67qzj2UQktlgP+yIcTDM8 sFzzDv/Yo0IVq7KHAkh8+M0mSY7Ris8WJLYN7kJo6XQ7C/YtqXq3IFxZ6l6s4FvA9x3Az1lS4qe ZOVsmy/hQ3ov7pzC2n5+J4o8BIYg/ks4CA2nCKY8AfeCBXSl7FjD90ZtNH/wZ74dTljzXRjOiX8 L696pvIomKM8xVyiksoWuQvIskjxNF4+mpSWPg== X-Google-Smtp-Source: AGHT+IGLDR2msX1VGheVpoDwp99Whz4W8/lhGh1/sVE+dQoZavgMVEQhZB7ZMbfPPydtpKyR7h+ZNg== X-Received: by 2002:a2e:9d8f:0:b0:2ff:56a6:2992 with SMTP id 38308e7fff4ca-30bd7afca27mr28878431fa.37.1741277993409; Thu, 06 Mar 2025 08:19:53 -0800 (PST) Received: from localhost ([79.164.223.111]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-30be98d0f00sm2530381fa.4.2025.03.06.08.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Mar 2025 08:19:53 -0800 (PST) X-Google-Original-From: Sergey Bronnikov To: tarantool-patches@dev.tarantool.org, Sergey Kaplun Date: Thu, 6 Mar 2025 19:18:56 +0300 Message-ID: <4fcb9e5102d73a19ddce611d7f477bdbdb088483.1741277815.git.sergeyb@tarantool.org> 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 1/3] sysprof: rename sysprof_error to prof_error 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" Rename a function `sysprof_error()` to `prof_error()` to make it profiler-independent. Needed for the following commit. --- src/lib_misc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib_misc.c b/src/lib_misc.c index 83669268..9c827157 100644 --- a/src/lib_misc.c +++ b/src/lib_misc.c @@ -276,7 +276,7 @@ static int parse_sysprof_opts(lua_State *L, struct luam_Sysprof_Options *opt, return PROFILE_SUCCESS; } -static int sysprof_error(lua_State *L, int status, const char *err_details) +static int prof_error(lua_State *L, int status, const char *err_details) { switch (status) { case PROFILE_ERRUSE: @@ -307,7 +307,7 @@ LJLIB_CF(misc_sysprof_start) { #if !LJ_HASSYSPROF const char *err_details = err2msg(LJ_ERR_PROF_DETAILS_DISABLED); - return sysprof_error(L, PROFILE_ERRUSE, err_details); + return prof_error(L, PROFILE_ERRUSE, err_details); #else int status = PROFILE_SUCCESS; @@ -316,12 +316,12 @@ LJLIB_CF(misc_sysprof_start) status = parse_sysprof_opts(L, &opt, &err_details); if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) - return sysprof_error(L, status, err_details); + return prof_error(L, status, err_details); status = luaM_sysprof_start(L, &opt); if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) /* Allocated memory will be freed in on_stop callback. */ - return sysprof_error(L, status, err_details); + return prof_error(L, status, err_details); lua_pushboolean(L, 1); return 1; @@ -333,11 +333,11 @@ LJLIB_CF(misc_sysprof_stop) { #if !LJ_HASSYSPROF const char *err_details = err2msg(LJ_ERR_PROF_DETAILS_DISABLED); - return sysprof_error(L, PROFILE_ERRUSE, err_details); + return prof_error(L, PROFILE_ERRUSE, err_details); #else int status = luaM_sysprof_stop(L); if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) - return sysprof_error(L, status, NULL); + return prof_error(L, status, NULL); lua_pushboolean(L, 1); return 1; @@ -349,14 +349,14 @@ LJLIB_CF(misc_sysprof_report) { #if !LJ_HASSYSPROF const char *err_details = err2msg(LJ_ERR_PROF_DETAILS_DISABLED); - return sysprof_error(L, PROFILE_ERRUSE, err_details); + return prof_error(L, PROFILE_ERRUSE, err_details); #else struct luam_Sysprof_Counters counters = {}; GCtab *data_tab = NULL; GCtab *count_tab = NULL; int status = luaM_sysprof_report(&counters); if (status != PROFILE_SUCCESS) - return sysprof_error(L, status, NULL); + return prof_error(L, status, NULL); lua_createtable(L, 0, 3); data_tab = tabV(L->top - 1); @@ -394,7 +394,7 @@ LJLIB_CF(misc_memprof_start) { #if !LJ_HASMEMPROF const char *err_details = err2msg(LJ_ERR_PROF_DETAILS_DISABLED); - return sysprof_error(L, PROFILE_ERRUSE, err_details); + return prof_error(L, PROFILE_ERRUSE, err_details); #else struct lj_memprof_options opt = {0}; GCstr *s = lj_lib_optstr(L, 1); @@ -454,7 +454,7 @@ LJLIB_CF(misc_memprof_stop) { #if !LJ_HASMEMPROF const char *err_details = err2msg(LJ_ERR_PROF_DETAILS_DISABLED); - return sysprof_error(L, PROFILE_ERRUSE, err_details); + return prof_error(L, PROFILE_ERRUSE, err_details); #else int status = lj_memprof_stop(L); if (status != PROFILE_SUCCESS) { -- 2.43.0