mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-15 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

staging: Reduce the number of mkdirs calls

Browse Source 
The number of mkdir calls was showing up high on the profile charts since
it was getting called once per file which is excessive. Each call results
in one or more syscalls which is bad for performance. Cache which
directories we've seen to reduce the calls to a more reasonable number
and speed up recipe specific sysroots.

(From OE-Core rev: 680fb343be5d0a7f9abbe9c75ca232abe5871663)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2017-02-01 11:29:06 +00:00
parent 758f18167f
commit 85e9af9d78
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/classes/staging.bbclass
View File

@@ -244,7 +244,7 @@ python do_populate_sysroot_setscene () {
}
addtask do_populate_sysroot_setscene
def staging_copyfile(c, target, fixme, postinsts, stagingdir):
def staging_copyfile(c, target, fixme, postinsts, stagingdir, seendirs):
import errno
if c.endswith("/fixmepath"):
@@ -255,7 +255,10 @@ def staging_copyfile(c, target, fixme, postinsts, stagingdir):
#bb.warn(c)
dest = c.replace(stagingdir, "")
dest = target + "/" + "/".join(dest.split("/")[3:])
bb.utils.mkdirhier(os.path.dirname(dest))
destdir = os.path.dirname(dest)
if destdir not in seendirs:
bb.utils.mkdirhier(destdir)
seendirs.add(destdir)
if "/usr/bin/postinst-" in c:
postinsts.append(dest)
if os.path.islink(c):
@@ -278,10 +281,12 @@ def staging_copyfile(c, target, fixme, postinsts, stagingdir):
raise
return dest
def staging_copydir(c, target, stagingdir):
def staging_copydir(c, target, stagingdir, seendirs):
dest = c.replace(stagingdir, "")
dest = target + "/" + "/".join(dest.split("/")[3:])
bb.utils.mkdirhier(dest)
if dest not in seendirs:
bb.utils.mkdirhier(dest)
seendirs.add(dest)
def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d):
import subprocess
@@ -302,6 +307,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d):
fixme = []
postinsts = []
seendirs = set()
stagingdir = d.getVar("STAGING_DIR")
if native:
pkgarchs = ['${BUILD_ARCH}', '${BUILD_ARCH}_*']
@@ -332,10 +338,10 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d):
for l in f:
l = l.strip()
if l.endswith("/"):
staging_copydir(l, targetdir, stagingdir)
staging_copydir(l, targetdir, stagingdir, seendirs)
continue
try:
staging_copyfile(l, targetdir, fixme, postinsts, stagingdir)
staging_copyfile(l, targetdir, fixme, postinsts, stagingdir, seendirs)
except FileExistsError:
continue
@@ -492,6 +498,7 @@ python extend_recipe_sysroot() {
fixme = {}
fixme[''] = []
fixme['native'] = []
seendirs = set()
postinsts = []
multilibs = {}
manifests = {}
@@ -570,14 +577,14 @@ python extend_recipe_sysroot() {
l = l.strip()
if l.endswith("/"):
if native:
dest = staging_copydir(l, recipesysrootnative, stagingdir)
dest = staging_copydir(l, recipesysrootnative, stagingdir, seendirs)
else:
dest = staging_copydir(l, destsysroot, stagingdir)
dest = staging_copydir(l, destsysroot, stagingdir, seendirs)
continue
if native:
dest = staging_copyfile(l, recipesysrootnative, fixme['native'], postinsts, stagingdir)
dest = staging_copyfile(l, recipesysrootnative, fixme['native'], postinsts, stagingdir, seendirs)
else:
dest = staging_copyfile(l, destsysroot, fixme[''], postinsts, stagingdir)
dest = staging_copyfile(l, destsysroot, fixme[''], postinsts, stagingdir, seendirs)
if dest:
m.write(dest.replace(workdir + "/", "") + "\n")