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 6E7141310185; Thu, 6 Mar 2025 19:04:32 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 6E7141310185 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1741277072; bh=u+uDVQRAua7ksU4z+33tZ2iXnM16YqQfHXwsa5wmJYc=; h=Date:To:Cc:References:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=vMG0IyK8Bpvm8aoK6YLuSUO3jT4XOZsMY6APX56Z7xZc+MJgMuGfOL8P0ebT11jjl cVCaz2fldUT/n4gWenFAXFyj2StUF2LSbYnUKjb2P45Hg+YmHCDgRrgQX+6mPleTqr MnweTZE0abfzQINGRskApVA+nQAPlJ5COYFgX27w= Received: from send263.i.mail.ru (send263.i.mail.ru [95.163.59.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 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 DCD7C1310185 for ; Thu, 6 Mar 2025 19:04:30 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DCD7C1310185 Received: by exim-smtp-8cb569c79-kl5mp with esmtpa (envelope-from ) id 1tqDi1-00000000BIl-3X1Q; Thu, 06 Mar 2025 19:04:30 +0300 Content-Type: multipart/alternative; boundary="------------jCl4bLQbmMyRMWLVCTFS23Cy" Message-ID: <34a098d8-d06c-4e44-964e-24257921116c@tarantool.org> Date: Thu, 6 Mar 2025 19:04:29 +0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Sergey Kaplun , Sergey Bronnikov Cc: tarantool-patches@dev.tarantool.org References: <24b8d43f6ce2796ba2cb9e6740182c82ea0ddf35.1740468394.git.sergeyb@tarantool.org> In-Reply-To: X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9C8AED3E6A44DB6AB342B3125D12B76469B3258E56A3293D9182A05F5380850407E74E9CC052801153DE06ABAFEAF67058F0EC3EF4442BA8F4C6F9A6144D95DA9C90CEAAFAE53FB89 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7F65C230EDDCD559EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637AC83A81C8FD4AD23D82A6BABE6F325AC2E85FA5F3EDFCBAA7353EFBB553375666B3C118DAE8E6700B83F1F346E419F41F46FB2FA9E28810FB7B41E9DA2B6C078389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0A29E2F051442AF778941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B65FF0BFC5AEE34BE6CC7F00164DA146DA6F5DAA56C3B73B237318B6A418E8EAB8D32BA5DBAC0009BE9E8FC8737B5C2249EF34D665BE9CA8B776E601842F6C81A12EF20D2F80756B5FB606B96278B59C4276E601842F6C81A127C277FBC8AE2E8BF858E60A7739E4253AA81AA40904B5D99C9F4D5AE37F343AD1F44FA8B9022EA23BBE47FD9DD3FB595F5C1EE8F4F765FC72CEEB2601E22B093A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE4930A3850AC1BE2E735D028CC0B556B22BCC4224003CC83647689D4C264860C145E X-C1DE0DAB: 0D63561A33F958A5679513A737E4CA845002B1117B3ED696F7F2E270F255DC52B74D9144D44E4FCF823CB91A9FED034534781492E4B8EEADA91A6E18C88C5E2F X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF1C3274F2048FF50703E510A414405C4553903C21B4DDA11CF664C97EC637062BA4BD9291AB2A8456EDA8A7084F1AF318E580A07F3EEC9C5AC0D34BC738B022FA9F7C28E92E52D5F85F4332CA8FE04980913E6812662D5F2AB9AF64DB4688768036DF5FE9C0001AF333F2C28C22F508233FCF178C6DD14203 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu53w8ahmwBjZKM/YPHZyZHvz5uv+WouB9+ObcCpyrx6l7KImUglyhkEat/+ysWwi0gdhEs0JGjl6ggRWTy1haxBpVdbIX1nthFXMZebaIdHP2ghjoIc/363UZI6Kf1ptIMVQiWK+2I7Y2sbiLUKmMGuZw= X-Mailru-Sender: C4F68CFF4024C8867DFDF7C7F25884584968C16ED04F6FFDAA70CB78A12CDBB58BA61D8763B3F037DE9789092B5ACC5A645D15D82EE4B272BD6E4642A116CA93524AA66B5ACBE6721EF430B9A63E2A504198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 2/3] misc: use prof_error for handling errors 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" This is a multi-part message in MIME format. --------------jCl4bLQbmMyRMWLVCTFS23Cy Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi, Sergey, see my comments On 05.03.2025 17:49, Sergey Kaplun via Tarantool-patches wrote: > Hi, Sergey! > Thanks for the patch! > LGTM, except 1 minor comment and 1 reminder below. > > On 25.02.25, Sergey Bronnikov wrote: >> The patch consolidates handling profilers errors into a single >> place - in a function `prof_error()` and handles PROFILE_ERRIO, >> generated in a function `misc_memprof_start`, in a `prof_error()`. >> --- >> src/lib_misc.c | 49 +++++++++---------------------------------------- >> 1 file changed, 9 insertions(+), 40 deletions(-) >> >> diff --git a/src/lib_misc.c b/src/lib_misc.c >> index b4b58509..c4b40996 100644 >> --- a/src/lib_misc.c >> +++ b/src/lib_misc.c >> @@ -286,14 +286,14 @@ static int prof_error(lua_State *L, int status, const char *err_details) >> lua_pushstring(L, err2msg(LJ_ERR_PROF_MISUSE)); >> lua_pushinteger(L, EINVAL); >> return 3; >> -#if LJ_HASSYSPROF >> +#if LJ_HASSYSPROF || LJ_HASMEMPROF >> case PROFILE_ERRRUN: >> lua_pushnil(L); >> lua_pushstring(L, err2msg(LJ_ERR_PROF_ISRUNNING)); >> lua_pushinteger(L, EINVAL); >> return 3; >> case PROFILE_ERRIO: >> - return luaL_fileresult(L, 0, NULL); >> + return luaL_fileresult(L, 0, err_details); > Discussed offline that this should be done in the previous patch-set. The hunk is gone after rebase. > >> #endif > > >> + if (LJ_UNLIKELY(status == PROFILE_ERRRUN)) { >> lua_pushnil(L); >> lua_pushstring(L, err2msg(LJ_ERR_PROF_NOTRUNNING)); >> lua_pushinteger(L, EINVAL); >> return 3; >> - case PROFILE_ERRIO: >> - return luaL_fileresult(L, 0, NULL); >> -#endif >> - default: >> - lj_assertL(0, "bad memprof error %d", status); >> - return 0; >> - } >> } >> + if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) > Minor: Looks like more natural to use `else if` here? > Feel free to ignore. Fixed: --- a/src/lib_misc.c +++ b/src/lib_misc.c @@ -443,9 +443,9 @@ LJLIB_CF(misc_memprof_stop)        lua_pushstring(L, err2msg(LJ_ERR_PROF_NOTRUNNING));        lua_pushinteger(L, EINVAL);        return 3; -  } -  if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) +  } else if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) {      return prof_error(L, status, NULL); +  }    lua_pushboolean(L, 1);    return 1; >> + return prof_error(L, status, NULL); >> + >> lua_pushboolean(L, 1); >> return 1; >> #endif /* !LJ_HASMEMPROF */ >> -- >> 2.43.0 >> --------------jCl4bLQbmMyRMWLVCTFS23Cy Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: 8bit

Hi, Sergey,

see my comments

On 05.03.2025 17:49, Sergey Kaplun via Tarantool-patches wrote:
Hi, Sergey!
Thanks for the patch!
LGTM, except 1 minor comment and 1 reminder below.

On 25.02.25, Sergey Bronnikov wrote:

The patch consolidates handling profilers errors into a single
place - in a function `prof_error()` and handles PROFILE_ERRIO,
generated in a function `misc_memprof_start`, in a `prof_error()`.
---
 src/lib_misc.c | 49 +++++++++----------------------------------------
 1 file changed, 9 insertions(+), 40 deletions(-)

diff --git a/src/lib_misc.c b/src/lib_misc.c
index b4b58509..c4b40996 100644
--- a/src/lib_misc.c
+++ b/src/lib_misc.c
@@ -286,14 +286,14 @@ static int prof_error(lua_State *L, int status, const char *err_details)
         lua_pushstring(L, err2msg(LJ_ERR_PROF_MISUSE));
       lua_pushinteger(L, EINVAL);
       return 3;
-#if LJ_HASSYSPROF
+#if LJ_HASSYSPROF || LJ_HASMEMPROF
     case PROFILE_ERRRUN:
       lua_pushnil(L);
       lua_pushstring(L, err2msg(LJ_ERR_PROF_ISRUNNING));
       lua_pushinteger(L, EINVAL);
       return 3;
     case PROFILE_ERRIO:
-      return luaL_fileresult(L, 0, NULL);
+      return luaL_fileresult(L, 0, err_details);

Discussed offline that this should be done in the previous patch-set.
The hunk is gone after rebase.


 #endif

<snipped>


+  if (LJ_UNLIKELY(status == PROFILE_ERRRUN)) {
       lua_pushnil(L);
       lua_pushstring(L, err2msg(LJ_ERR_PROF_NOTRUNNING));
       lua_pushinteger(L, EINVAL);
       return 3;
-    case PROFILE_ERRIO:
-      return luaL_fileresult(L, 0, NULL);
-#endif
-    default:
-      lj_assertL(0, "bad memprof error %d", status);
-      return 0;
-    }
   }
+  if (LJ_UNLIKELY(status != PROFILE_SUCCESS))

Minor: Looks like more natural to use `else if` here?
Feel free to ignore.

Fixed:

--- a/src/lib_misc.c
+++ b/src/lib_misc.c
@@ -443,9 +443,9 @@ LJLIB_CF(misc_memprof_stop)
       lua_pushstring(L, err2msg(LJ_ERR_PROF_NOTRUNNING));
       lua_pushinteger(L, EINVAL);
       return 3;
-  }
-  if (LJ_UNLIKELY(status != PROFILE_SUCCESS))
+  } else if (LJ_UNLIKELY(status != PROFILE_SUCCESS)) {
     return prof_error(L, status, NULL);
+  }
 
   lua_pushboolean(L, 1);
   return 1;


      

        
+    return prof_error(L, status, NULL);
+
   lua_pushboolean(L, 1);
   return 1;
 #endif /* !LJ_HASMEMPROF */
-- 
2.43.0



      

      

    

  
  


--------------jCl4bLQbmMyRMWLVCTFS23Cy--