<HTML><BODY><div>Hi, Sergey!</div><div>Thanks for the patch!</div><div>LGTM</div><div> </div><div data-signature-widget="container"><div data-signature-widget="content"><div>--<br>Best regards,</div><div>Maxim Kokryashkin</div></div></div><div> </div><div> </div><blockquote style="border-left:1px solid #0857A6; margin:10px; padding:0 0 0 10px;">Понедельник, 17 июля 2023, 16:38 +03:00 от Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>:<br> <div id=""><div class="js-helper js-readmsg-msg"><div><div id="style_16896010861181503731_BODY">From: Sergey Bronnikov <<a href="/compose?To=sergeyb@tarantool.org">sergeyb@tarantool.org</a>><br><br>Fix typos found with codespell in files with our own source code.<br>---<br> src/lj_sysprof.c | 2 +-<br> src/lj_wbuf.h | 2 +-<br> src/luajit-gdb.py | 6 +++---<br> src/luajit_lldb.py | 6 +++---<br> test/LuaJIT-tests/src/ctest.c | 2 +-<br> test/tarantool-tests/CMakeLists.txt | 2 +-<br> test/tarantool-tests/fix-emit-rma.test.lua | 2 +-<br> test/tarantool-tests/gh-4199-gc64-fuse.test.lua | 2 +-<br> .../gh-6096-external-unwinding-on-arm64.test.lua | 2 +-<br> test/tarantool-tests/gh-6163-min-max.test.lua | 2 +-<br> test/tarantool-tests/lj-416-xor-before-jcc.test.lua | 2 +-<br> .../lj-426-arm64-incorrect-check-closed-uv.test.lua | 2 +-<br> .../lj-512-profiler-hook-finalizers.test.lua | 4 ++--<br> test/tarantool-tests/lj-603-err-snap-restore.test.lua | 2 +-<br> test/tarantool-tests/misclib-memprof-lapi.test.lua | 6 +++---<br> test/tarantool-tests/tap.lua | 4 ++--<br> test/tarantool-tests/unit-jit-parse.test.lua | 2 +-<br> tools/memprof/parse.lua | 4 ++--<br> tools/memprof/process.lua | 4 ++--<br> 19 files changed, 29 insertions(+), 29 deletions(-)<br><br>diff --git a/src/lj_sysprof.c b/src/lj_sysprof.c<br>index 2e9ed9b3..745eb1a3 100644<br>--- a/src/lj_sysprof.c<br>+++ b/src/lj_sysprof.c<br>@@ -485,7 +485,7 @@ int lj_sysprof_stop(lua_State *L)<br> if (SPS_HALT == sp->state) {<br> errno = sp->saved_errno;<br> sp->state = SPS_IDLE;<br>- /* wbuf was terminated when error occured. */<br>+ /* wbuf was terminated when error occurred. */<br> return PROFILE_ERRIO;<br> }<br> <br>diff --git a/src/lj_wbuf.h b/src/lj_wbuf.h<br>index 9eaa5e51..33ec8463 100644<br>--- a/src/lj_wbuf.h<br>+++ b/src/lj_wbuf.h<br>@@ -75,7 +75,7 @@ void lj_wbuf_addn(struct lj_wbuf *buf, const void *src, size_t n);<br> /* Write string to the buffer. */<br> void LJ_FASTCALL lj_wbuf_addstring(struct lj_wbuf *buf, const char *s);<br> <br>-/* Immediatly flush the buffer. */<br>+/* Immediately flush the buffer. */<br> void LJ_FASTCALL lj_wbuf_flush(struct lj_wbuf *buf);<br> <br> /* Check flags. */<br>diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py<br>index 96ee2289..afdfecd9 100644<br>--- a/src/luajit-gdb.py<br>+++ b/src/luajit-gdb.py<br>@@ -268,7 +268,7 @@ def strdata(obj):<br> try:<br> return str(cast('char *', cast('GCstr *', obj) + 1))[len(PADDING):]<br> except UnicodeEncodeError:<br>- return "<luajit-gdb: error occured while rendering non-ascii slot>"<br>+ return "<luajit-gdb: error occurred while rendering non-ascii slot>"<br> <br> def itypemap(o):<br> if LJ_64 and not LJ_GC64:<br>@@ -606,7 +606,7 @@ class LJDumpTable(LJBase):<br> '''<br> lj-tab <GCtab *><br> <br>-The command receives a GCtab adress and dumps the table contents:<br>+The command receives a GCtab address and dumps the table contents:<br> * Metatable address whether the one is set<br> * Array part <asize> slots:<br> <aslot ptr>: [<index>]: <tv><br>@@ -677,7 +677,7 @@ coroutine guest stack:<br> + CP: Protected C frame<br> + PP: VM performs a call as a result of executinig pcall or xpcall<br> <br>-If L is ommited the main coroutine is used.<br>+If L is omitted the main coroutine is used.<br> '''<br> <br> def invoke(self, arg, from_tty):<br>diff --git a/src/luajit_lldb.py b/src/luajit_lldb.py<br>index 9ee10269..4d7bef81 100644<br>--- a/src/luajit_lldb.py<br>+++ b/src/luajit_lldb.py<br>@@ -490,7 +490,7 @@ def strdata(obj):<br> ptr = cast('char *', obj + 1)<br> return ptr.summary<br> except UnicodeEncodeError:<br>- return "<luajit-lldb: error occured while rendering non-ascii slot>"<br>+ return "<luajit-lldb: error occurred while rendering non-ascii slot>"<br> <br> def itype(o):<br> return tou32(o.it64 >> 47) if LJ_GC64 else o.it<br>@@ -909,7 +909,7 @@ class LJDumpTable(Command):<br> '''<br> lj-tab <GCtab *><br> <br>-The command receives a GCtab adress and dumps the table contents:<br>+The command receives a GCtab address and dumps the table contents:<br> * Metatable address whether the one is set<br> * Array part <asize> slots:<br> <aslot ptr>: [<index>]: <tv><br>@@ -979,7 +979,7 @@ coroutine guest stack:<br> + CP: Protected C frame<br> + PP: VM performs a call as a result of executinig pcall or xpcall<br> <br>-If L is ommited the main coroutine is used.<br>+If L is omitted the main coroutine is used.<br> '''<br> def execute(self, debugger, args, result):<br> l = self.parse(args)<br>diff --git a/test/LuaJIT-tests/src/ctest.c b/test/LuaJIT-tests/src/ctest.c<br>index d257567b..e99f2306 100644<br>--- a/test/LuaJIT-tests/src/ctest.c<br>+++ b/test/LuaJIT-tests/src/ctest.c<br>@@ -234,7 +234,7 @@ static int costatus(lua_State *L, lua_State *co) {<br> else<br> return CO_SUS; /* initial state */<br> }<br>- default: /* some error occured */<br>+ default: /* some error occurred */<br> return CO_DEAD;<br> }<br> }<br>diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt<br>index b1211971..369728a3 100644<br>--- a/test/tarantool-tests/CMakeLists.txt<br>+++ b/test/tarantool-tests/CMakeLists.txt<br>@@ -131,7 +131,7 @@ else()<br> endif()<br> <br> # LUA_CPATH and LD_LIBRARY_PATH variables and also TESTLIBS list<br>-# with dependecies are set in scope of BuildTestLib macro.<br>+# with dependencies are set in scope of BuildTestLib macro.<br> add_custom_target(tarantool-tests<br> DEPENDS ${LUAJIT_TEST_BINARY} ${TESTLIBS}<br> )<br>diff --git a/test/tarantool-tests/fix-emit-rma.test.lua b/test/tarantool-tests/fix-emit-rma.test.lua<br>index 1f8e66f4..7d1e5295 100644<br>--- a/test/tarantool-tests/fix-emit-rma.test.lua<br>+++ b/test/tarantool-tests/fix-emit-rma.test.lua<br>@@ -4,7 +4,7 @@ local test = tap.test('fix-emit-rma'):skipcond({<br> ['Test requires GC64 mode enabled'] = not require('ffi').abi('gc64'),<br> })<br> <br>--- Need to test 2 cases of `emit_rma()` particulary on x64:<br>+-- Need to test 2 cases of `emit_rma()` particularly on x64:<br> -- * `IR_LDEXP` with `fld` instruction for loading constant<br> -- number `TValue` by address.<br> -- * `IR_OBAR` with the corresponding `test` instruction on<br>diff --git a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua<br>index 4513d43b..1847e5e4 100644<br>--- a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua<br>+++ b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua<br>@@ -44,7 +44,7 @@ for n = 1, 100 do<br> for i = 1, 5 do<br> -- This constant fusion leads to the test failure.<br> a[i] = 0<br>- -- This summ is not necessarry but decreases the amount of<br>+ -- This summ is not necessary but decreases the amount of<br> -- iterations.<br> a[i] = a[i] + x + y<br> -- Use all FPR registers and one value from the memory<br>diff --git a/test/tarantool-tests/gh-6096-external-unwinding-on-arm64.test.lua b/test/tarantool-tests/gh-6096-external-unwinding-on-arm64.test.lua<br>index cdeea441..e43750af 100644<br>--- a/test/tarantool-tests/gh-6096-external-unwinding-on-arm64.test.lua<br>+++ b/test/tarantool-tests/gh-6096-external-unwinding-on-arm64.test.lua<br>@@ -1,6 +1,6 @@<br> local tap = require('tap')<br> <br>--- Test file to check correctnes of external unwinding<br>+-- Test file to check correctness of external unwinding<br> -- in LuaJIT.<br> -- See also <a href="https://github.com/LuaJIT/LuaJIT/issues/698" target="_blank">https://github.com/LuaJIT/LuaJIT/issues/698</a>,<br> -- <a href="https://github.com/LuaJIT/LuaJIT/pull/757" target="_blank">https://github.com/LuaJIT/LuaJIT/pull/757</a>.<br>diff --git a/test/tarantool-tests/gh-6163-min-max.test.lua b/test/tarantool-tests/gh-6163-min-max.test.lua<br>index 882cb1a0..219d1456 100644<br>--- a/test/tarantool-tests/gh-6163-min-max.test.lua<br>+++ b/test/tarantool-tests/gh-6163-min-max.test.lua<br>@@ -53,7 +53,7 @@ local x = 1<br> <br> jit.opt.start('hotloop=1')<br> <br>--- XXX: Looping over the operations and their arguments breakes the<br>+-- XXX: Looping over the operations and their arguments breaks the<br> -- semantics of some optimization tests below. The cases are<br> -- copy-pasted to preserve optimization semantics.<br> <br>diff --git a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua<br>index 861114e8..7181fb4f 100644<br>--- a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua<br>+++ b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua<br>@@ -41,7 +41,7 @@ local testxor = ffi.load('libtestxor')<br> -- pressure and specific registers allocations.<br> local handler = setmetatable({}, {<br> __newindex = function ()<br>- -- 0 and nil are suggested as differnt constant-zero values<br>+ -- 0 and nil are suggested as different constant-zero values<br> -- for the call and occupied different registers.<br> testxor.test_xor_func(0, 0, 0, 0, 0, 0, nil, 0)<br> end<br>diff --git a/test/tarantool-tests/lj-426-arm64-incorrect-check-closed-uv.test.lua b/test/tarantool-tests/lj-426-arm64-incorrect-check-closed-uv.test.lua<br>index 4cdf1211..6e58370d 100644<br>--- a/test/tarantool-tests/lj-426-arm64-incorrect-check-closed-uv.test.lua<br>+++ b/test/tarantool-tests/lj-426-arm64-incorrect-check-closed-uv.test.lua<br>@@ -14,7 +14,7 @@ do<br> -- The function's prototype is created with the following<br> -- constants at chunk parsing. After adding this constant to<br> -- the function's prototype it will be marked as gray during<br>- -- propogate phase.<br>+ -- propagate phase.<br> local function usets() uv = '' end<br> _G.usets = usets<br> end<br>diff --git a/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua b/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua<br>index f7ee344f..9a3da644 100644<br>--- a/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua<br>+++ b/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua<br>@@ -20,9 +20,9 @@ local finish = os.clock()<br> <br> profile.stop()<br> <br>--- XXX: The bug is occured as stopping of callbacks invocation,<br>+-- XXX: The bug is occurred as stopping of callbacks invocation,<br> -- when a new tick strikes inside `gc_call_finalizer()`.<br>--- The amount of successfull callbacks isn't stable (2-15).<br>+-- The amount of successful callbacks isn't stable (2-15).<br> -- So, assume that amount of profiling samples should be at least<br> -- more than 0.5 intervals of time during sampling.<br> test:ok(nsamples >= 0.5 * (finish - start) * 1e3 / INTERVAL,<br>diff --git a/test/tarantool-tests/lj-603-err-snap-restore.test.lua b/test/tarantool-tests/lj-603-err-snap-restore.test.lua<br>index a6c831ed..1c17f0d8 100644<br>--- a/test/tarantool-tests/lj-603-err-snap-restore.test.lua<br>+++ b/test/tarantool-tests/lj-603-err-snap-restore.test.lua<br>@@ -11,7 +11,7 @@ local function do_test()<br> local recursive_f<br> local function errfunc()<br> xpcall(recursive_f, errfunc)<br>- -- Since this error is occured on snapshot restoration and can<br>+ -- Since this error is occurred on snapshot restoration and can<br> -- be handled by compiler itself, we shouldn't bother a user<br> -- with it.<br> handler_is_called = true<br>diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua<br>index eae20893..c8d6b879 100644<br>--- a/test/tarantool-tests/misclib-memprof-lapi.test.lua<br>+++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua<br>@@ -52,13 +52,13 @@ local function generate_output(filename, payload)<br> collectgarbage()<br> <br> local res, err = misc.memprof.start(filename)<br>- -- Should start succesfully.<br>+ -- Should start successfully.<br> assert(res, err)<br> <br> payload()<br> <br> res, err = misc.memprof.stop()<br>- -- Should stop succesfully.<br>+ -- Should stop successfully.<br> assert(res, err)<br> end<br> <br>@@ -188,7 +188,7 @@ test:test("output", function(subtest)<br> -- Check allocation reports. The second argument is a line<br> -- number of the allocation event itself. The third is a line<br> -- number of the corresponding function definition. The last<br>- -- one is the number of allocations. 1 event - alocation of<br>+ -- one is the number of allocations. 1 event - allocation of<br> -- table by itself + 1 allocation of array part as far it is<br> -- bigger than LJ_MAX_COLOSIZE (16).<br> subtest:ok(check_alloc_report(alloc, { line = 37, linedefined = 35 }, 2))<br>diff --git a/test/tarantool-tests/tap.lua b/test/tarantool-tests/tap.lua<br>index 47a8fe87..b91ca335 100644<br>--- a/test/tarantool-tests/tap.lua<br>+++ b/test/tarantool-tests/tap.lua<br>@@ -1,6 +1,6 @@<br> --- tap.lua internal file.<br> ---<br>---- The Test Anything Protocol vesion 13 producer.<br>+--- The Test Anything Protocol version 13 producer.<br> ---<br> <br> -- Initializer FFI for <iscdata> check.<br>@@ -79,7 +79,7 @@ local function ok(test, cond, message, extra)<br> io.write(tindent, ("line:\t%s\n"):format(trace[#trace].line))<br> for frameno, frame in ipairs(trace) do<br> io.write(tindent, ("frame #%d\n"):format(frameno))<br>- -- XXX: Use "half indent" to dump <frame> fiels.<br>+ -- XXX: Use "half indent" to dump <frame> fields.<br> local findent = indent(0.5) .. tindent<br> for key, value in pairs(frame) do<br> io.write(findent, ("%s:\t%s\n"):format(key, value))<br>diff --git a/test/tarantool-tests/unit-jit-parse.test.lua b/test/tarantool-tests/unit-jit-parse.test.lua<br>index e4445bf4..eccc56a0 100644<br>--- a/test/tarantool-tests/unit-jit-parse.test.lua<br>+++ b/test/tarantool-tests/unit-jit-parse.test.lua<br>@@ -33,7 +33,7 @@ local loop_trace = traces[1]<br> for irnum = 1, N_TESTS do<br> local ir_pattern = expected_irs[irnum]<br> local irref = loop_trace:has_ir(ir_pattern)<br>- test:ok(irref, 'find IR refernce by pattern: ' .. ir_pattern)<br>+ test:ok(irref, 'find IR reference by pattern: ' .. ir_pattern)<br> end<br> <br> os.exit(test:check() and 0 or 1)<br>diff --git a/tools/memprof/parse.lua b/tools/memprof/parse.lua<br>index d865267b..2c09db90 100644<br>--- a/tools/memprof/parse.lua<br>+++ b/tools/memprof/parse.lua<br>@@ -52,14 +52,14 @@ local function link_to_previous(heap_chunk, e, nsize)<br> if not e.primary[heap_chunk[2]] then<br> e.primary[heap_chunk[2]] = {<br> loc = heap_chunk[3],<br>- alloced = 0,<br>+ allocated = 0,<br> freed = 0,<br> count = 0,<br> }<br> end<br> -- Save information about delta for memory heap.<br> local location_data = e.primary[heap_chunk[2]]<br>- location_data.alloced = location_data.alloced + nsize<br>+ location_data.allocated = location_data.allocated + nsize<br> location_data.freed = location_data.freed + heap_chunk[1]<br> location_data.count = location_data.count + 1<br> end<br>diff --git a/tools/memprof/process.lua b/tools/memprof/process.lua<br>index 0bcb965b..9dc202ae 100644<br>--- a/tools/memprof/process.lua<br>+++ b/tools/memprof/process.lua<br>@@ -39,8 +39,8 @@ function M.form_heap_delta(events, symbols)<br> for _, heap_chunk in pairs(event.primary) do<br> local ev_line = symtab.demangle(symbols, heap_chunk.loc)<br> <br>- if (heap_chunk.alloced > 0) then<br>- dheap[ev_line].dbytes = dheap[ev_line].dbytes + heap_chunk.alloced<br>+ if (heap_chunk.allocated > 0) then<br>+ dheap[ev_line].dbytes = dheap[ev_line].dbytes + heap_chunk.allocated<br> dheap[ev_line].nalloc = dheap[ev_line].nalloc + heap_chunk.count<br> end<br> <br>--<br>2.34.1</div></div></div></div></blockquote><div> </div></BODY></HTML>