| Message ID | 1477319799-13570-1-git-send-email-fhunleth@troodon-software.com |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, Oct 24, 2016 at 4:36 PM, Frank Hunleth <fhunleth@troodon-software.com> wrote: > This change adds inode tracking to the size-stats script so that hard > links don't cause files to be double counted. This has a significant > effect on the size computation for some packages. For example, git has > around a dozen hard links to a large file. Before this change, git would > weigh in at about 170 MB with the total filesystem size reported as > 175 MB. The actual rootfs.ext2 size was around 16 MB. With the change, > the git package registers at 10.5 MB with a total filesystem size of > 15.8 MB. > > Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> Acked-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Hello, On Mon, 24 Oct 2016 10:36:39 -0400, Frank Hunleth wrote: > This change adds inode tracking to the size-stats script so that hard > links don't cause files to be double counted. This has a significant > effect on the size computation for some packages. For example, git has > around a dozen hard links to a large file. Before this change, git would > weigh in at about 170 MB with the total filesystem size reported as > 175 MB. The actual rootfs.ext2 size was around 16 MB. With the change, > the git package registers at 10.5 MB with a total filesystem size of > 15.8 MB. > > Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> > --- > Changes v1 -> v2: > - Moved hardlink check to build_package_size() so that hardlinks > could also be detected in files belonging to no package > - The v1 patch had the effect of listing all but one hardlinked > files as having 0 size in file-size-stats.csv. This no longer > happens anymore. All files have their listed size. Applied to master, thanks. Thomas
diff --git a/support/scripts/size-stats b/support/scripts/size-stats index 0ddcc07..af45000 100755 --- a/support/scripts/size-stats +++ b/support/scripts/size-stats @@ -88,11 +88,20 @@ def build_package_dict(builddir): def build_package_size(filesdict, builddir): pkgsize = collections.defaultdict(int) + seeninodes = set() for root, _, files in os.walk(os.path.join(builddir, "target")): for f in files: fpath = os.path.join(root, f) if os.path.islink(fpath): continue + + st = os.stat(fpath) + if st.st_ino in seeninodes: + # hard link + continue + else: + seeninodes.add(st.st_ino) + frelpath = os.path.relpath(fpath, os.path.join(builddir, "target")) if not frelpath in filesdict: print("WARNING: %s is not part of any package" % frelpath) @@ -100,7 +109,7 @@ def build_package_size(filesdict, builddir): else: pkg = filesdict[frelpath][0] - pkgsize[pkg] += os.path.getsize(fpath) + pkgsize[pkg] += st.st_size return pkgsize
This change adds inode tracking to the size-stats script so that hard links don't cause files to be double counted. This has a significant effect on the size computation for some packages. For example, git has around a dozen hard links to a large file. Before this change, git would weigh in at about 170 MB with the total filesystem size reported as 175 MB. The actual rootfs.ext2 size was around 16 MB. With the change, the git package registers at 10.5 MB with a total filesystem size of 15.8 MB. Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> --- Changes v1 -> v2: - Moved hardlink check to build_package_size() so that hardlinks could also be detected in files belonging to no package - The v1 patch had the effect of listing all but one hardlinked files as having 0 size in file-size-stats.csv. This no longer happens anymore. All files have their listed size. support/scripts/size-stats | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) -- 2.7.4