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 9E7681218BCE; Tue, 25 Feb 2025 10:33:42 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9E7681218BCE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1740468822; bh=KOqyLPsMTr4J59ofhjUJvMZr26fsMMQmLxGmXjN3lg8=; 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=brz3H73NYrLkQ8m3SpE7sJPeZCdsc7k6jQ38jVC+DHdKpfAX+eNDlxU1bmqMtnayc dT2LA2cDl9nGOdDGoQ08X1mETkSsIBacRDQCv4SesHNL/M+pzxL0czCbeQLyhqN4jB Ot0HmMxjsduJkv4znfwCIur1PJVb2dVyvAmmCJGg= Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (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 569E11218BCE for ; Tue, 25 Feb 2025 10:33:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 569E11218BCE Received: by mail-lj1-f172.google.com with SMTP id 38308e7fff4ca-30737db1ab1so41259341fa.1 for ; Mon, 24 Feb 2025 23:33:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740468795; x=1741073595; 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=s4K82JP8lJ4etpSOGFm87YuXgfFIME22hD3sJLxRqgg=; b=mtOABzpMzW9oG6WBOnAz2RMTG8MQVLMynNxnjPx8GlFp6Q0/JAL52Uhh0E/cIR38y8 Gwup2rgXFuV0e+AyvACNi7SPvD56IFOzB2BoIoOe7CXxRJNKhKhdIdB5yDNatCUHUlJj rzcdN6ElYtpBM4aIMghSdFN7+jalTIervBOMJK5H5DuvmrnXuToPbn2mOSNtBKAOPIZ5 wUHfNOUQPPKuJfncc0p04ZmFnrMRax0VQCOpMytniDDCrUPPPr28X2WwkBaz0H1OrckE 1MJqcuUSIMn76F3toMDFlsdCDelRYLBkJ2Nk8UQfmisRJElJIOkaWVhfmEOB2/SRkwB3 FJ5g== X-Gm-Message-State: AOJu0YwdM+QTJNUoh5ZNfOPNgUxb2ZlNytTgKeZFyCoeXsVT2p4bwjnI 0OSW7e2V0VYevxfNC46roo11G+G3wGPIKeuqmFAPggApy60iAN+aE+w0b9Wop0M= X-Gm-Gg: ASbGncvMGUMnT5iZqwGsQJ5lZQvNprB4XhAy8QBhKgQQS6nsxED2CVGoRagBujLClOE cIc7mNhlvBrU15t6qRaGcmM9II6Th8tjH55EaQ7YahoCNPl64mdqoQHADM5YCSkCcuW3ul8RIBE GamuYX6DQ92hnmXPI3rLuUnZ13X2DaEWcv8CJd57ROL97UmevEoM72Ds+0twM3DgB70EPM1Om2d 1X2/5TRbylGkmo5j5JegJVYSL6IWTW3/krIPHeCOkdJD1XDni5DX8xyQisQuWhh8oMVXcPZWNQ4 PzCBpurn3/bdi67r0o0= X-Google-Smtp-Source: AGHT+IHInP3iKZSNa8d4ZnEmLs/eSyLQnFB5Iuc0ZWRIhXLXSmdCT4IsCspA30WA3PxeuapIthzAnA== X-Received: by 2002:a05:6512:398a:b0:545:a7a:ce5e with SMTP id 2adb3069b0e04-548391376b0mr5993224e87.15.1740468795177; Mon, 24 Feb 2025 23:33:15 -0800 (PST) Received: from localhost ([79.164.223.111]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-548514b25f1sm105054e87.3.2025.02.24.23.33.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 23:33:14 -0800 (PST) X-Google-Original-From: Sergey Bronnikov To: tarantool-patches@dev.tarantool.org, Sergey Kaplun Date: Tue, 25 Feb 2025 10:32:46 +0300 Message-ID: <5bdd6ea7b4f943a8e05731f78e1a5d8f359e3251.1740468394.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 94ec6564..b4b58509 100644 --- a/src/lib_misc.c +++ b/src/lib_misc.c @@ -275,7 +275,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: @@ -306,7 +306,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; @@ -315,12 +315,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; @@ -332,11 +332,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; @@ -348,14 +348,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); @@ -393,7 +393,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); @@ -453,7 +453,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