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 08E43526FA0; Tue, 11 Jul 2023 19:52:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 08E43526FA0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1689094366; bh=e8VHq2oiKGtqBbsrW11jqtbS9z4cyal84ufyu12SMiU=; 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=oGAH3FuUb5dvexlPD8A0kJulj8VcbtsidX+wHidldulZsjAYf0mHZt1iqfAfD2SdS PJmy8Dri7C1Sij5iaNhEzs99wGSiO0NiS55P76VFTZlddEnbDqcwsKtpod7TsiGxBW DQSgfqaEIUgi6oe/foDsLb+o+NoE2Sj49IxplCWg= Received: from mail-lf1-f46.google.com (mail-lf1-f46.google.com [209.85.167.46]) (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 2428E524D78 for ; Tue, 11 Jul 2023 19:52:21 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2428E524D78 Received: by mail-lf1-f46.google.com with SMTP id 2adb3069b0e04-4f9fdb0ef35so9712906e87.0 for ; Tue, 11 Jul 2023 09:52:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689094340; x=1691686340; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y1jHh7dvBW2VL7tkiVho6MUueAwlZ9ajxxl+nNG3Ws0=; b=XslkHK6bgQ+kidmFIG7ofB7Cpim7jHTmVpndUaZn5MZUpmRiLbvQYTFr3Fvn9/X6cg ooUiLq722oe9dR+IvQaIqrLkuqBT1+TaSW3T621+AjvwJ4EZKICvpI3hYXM656rJqCrZ rTpYGIzoEega9u7TS31mASBYvjBihlu7Tut1/Y4hSwpfQlIpThXb4oIOBujMSoto9ukY GLypX+cwd1UUJyaWUDTtZjmt7JHHKeYCSw44e+caUNj9jGOEIQQeR/GUrulX7MH9SMm6 R3pi5SIKmsfzRCAAS7UF0cxA8nUjttR0Xj6VmGSeY3PQ3dLOBh0s1V6Hgr8bdBpdawbo 8mJg== X-Gm-Message-State: ABy/qLbd3Au1GNx629ZW1lFoXwmVYdjuOOqHRxETqss/ohF9UisqzwwE EUqYhqa/qEC0rB3XdL/NDe0YDNdxNpU= X-Google-Smtp-Source: APBJJlEuwpO8/qzbaJz/R3VPcEfF4v2rmjFOK/03UALvBQeC53ODJul0Mo+iiddwj0crjlgcN11uUQ== X-Received: by 2002:a05:6512:3e25:b0:4fa:f79f:85a with SMTP id i37-20020a0565123e2500b004faf79f085amr15736175lfv.69.1689094340036; Tue, 11 Jul 2023 09:52:20 -0700 (PDT) Received: from pony.. ([31.173.86.237]) by smtp.gmail.com with ESMTPSA id q30-20020ac2511e000000b004fbdeca7b79sm378125lfb.247.2023.07.11.09.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 09:52:19 -0700 (PDT) To: tarantool-patches@dev.tarantool.org, Sergey Kaplun , Maxim Kokryashkin Date: Tue, 11 Jul 2023 19:51:32 +0300 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 1/2] test: fix typos 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" From: Sergey Bronnikov Fix typos found with codespell in a files with our own source code. --- src/luajit-gdb.py | 6 +++--- src/luajit_lldb.py | 6 +++--- test/LuaJIT-tests/src/ctest.c | 2 +- test/tarantool-tests/CMakeLists.txt | 2 +- test/tarantool-tests/fix-emit-rma.test.lua | 2 +- test/tarantool-tests/gh-4199-gc64-fuse.test.lua | 2 +- .../gh-6096-external-unwinding-on-arm64.test.lua | 2 +- test/tarantool-tests/gh-6163-min-max.test.lua | 2 +- test/tarantool-tests/lj-416-xor-before-jcc.test.lua | 2 +- .../lj-426-arm64-incorrect-check-closed-uv.test.lua | 2 +- .../lj-512-profiler-hook-finalizers.test.lua | 4 ++-- test/tarantool-tests/lj-603-err-snap-restore.test.lua | 2 +- test/tarantool-tests/misclib-memprof-lapi.test.lua | 6 +++--- test/tarantool-tests/tap.lua | 4 ++-- test/tarantool-tests/unit-jit-parse.test.lua | 2 +- tools/memprof/parse.lua | 4 ++-- tools/memprof/process.lua | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py index 96ee2289..afdfecd9 100644 --- a/src/luajit-gdb.py +++ b/src/luajit-gdb.py @@ -268,7 +268,7 @@ def strdata(obj): try: return str(cast('char *', cast('GCstr *', obj) + 1))[len(PADDING):] except UnicodeEncodeError: - return "" + return "" def itypemap(o): if LJ_64 and not LJ_GC64: @@ -606,7 +606,7 @@ class LJDumpTable(LJBase): ''' lj-tab -The command receives a GCtab adress and dumps the table contents: +The command receives a GCtab address and dumps the table contents: * Metatable address whether the one is set * Array part slots: : []: @@ -677,7 +677,7 @@ coroutine guest stack: + CP: Protected C frame + PP: VM performs a call as a result of executinig pcall or xpcall -If L is ommited the main coroutine is used. +If L is omitted the main coroutine is used. ''' def invoke(self, arg, from_tty): diff --git a/src/luajit_lldb.py b/src/luajit_lldb.py index 9ee10269..4d7bef81 100644 --- a/src/luajit_lldb.py +++ b/src/luajit_lldb.py @@ -490,7 +490,7 @@ def strdata(obj): ptr = cast('char *', obj + 1) return ptr.summary except UnicodeEncodeError: - return "" + return "" def itype(o): return tou32(o.it64 >> 47) if LJ_GC64 else o.it @@ -909,7 +909,7 @@ class LJDumpTable(Command): ''' lj-tab -The command receives a GCtab adress and dumps the table contents: +The command receives a GCtab address and dumps the table contents: * Metatable address whether the one is set * Array part slots: : []: @@ -979,7 +979,7 @@ coroutine guest stack: + CP: Protected C frame + PP: VM performs a call as a result of executinig pcall or xpcall -If L is ommited the main coroutine is used. +If L is omitted the main coroutine is used. ''' def execute(self, debugger, args, result): l = self.parse(args) diff --git a/test/LuaJIT-tests/src/ctest.c b/test/LuaJIT-tests/src/ctest.c index d257567b..e99f2306 100644 --- a/test/LuaJIT-tests/src/ctest.c +++ b/test/LuaJIT-tests/src/ctest.c @@ -234,7 +234,7 @@ static int costatus(lua_State *L, lua_State *co) { else return CO_SUS; /* initial state */ } - default: /* some error occured */ + default: /* some error occurred */ return CO_DEAD; } } diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt index 6218f76a..f0bf8efb 100644 --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -132,7 +132,7 @@ else() endif() # LUA_CPATH and LD_LIBRARY_PATH variables and also TESTLIBS list -# with dependecies are set in scope of BuildTestLib macro. +# with dependencies are set in scope of BuildTestLib macro. add_custom_target(tarantool-tests DEPENDS ${LUAJIT_TEST_BINARY} ${TESTLIBS} ) diff --git a/test/tarantool-tests/fix-emit-rma.test.lua b/test/tarantool-tests/fix-emit-rma.test.lua index 1f8e66f4..7d1e5295 100644 --- a/test/tarantool-tests/fix-emit-rma.test.lua +++ b/test/tarantool-tests/fix-emit-rma.test.lua @@ -4,7 +4,7 @@ local test = tap.test('fix-emit-rma'):skipcond({ ['Test requires GC64 mode enabled'] = not require('ffi').abi('gc64'), }) --- Need to test 2 cases of `emit_rma()` particulary on x64: +-- Need to test 2 cases of `emit_rma()` particularly on x64: -- * `IR_LDEXP` with `fld` instruction for loading constant -- number `TValue` by address. -- * `IR_OBAR` with the corresponding `test` instruction on diff --git a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua index 4513d43b..1847e5e4 100644 --- a/test/tarantool-tests/gh-4199-gc64-fuse.test.lua +++ b/test/tarantool-tests/gh-4199-gc64-fuse.test.lua @@ -44,7 +44,7 @@ for n = 1, 100 do for i = 1, 5 do -- This constant fusion leads to the test failure. a[i] = 0 - -- This summ is not necessarry but decreases the amount of + -- This summ is not necessary but decreases the amount of -- iterations. a[i] = a[i] + x + y -- Use all FPR registers and one value from the memory 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 index cdeea441..e43750af 100644 --- a/test/tarantool-tests/gh-6096-external-unwinding-on-arm64.test.lua +++ b/test/tarantool-tests/gh-6096-external-unwinding-on-arm64.test.lua @@ -1,6 +1,6 @@ local tap = require('tap') --- Test file to check correctnes of external unwinding +-- Test file to check correctness of external unwinding -- in LuaJIT. -- See also https://github.com/LuaJIT/LuaJIT/issues/698, -- https://github.com/LuaJIT/LuaJIT/pull/757. diff --git a/test/tarantool-tests/gh-6163-min-max.test.lua b/test/tarantool-tests/gh-6163-min-max.test.lua index 882cb1a0..219d1456 100644 --- a/test/tarantool-tests/gh-6163-min-max.test.lua +++ b/test/tarantool-tests/gh-6163-min-max.test.lua @@ -53,7 +53,7 @@ local x = 1 jit.opt.start('hotloop=1') --- XXX: Looping over the operations and their arguments breakes the +-- XXX: Looping over the operations and their arguments breaks the -- semantics of some optimization tests below. The cases are -- copy-pasted to preserve optimization semantics. diff --git a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua index 861114e8..7181fb4f 100644 --- a/test/tarantool-tests/lj-416-xor-before-jcc.test.lua +++ b/test/tarantool-tests/lj-416-xor-before-jcc.test.lua @@ -41,7 +41,7 @@ local testxor = ffi.load('libtestxor') -- pressure and specific registers allocations. local handler = setmetatable({}, { __newindex = function () - -- 0 and nil are suggested as differnt constant-zero values + -- 0 and nil are suggested as different constant-zero values -- for the call and occupied different registers. testxor.test_xor_func(0, 0, 0, 0, 0, 0, nil, 0) end 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 index 4cdf1211..6e58370d 100644 --- 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 @@ -14,7 +14,7 @@ do -- The function's prototype is created with the following -- constants at chunk parsing. After adding this constant to -- the function's prototype it will be marked as gray during - -- propogate phase. + -- propagate phase. local function usets() uv = '' end _G.usets = usets end diff --git a/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua b/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua index f7ee344f..9a3da644 100644 --- a/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua +++ b/test/tarantool-tests/lj-512-profiler-hook-finalizers.test.lua @@ -20,9 +20,9 @@ local finish = os.clock() profile.stop() --- XXX: The bug is occured as stopping of callbacks invocation, +-- XXX: The bug is occurred as stopping of callbacks invocation, -- when a new tick strikes inside `gc_call_finalizer()`. --- The amount of successfull callbacks isn't stable (2-15). +-- The amount of successful callbacks isn't stable (2-15). -- So, assume that amount of profiling samples should be at least -- more than 0.5 intervals of time during sampling. test:ok(nsamples >= 0.5 * (finish - start) * 1e3 / INTERVAL, diff --git a/test/tarantool-tests/lj-603-err-snap-restore.test.lua b/test/tarantool-tests/lj-603-err-snap-restore.test.lua index a6c831ed..1c17f0d8 100644 --- a/test/tarantool-tests/lj-603-err-snap-restore.test.lua +++ b/test/tarantool-tests/lj-603-err-snap-restore.test.lua @@ -11,7 +11,7 @@ local function do_test() local recursive_f local function errfunc() xpcall(recursive_f, errfunc) - -- Since this error is occured on snapshot restoration and can + -- Since this error is occurred on snapshot restoration and can -- be handled by compiler itself, we shouldn't bother a user -- with it. handler_is_called = true diff --git a/test/tarantool-tests/misclib-memprof-lapi.test.lua b/test/tarantool-tests/misclib-memprof-lapi.test.lua index eae20893..c8d6b879 100644 --- a/test/tarantool-tests/misclib-memprof-lapi.test.lua +++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua @@ -52,13 +52,13 @@ local function generate_output(filename, payload) collectgarbage() local res, err = misc.memprof.start(filename) - -- Should start succesfully. + -- Should start successfully. assert(res, err) payload() res, err = misc.memprof.stop() - -- Should stop succesfully. + -- Should stop successfully. assert(res, err) end @@ -188,7 +188,7 @@ test:test("output", function(subtest) -- Check allocation reports. The second argument is a line -- number of the allocation event itself. The third is a line -- number of the corresponding function definition. The last - -- one is the number of allocations. 1 event - alocation of + -- one is the number of allocations. 1 event - allocation of -- table by itself + 1 allocation of array part as far it is -- bigger than LJ_MAX_COLOSIZE (16). subtest:ok(check_alloc_report(alloc, { line = 37, linedefined = 35 }, 2)) diff --git a/test/tarantool-tests/tap.lua b/test/tarantool-tests/tap.lua index 47a8fe87..b91ca335 100644 --- a/test/tarantool-tests/tap.lua +++ b/test/tarantool-tests/tap.lua @@ -1,6 +1,6 @@ --- tap.lua internal file. --- ---- The Test Anything Protocol vesion 13 producer. +--- The Test Anything Protocol version 13 producer. --- -- Initializer FFI for check. @@ -79,7 +79,7 @@ local function ok(test, cond, message, extra) io.write(tindent, ("line:\t%s\n"):format(trace[#trace].line)) for frameno, frame in ipairs(trace) do io.write(tindent, ("frame #%d\n"):format(frameno)) - -- XXX: Use "half indent" to dump fiels. + -- XXX: Use "half indent" to dump fields. local findent = indent(0.5) .. tindent for key, value in pairs(frame) do io.write(findent, ("%s:\t%s\n"):format(key, value)) diff --git a/test/tarantool-tests/unit-jit-parse.test.lua b/test/tarantool-tests/unit-jit-parse.test.lua index 24216e87..34c38701 100644 --- a/test/tarantool-tests/unit-jit-parse.test.lua +++ b/test/tarantool-tests/unit-jit-parse.test.lua @@ -39,7 +39,7 @@ local loop_trace = traces[1] for irnum = 1, N_TESTS do local ir_pattern = expected_irs[irnum] local irref = loop_trace:has_ir(ir_pattern) - test:ok(irref, 'find IR refernce by pattern: ' .. ir_pattern) + test:ok(irref, 'find IR reference by pattern: ' .. ir_pattern) end os.exit(test:check() and 0 or 1) diff --git a/tools/memprof/parse.lua b/tools/memprof/parse.lua index d865267b..2c09db90 100644 --- a/tools/memprof/parse.lua +++ b/tools/memprof/parse.lua @@ -52,14 +52,14 @@ local function link_to_previous(heap_chunk, e, nsize) if not e.primary[heap_chunk[2]] then e.primary[heap_chunk[2]] = { loc = heap_chunk[3], - alloced = 0, + allocated = 0, freed = 0, count = 0, } end -- Save information about delta for memory heap. local location_data = e.primary[heap_chunk[2]] - location_data.alloced = location_data.alloced + nsize + location_data.allocated = location_data.allocated + nsize location_data.freed = location_data.freed + heap_chunk[1] location_data.count = location_data.count + 1 end diff --git a/tools/memprof/process.lua b/tools/memprof/process.lua index 0bcb965b..9dc202ae 100644 --- a/tools/memprof/process.lua +++ b/tools/memprof/process.lua @@ -39,8 +39,8 @@ function M.form_heap_delta(events, symbols) for _, heap_chunk in pairs(event.primary) do local ev_line = symtab.demangle(symbols, heap_chunk.loc) - if (heap_chunk.alloced > 0) then - dheap[ev_line].dbytes = dheap[ev_line].dbytes + heap_chunk.alloced + if (heap_chunk.allocated > 0) then + dheap[ev_line].dbytes = dheap[ev_line].dbytes + heap_chunk.allocated dheap[ev_line].nalloc = dheap[ev_line].nalloc + heap_chunk.count end -- 2.34.1