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 B9F296BA768; Wed, 11 Oct 2023 19:53:14 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B9F296BA768 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1697043194; bh=pK9/JwYbVlbPOeiA4ONarP5/hjcNuv18UGcVb7XB27w=; 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=kV+/2mAvI+3LsVBzIuiGW6BliyzzIpMLmv5HcWbbm2wTO3330I0+fK7at8YDrgvIi Yh2q5GKLKxXrhBg1vdpKfrVAwyH9pVKjEvjRj2bwErtoALtkrhHlgU6oGfZY1WTIqq nLEIApeWCM0vtyJGiv16EM+OJwIOEL2eksYXmExM= Received: from mail-ej1-f44.google.com (mail-ej1-f44.google.com [209.85.218.44]) (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 74BC86BA764 for ; Wed, 11 Oct 2023 19:52:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 74BC86BA764 Received: by mail-ej1-f44.google.com with SMTP id a640c23a62f3a-9ae2cc4d17eso1451066b.1 for ; Wed, 11 Oct 2023 09:52:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697043165; x=1697647965; 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=KV9BTphwmtrx5x4Yf/7VfsYvpkZL6n+sb//LdeKnVtU=; b=VxzN9KgxA2K+QPPCHqVhlx3cF5zS57tom/psdidwuWeQTr6vwZEC97wGiK332/p15c MQQtIQb7jjkMBWHcFZH+ahZTW0IlJ9G30ukmBRQYoCH+E1U+glljSK6OSLNSaF7Vg0uf 9xx5ILZUQ085cOX3Mm6TUMpzU3uMoOfnY+EhosoRGO+ypMk0oJ1Yyph9PKm83AIcBrHE CCzHDw5UG+yiH0k0BE214dpJzPeYeLLcECQsj9XsAxGwmNxFfYh+xoKO2pAbj4NbmP8k KNH2sP2TH4ZIow7RxOFniakkGlCQvXvHhN5mdrulx+mDmEX+fhebVMoFuiLdpzj7JOQV D+3A== X-Gm-Message-State: AOJu0YwFP/95PlHM8ufd2JAbEwSkUfhwfWR+gkZtjqLK9KEyBZNvU45P EAivatGJTVuefy+87N0lnQkvy5bH2lY96A== X-Google-Smtp-Source: AGHT+IHb6vt/CVXyc5Vexq5nvWV1jk0vX+4LGfskOLNivTujphHmTYbEFcrDbrRx3fEEhnm54KnVFQ== X-Received: by 2002:a17:906:714a:b0:9b2:b9ad:ddd1 with SMTP id z10-20020a170906714a00b009b2b9adddd1mr19737705ejj.28.1697043164969; Wed, 11 Oct 2023 09:52:44 -0700 (PDT) Received: from pony.. ([185.6.247.97]) by smtp.gmail.com with ESMTPSA id l12-20020a170906078c00b009b94fe3fc47sm9962409ejc.159.2023.10.11.09.52.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Oct 2023 09:52:44 -0700 (PDT) To: tarantool-patches@dev.tarantool.org, Sergey Kaplun , max.kokryashkin@gmail.com Date: Wed, 11 Oct 2023 19:52:26 +0300 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH luajit 1/4][v2] codehealth: 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 files with our own source code. --- src/lj_memprof.c | 4 ++-- src/lj_sysprof.c | 2 +- src/lj_wbuf.h | 2 +- src/luajit-gdb.py | 6 +++--- src/luajit_lldb.py | 6 +++--- test/LuaJIT-tests/src/ctest.c | 2 +- test/PUC-Rio-Lua-5.1-tests/api.lua | 4 ++-- test/PUC-Rio-Lua-5.1-tests/db.lua | 2 +- test/PUC-Rio-Lua-5.1-tests/gc.lua | 2 +- test/PUC-Rio-Lua-5.1-tests/math.lua | 2 +- test/PUC-Rio-Lua-5.1-tests/strings.lua | 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-350-sload-typecheck.test.lua | 2 +- test/tarantool-tests/lj-357-arm64-hrefk.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 | 8 ++++---- test/tarantool-tests/tap.lua | 4 ++-- test/tarantool-tests/unit-jit-parse.test.lua | 2 +- test/tarantool-tests/utils/jit/generators.lua | 2 +- tools/memprof/parse.lua | 4 ++-- tools/memprof/process.lua | 4 ++-- 28 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/lj_memprof.c b/src/lj_memprof.c index a492cf58..c9a8b203 100644 --- a/src/lj_memprof.c +++ b/src/lj_memprof.c @@ -260,7 +260,7 @@ int lj_memprof_start(struct lua_State *L, const struct lj_memprof_options *opt) lj_assertL(opt->len != 0, "bad memprof writer buffer lenght"); if (mp->state != MPS_IDLE) { - /* Clean up resourses. Ignore possible errors. */ + /* Clean up resources. Ignore possible errors. */ opt->on_stop(opt->ctx, opt->buf); return PROFILE_ERRRUN; } @@ -392,7 +392,7 @@ void lj_memprof_add_trace(const struct GCtrace *tr) int lj_memprof_start(struct lua_State *L, const struct lj_memprof_options *opt) { UNUSED(L); - /* Clean up resourses. Ignore possible errors. */ + /* Clean up resources. Ignore possible errors. */ opt->on_stop(opt->ctx, opt->buf); return PROFILE_ERRUSE; } diff --git a/src/lj_sysprof.c b/src/lj_sysprof.c index 52d4d2a5..82ed8210 100644 --- a/src/lj_sysprof.c +++ b/src/lj_sysprof.c @@ -486,7 +486,7 @@ int lj_sysprof_stop(lua_State *L) if (SPS_HALT == sp->state) { errno = sp->saved_errno; sp->state = SPS_IDLE; - /* wbuf was terminated when error occured. */ + /* wbuf was terminated when error occurred. */ return PROFILE_ERRIO; } diff --git a/src/lj_wbuf.h b/src/lj_wbuf.h index 9eaa5e51..33ec8463 100644 --- a/src/lj_wbuf.h +++ b/src/lj_wbuf.h @@ -75,7 +75,7 @@ void lj_wbuf_addn(struct lj_wbuf *buf, const void *src, size_t n); /* Write string to the buffer. */ void LJ_FASTCALL lj_wbuf_addstring(struct lj_wbuf *buf, const char *s); -/* Immediatly flush the buffer. */ +/* Immediately flush the buffer. */ void LJ_FASTCALL lj_wbuf_flush(struct lj_wbuf *buf); /* Check flags. */ diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py index 5eaf250f..d2070e9b 100644 --- a/src/luajit-gdb.py +++ b/src/luajit-gdb.py @@ -314,7 +314,7 @@ def strdata(obj): try: return str(cast('char *', cast('GCstr *', obj) + 1))[len(PADDING):] except UnicodeEncodeError: - return "" + return "" def itypemap(o): @@ -687,7 +687,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: : []: @@ -759,7 +759,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 ef0986cc..5ac11b65 100644 --- a/src/luajit_lldb.py +++ b/src/luajit_lldb.py @@ -525,7 +525,7 @@ def strdata(obj): ptr = cast('char *', obj + 1) return ptr.summary except UnicodeEncodeError: - return "" + return "" def itype(o): @@ -996,7 +996,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: : []: @@ -1067,7 +1067,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): lstate = 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/PUC-Rio-Lua-5.1-tests/api.lua b/test/PUC-Rio-Lua-5.1-tests/api.lua index c955ebf9..7ec2f1ba 100644 --- a/test/PUC-Rio-Lua-5.1-tests/api.lua +++ b/test/PUC-Rio-Lua-5.1-tests/api.lua @@ -17,7 +17,7 @@ function pack(...) return arg end print('testing C API') --- testing allignment +-- testing alignment a = T.d2s(12458954321123) assert(string.len(a) == 8) -- sizeof(double) assert(T.s2d(a) == 12458954321123) @@ -333,7 +333,7 @@ F = function (x) if A ~= nil then assert(type(A) == "userdata") assert(T.udataval(A) == B) - debug.getmetatable(A) -- just acess it + debug.getmetatable(A) -- just access it end A = x -- ressucita userdata B = udval diff --git a/test/PUC-Rio-Lua-5.1-tests/db.lua b/test/PUC-Rio-Lua-5.1-tests/db.lua index b148c2dd..0d4692e1 100644 --- a/test/PUC-Rio-Lua-5.1-tests/db.lua +++ b/test/PUC-Rio-Lua-5.1-tests/db.lua @@ -561,7 +561,7 @@ t[1] = "'error'" checktraceback(co, t) --- test acessing line numbers of a coroutine from a resume inside +-- test accessing line numbers of a coroutine from a resume inside -- a C function (this is a known bug in Lua 5.0) local function g(x) diff --git a/test/PUC-Rio-Lua-5.1-tests/gc.lua b/test/PUC-Rio-Lua-5.1-tests/gc.lua index 10e1f2dd..a1c6e7c7 100644 --- a/test/PUC-Rio-Lua-5.1-tests/gc.lua +++ b/test/PUC-Rio-Lua-5.1-tests/gc.lua @@ -308,7 +308,7 @@ do assert(getmetatable(o) == tt) -- create new objects during GC local a = 'xuxu'..(10+3)..'joao', {} - ___Glob = o -- ressurect object! + ___Glob = o -- resurrect object! newproxy(o) -- creates a new one with same metatable print(">>> closing state " .. "<<<\n") end diff --git a/test/PUC-Rio-Lua-5.1-tests/math.lua b/test/PUC-Rio-Lua-5.1-tests/math.lua index f66ce196..63efc5dd 100644 --- a/test/PUC-Rio-Lua-5.1-tests/math.lua +++ b/test/PUC-Rio-Lua-5.1-tests/math.lua @@ -165,7 +165,7 @@ stat(a) a = nil --- testing implicit convertions +-- testing implicit conversions local a,b = '10', '20' assert(a*b == 200 and a+b == 30 and a-b == -10 and a/b == 0.5 and -b == -20) diff --git a/test/PUC-Rio-Lua-5.1-tests/strings.lua b/test/PUC-Rio-Lua-5.1-tests/strings.lua index 3cc1c1b2..0818e390 100644 --- a/test/PUC-Rio-Lua-5.1-tests/strings.lua +++ b/test/PUC-Rio-Lua-5.1-tests/strings.lua @@ -156,7 +156,7 @@ assert(string.format('"-%20s.20s"', string.rep("%", 2000)) == string.format("%q", "-"..string.rep("%", 2000)..".20s")) --- longest number that can be formated +-- longest number that can be formatted assert(string.len(string.format('%99.99f', -1e308)) >= 100) assert(loadstring("return 1\n--comentário sem EOL no final")() == 1) diff --git a/test/tarantool-tests/CMakeLists.txt b/test/tarantool-tests/CMakeLists.txt index c15d6037..73fe4b5a 100644 --- a/test/tarantool-tests/CMakeLists.txt +++ b/test/tarantool-tests/CMakeLists.txt @@ -134,7 +134,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 42804447..cc97ff4d 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 ca050cf0..877f7884 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 097e771c..00f58642 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 4bc6155c..17afd502 100644 --- a/test/tarantool-tests/gh-6163-min-max.test.lua +++ b/test/tarantool-tests/gh-6163-min-max.test.lua @@ -45,7 +45,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-350-sload-typecheck.test.lua b/test/tarantool-tests/lj-350-sload-typecheck.test.lua index 33380170..c6876473 100644 --- a/test/tarantool-tests/lj-350-sload-typecheck.test.lua +++ b/test/tarantool-tests/lj-350-sload-typecheck.test.lua @@ -1,5 +1,5 @@ local tap = require('tap') --- Test file to demonstrate the incorrect GC64 JIT asembling +-- Test file to demonstrate the incorrect GC64 JIT assembling -- `IR_SLOAD`. -- See also https://github.com/LuaJIT/LuaJIT/pull/350. local test = tap.test('lj-350-sload-typecheck'):skipcond({ diff --git a/test/tarantool-tests/lj-357-arm64-hrefk.test.lua b/test/tarantool-tests/lj-357-arm64-hrefk.test.lua index 8db8bbfc..23e06d8c 100644 --- a/test/tarantool-tests/lj-357-arm64-hrefk.test.lua +++ b/test/tarantool-tests/lj-357-arm64-hrefk.test.lua @@ -17,7 +17,7 @@ local t = {hrefk = 0} -- chooses the same register as a base register for offset and -- destination in LDR instruction. -- We need 1028 iterations = 1024 iteration for 10 table rehashing --- (create side traces for invarinat and variant loop part) + +-- (create side traces for invariant and variant loop part) + -- 3 for trace initialize + 1 to run the bad trace. local START = 1028 local STOP = 1 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 605bb92a..f71c9ee4 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 a689ed60..ea01ba06 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 a282a10f..f02bd05f 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 791107ba..96ebf92c 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 3cb5c8be..8132cf08 100644 --- a/test/tarantool-tests/misclib-memprof-lapi.test.lua +++ b/test/tarantool-tests/misclib-memprof-lapi.test.lua @@ -1,5 +1,5 @@ -- XXX: This comment is a reminder to reimplement memprof tests --- assertions to make them more indepentent to the changes made. +-- assertions to make them more independent to the changes made. local tap = require("tap") local test = tap.test("misc-memprof-lapi"):skipcond({ ['Test requires JIT enabled'] = not jit.status(), @@ -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 af1d4b20..250eb7d8 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 b038fde3..b426c1c6 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 test:done(true) diff --git a/test/tarantool-tests/utils/jit/generators.lua b/test/tarantool-tests/utils/jit/generators.lua index 14e0e3c3..d6c50a1f 100644 --- a/test/tarantool-tests/utils/jit/generators.lua +++ b/test/tarantool-tests/utils/jit/generators.lua @@ -17,7 +17,7 @@ end local recfuncs = {} local last_i = 0 -- This function generates a table of functions with heavy mcode --- payload with tab arithmetics to fill the mcode area from the +-- payload with tab arithmetic to fill the mcode area from the -- one trace mcode by some given size. This size is usually big -- enough, because we want to check long jump side exits from some -- traces. 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