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 C48627030C; Tue, 9 Feb 2021 18:28:54 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C48627030C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1612884534; bh=lMr4a3+40UuGInFimbwT5W3y/lq7DUgtyrXlISRPTL0=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=FuzfEm+s+01ftuukRCb7lP6MgkeHVIgflvvNc2dsDp/Rice0wnAvrkovx4sOPnM9K YhOvROmFKGOa3vF5Uifvqp4VpWu7TgaDcnXi+Kc5sGTZl3cskBWaPifx1uKs6PizFS x4lb12XwanYiXSRmm3Ge4j6UK3vPMn/RvikCLpgk= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C9F707030C for ; Tue, 9 Feb 2021 18:28:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org C9F707030C Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1l9UwY-0007Hj-RD; Tue, 09 Feb 2021 18:28:47 +0300 Date: Tue, 9 Feb 2021 18:28:45 +0300 To: Sergey Kaplun Message-ID: <20210209152845.GK5448@tarantool.org> References: <20210209113852.GA23319@root> <20210209124731.GH5448@tarantool.org> <20210209144528.GA9361@root> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210209144528.GA9361@root> X-Clacks-Overhead: GNU Terry Pratchett User-Agent: Mutt/1.10.1 (2018-07-13) X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD953AC099BC0052A9CD7A046B9B594DE544EF4829CAF723B1F182A05F538085040FCE19C9B40AF7F3F0AA5F0E1D4E0C17275B531D06EF4AD0A673A11F032EED1DA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7194E3A96294A28ABEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063761B0653E4D5FA7998638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC649E0843118E76197B5A849E3DCD43D31E3955E507640F22389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C04CF195F1528592878941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6E5E764EB5D94DBD4CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FC696E4123C2B4120575ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4930A3850AC1BE2E7358734EF69C36C4A4DC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A5E76CDB81FF014AEC51612B9C38C356048F1C6D03E4767D26D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75448CF9D3A7B2C848410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3454548929AF40B428120E1037F023C6694D561F2E03A7006B66CE51E44AACF8136F5C1ABA4F944BF61D7E09C32AA3244C2FCA79007ADF968FD849509E501DD62E725D5B54B2FE4575927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojg67HQLCbniJ40zfJwWTVgg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822F2B5D590D2B7755E77FCAB872676F900A7C8D0F45F857DBFE9F1EFEE2F478337FB559BB5D741EB964C8C2C849690F8E70A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit 1/5] build: preserve the original build system 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: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, On 09.02.21, Sergey Kaplun wrote: > Igor, > > On 09.02.21, Igor Munkin wrote: > > Sergey, > > > > Thanks for your review! > > > > On 09.02.21, Sergey Kaplun wrote: > > > Hi, Igor! > > > > > > Thanks for the patch! > > > LGTM, except 4 comments about memory profiler parser below. Added your tag: | Reviewed-by: Sergey Kaplun > > > > I have several questions, so postponed your Ack a bit. > > No problem. > > > > > > > > > On 02.02.21, Igor Munkin wrote: > > > > Since the build machinery is going to be ported to CMake there would be > > > > Makefile names clashing. This change renames the original build system > > > > (and a couple of auxiliary files requiring configuring) to keep all this > > > > machinery working. > > > > > > > > As a result of these changes one need to explicitly specify the Makefile > > > > in the build command: > > > > | make -f Makefile.original > > > > > > > > Needed for tarantool/tarantool#4862 > > > > > > > > Signed-off-by: Igor Munkin > > > > --- > > > > Makefile => Makefile.original | 44 +++++++++++++-------- > > > > etc/{luajit.pc => luajit.pc.in} | 4 +- > > > > src/{Makefile.dep => Makefile.dep.original} | 0 > > > > src/{Makefile => Makefile.original} | 4 +- > > > > tools/luajit-parse-memprof | 9 ----- > > > > tools/luajit-parse-memprof.in | 6 +++ > > > > 6 files changed, 38 insertions(+), 29 deletions(-) > > > > rename Makefile => Makefile.original (85%) > > > > rename etc/{luajit.pc => luajit.pc.in} (91%) > > > > rename src/{Makefile.dep => Makefile.dep.original} (100%) > > > > rename src/{Makefile => Makefile.original} (99%) > > > > delete mode 100755 tools/luajit-parse-memprof > > > > create mode 100644 tools/luajit-parse-memprof.in > > > > > > > > diff --git a/Makefile b/Makefile.original > > > > similarity index 85% > > > > rename from Makefile > > > > rename to Makefile.original > > > > index 61967df..b85d4bf 100644 > > > > --- a/Makefile > > > > +++ b/Makefile.original > > > > +# in scope of https://github.com/tarantool/tarantool/issues/5688. > > > > +tools/$(FILE_TMEMPROF): > > > > + @sed -e "s|@LUAJIT_TOOLS_DIR@|$(realpath tools)|" \ > > > > + -e "s|@LUAJIT_TOOLS_BIN@|$(realpath src/luajit)|" \ > > > > > > 2. @LUAJIT_BIN@ looks more convenient, doesn't it? > > > > It doesn't for me. Why does the current naming look inconvenient to you? > > What does LUAJIT_TOOLS_BIN mean? I confused by TOOLS part. It means a LuaJIT binary used for tools, so one can distinct them if necessary. As an additional bonus, the commands are well-aligned :) > > > > > > > > > > + $@.in > $@ > > > > + @chmod +x $@ > > > > + > > > > +.PHONY: all install amalg clean tools > > > > > > > > ############################################################################## > > > > > > > > > > diff --git a/tools/luajit-parse-memprof.in b/tools/luajit-parse-memprof.in > > > > new file mode 100644 > > > > index 0000000..8867202 > > > > --- /dev/null > > > > +++ b/tools/luajit-parse-memprof.in > > > > @@ -0,0 +1,6 @@ > > > > +#!/bin/bash > > > > +# > > > > +# Launcher for memprof parser. > > > > + > > > > +LUA_PATH="@LUAJIT_TOOLS_DIR@/?.lua;;" \ > > > > + @LUAJIT_TOOLS_BIN@ @LUAJIT_TOOLS_DIR@/memprof.lua $@ > > > > > > 3. Unfortunately, your solution doesn't work for me: > > > > Crap, I believe I've fixed this. > > > > > > > > | $ git log --oneline -n1 > > > | 7badb7e (HEAD) build: preserve the original build system > > > | $ make -f Makefile.original -j > > > | ==== Building LuaJIT 2.1.0-beta3 ==== > > > | ... > > > | ==== Successfully built LuaJIT 2.1.0-beta3 ==== > > > > > > Side note: I suppose it is nothing bad to add corresponding lines about > > > tools building. At least it simplifies build debugging. > > > Feel free to ignore. > > > > One can adjust this for debugging. Otherwise there is no need to see > > this output. We can use those hacks with Q/E, but I hope this part will > > have gone in the nearest future. > > OK, never mind. > > > > > > > > > | $ tools/luajit-parse-memprof /tmp/memprof_memleak.bin; echo -e "\n"; cat tools/luajit-parse-memprof > > > | tools/luajit-parse-memprof: line 5: /home/burii/reviews/luajit/cmake/tools/memprof.lua: Permission denied > > > | > > > | #!/bin/bash > > > | # > > > | # Launcher for memprof parser. > > > | > > > | LUA_PATH="/home/burii/reviews/luajit/cmake/tools/?.lua;;" \ > > > | /home/burii/reviews/luajit/cmake/tools/memprof.lua $@ > > > > > > This patch is working for me. But I am not bash|make guru :). > > > > Heh, try your patch on a clean repo: unfortunately it works neither. The > > root cause is the lack of on configuration phase. I added > > Hmm, it's weird. `realpath` manual declares: > | all but the last component must exist > To be honest, I don't understand why it fails even in the first version > -- obviously, exists. But does not -- that's the point. > Anyway, LGTM. > > > the corresponding dependency for this rule. Fixed, squashed, > > force-pushed to the branch. Diff is below: > > > > ================================================================================ > > > > diff --git a/Makefile.original b/Makefile.original > > index c3172f0..33dc2ed 100644 > > --- a/Makefile.original > > +++ b/Makefile.original > > @@ -198,7 +198,7 @@ tools: tools/$(FILE_TMEMPROF) > > # FIXME: This is an ugly hack to manually configure an auxiliary > > # tools/luajit-parse-memprof. This file should go away in scope of > > # https://github.com/tarantool/tarantool/issues/5688. > > -tools/$(FILE_TMEMPROF): > > +tools/$(FILE_TMEMPROF): src/luajit > > @sed -e "s|@LUAJIT_TOOLS_DIR@|$(realpath tools)|" \ > > -e "s|@LUAJIT_TOOLS_BIN@|$(realpath src/luajit)|" \ > > $@.in > $@ > > > > ================================================================================ > > > > After this patch everything is fine. > > > > > > > > | diff --git a/Makefile.original b/Makefile.original > > > | index b85d4bf..877398a 100644 > > > | --- a/Makefile.original > > > | +++ b/Makefile.original > > > | @@ -199,8 +199,8 @@ tools: tools/$(FILE_TMEMPROF) > > > | # tools/luajit-parse-memprof. I hope this file will have gone away > > > | # in scope of https://github.com/tarantool/tarantool/issues/5688. > > > | tools/$(FILE_TMEMPROF): > > > | - @sed -e "s|@LUAJIT_TOOLS_DIR@|$(realpath tools)|" \ > > > | - -e "s|@LUAJIT_TOOLS_BIN@|$(realpath src/luajit)|" \ > > > | + @sed -e "s|@LUAJIT_TOOLS_DIR@|`realpath tools`|" \ > > > | + -e "s|@LUAJIT_TOOLS_BIN@|`realpath src/luajit`|" \ > > > | $@.in > $@ > > > | @chmod +x $@ > > > | > > > > > > 4. Please, create separate commit to tools-related changes. > > > > For what? > > I don't understand existing of these changes (but I like them :)) > from commit message. Is it mentioned in the following part? Yes. > > | (and a couple of auxiliary files requiring configuring) > > Is it better to mention directly tools files here instead "auxiliary"? No, since luajit.pc is also adjusted. I guess changes are mostly minimal (but a bit hacky) to move them to a separate patch. > > > > > > Also, I suppose, it would be nice to add > > > to <.gitignore> as far as it's generated. These lines may be confusing: > > > > This is added in the next patch, but I'm not against moving it to this > > one. Fixed, squashed, force-pushed to the branch. Diff is below: > > Thanks! But one nitpick, feel free to ignore. > > > > > ================================================================================ > > > > diff --git a/.gitignore b/.gitignore > > index 1a07bf7..fc9c31e 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -9,3 +9,6 @@ > > *.dmp > > *.swp > > .tags > > + > > +# Configured runner for LuaJIT memprof parser > > Nit: s/parser/parser./ > Feel free to ignore. Thanks, fixed. > > > +tools/luajit-parse-memprof > > > > ================================================================================ > > > > > > > > | $ git status > > > | HEAD detached at 7badb7e > > > | Untracked files: > > > | (use "git add ..." to include in what will be committed) > > > | tools/luajit-parse-memprof > > > > > > > -- > > > > 2.25.0 > > > > > > > > > > -- > > > Best regards, > > > Sergey Kaplun > > > > -- > > Best regards, > > IM > > -- > Best regards, > Sergey Kaplun -- Best regards, IM