subcrip
/
lazy.nvim
mirror of https://github.com/folke/lazy.nvim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf: use modkey instead of modpath

This commit is contained in:
Folke Lemaitre 2023-02-13 17:22:00 +01:00
parent c778b7aa04
commit b1f7ae68a7
No known key found for this signature in database
GPG Key ID: 41F8B1FBACAE2040
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lua/lazy/core/cache.lua
View File

@ -113,8 +113,10 @@ end
function Cache.loader(modname) function Cache.loader(modname)
modname = modname:gsub("/", ".") modname = modname:gsub("/", ".")
local modpath, hash = Cache.find(modname) local modpath, hash = Cache.find(modname)
local modpath, hash
modpath, hash = Cache.find(modname)
if modpath then if modpath then
return Cache.load(modpath, { hash = hash }) return Cache.load(modname, modpath, { hash = hash })
end end
return "module " .. modname .. " not found" return "module " .. modname .. " not found"
end end
@ -126,7 +128,7 @@ end
---@private ---@private
function Cache.loadfile(filename, mode, env) function Cache.loadfile(filename, mode, env)
filename = Cache.normalize(filename) filename = Cache.normalize(filename)
return Cache.load(filename, { mode = mode, env = env }) return Cache.load(filename, filename, { mode = mode, env = env })
end end
---@param h1 CacheHash ---@param h1 CacheHash
@ -137,10 +139,10 @@ function Cache.eq(h1, h2)
end end
---@param modpath string ---@param modpath string
---@param opts? {hash?: CacheHash, mode?: "b"|"t"|"bt", env?:table} ---@param opts? {hash?: CacheHash, mode?: "b"|"t"|"bt", env?:table, entry?: CacheEntry}
---@return function?, string? error_message ---@return function?, string? error_message
---@private ---@private
function Cache.load(modpath, opts) function Cache.load(modkey, modpath, opts)
opts = opts or {} opts = opts or {}
local hash = opts.hash or uv.fs_stat(modpath) local hash = opts.hash or uv.fs_stat(modpath)
if not hash then if not hash then
@ -150,10 +152,10 @@ function Cache.load(modpath, opts)
---@type function?, string? ---@type function?, string?
local chunk, err local chunk, err
local entry = Cache.read(modpath) local entry = opts.entry or Cache.read(modkey)
if entry and Cache.eq(entry.hash, hash) then if entry and Cache.eq(entry.hash, hash) then
-- found in cache and up to date -- found in cache and up to date
chunk, err = loadstring(entry.chunk --[[@as string]], "@" .. entry.modpath) chunk, err = load(entry.chunk --[[@as string]], "@" .. entry.modpath)
if not (err and err:find("cannot load incompatible bytecode", 1, true)) then if not (err and err:find("cannot load incompatible bytecode", 1, true)) then
return chunk, err return chunk, err
end end
@ -163,7 +165,7 @@ function Cache.load(modpath, opts)
chunk, err = Cache._loadfile(entry.modpath) chunk, err = Cache._loadfile(entry.modpath)
if chunk then if chunk then
entry.chunk = string.dump(chunk) entry.chunk = string.dump(chunk)
Cache.write(modpath, entry) Cache.write(modkey, entry)
end end
return chunk, err return chunk, err
end end