sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build/files.c (finalizePkg): calculate RPMTAG_SIZE after optimizations

Browse Source 
Note that checkHardLinks function is now removed.  It was unclear
whether it was supposed to verify %lang attributes (returning non-zero
on error) or indicate if all hardlinks are packaged within the package.

It turns out that only a single package in our repo has
PartialHardlinkSets dependency:

$ cd /ALT/Sisyphus/files/x86_64/RPMS/
$ rpm -qp --qf '[%{NAME}\t%{REQUIRENAME}\n]' *.rpm |fgrep 'PartialHardlinkSets'
$ cd /ALT/Sisyphus/files/noarch/RPMS/
$ rpm -qp --qf '[%{NAME}\t%{REQUIRENAME}\n]' *.rpm |fgrep 'PartialHardlinkSets'
freeciv-common  rpmlib(PartialHardlinkSets)
$

This probably means that freeciv-common has hardlinks with different
%lang attributes (which probably was supposed to be an error).  So
the whole issue should be reconsidered.  A leave XXX marks in the
code and suggest new PartialHardlinkSets implementation (however,
the dependency is not being added yet).
This commit is contained in:
Alexey Tourbin 2011-02-05 03:29:28 +03:00
parent 91656ccf79
commit e061586385
4 changed files with 69 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
build/files.c
View File

@ -86,7 +86,6 @@ typedef struct FileList_s {
/*@only@*/ const char * buildRootURL;
int fileCount;
int totalFileSize;
int processingFailed;
int passedSpecialDoc;
@ -975,50 +974,6 @@ static int isDoc(FileList fl, const char * fileName) /*@*/
return 0;
}
/**
* Verify that file attributes scope over hardlinks correctly.
* If partial hardlink sets are possible, then add tracking dependency.
* @todo Only %lang coloring is checked, %doc et al also need doing.
* @param fl package file tree walk data
* @return 1 if partial hardlink sets can exist, 0 otherwise.
*/
static int checkHardLinks(FileList fl)
/*@*/
{
FileListRec ilp, jlp;
int i, j;
for (i = 0; i < fl->fileListRecsUsed; i++) {
ilp = fl->fileList + i;
/* Is this a hard link? */
if (!(S_ISREG(ilp->fl_mode) && ilp->fl_nlink > 1))
continue;
/* Find all members of hardlink set. */
for (j = i + 1; j < fl->fileListRecsUsed; j++) {
jlp = fl->fileList + j;
/* Member of same hardlink set? */
if (!S_ISREG(jlp->fl_mode))
/*@innercontinue@*/ continue;
if (ilp->fl_nlink != jlp->fl_nlink)
/*@innercontinue@*/ continue;
if (ilp->fl_ino != jlp->fl_ino)
/*@innercontinue@*/ continue;
if (ilp->fl_dev != jlp->fl_dev)
/*@innercontinue@*/ continue;
/* Identical locale coloring? */
if (!strcmp(ilp->langs, jlp->langs))
continue;
return 1;
}
}
return 0;
}
/**
* Add file entries to header.
* @todo Should directories have %doc/%config attributes? (#14531)
@ -1270,6 +1225,7 @@ static void genCpioListAndHeader(Spec spec, /*@partial@*/ FileList fl,
fi->fuids = xcalloc(sizeof(*fi->fuids), fi->fc);
fi->fgroup = NULL;
fi->fgids = xcalloc(sizeof(*fi->fgids), fi->fc);
fi->fsts = xcalloc(sizeof(*fi->fsts), fi->fc);
/* Make the cpio list */
for (i = 0, flp = fl->fileList; i < fi->fc; i++, flp++) {
@ -1338,42 +1294,8 @@ static void genCpioListAndHeader(Spec spec, /*@partial@*/ FileList fl,
CPIO_MAP_TYPE | CPIO_MAP_MODE | CPIO_MAP_UID | CPIO_MAP_GID;
if (isSrc)
fi->fmapflags[i] |= CPIO_FOLLOW_SYMLINKS;
if (S_ISREG(flp->fl_mode) && flp->fl_nlink == 1)
fl->totalFileSize += flp->fl_size;
else if (S_ISREG(flp->fl_mode) && flp->fl_nlink > 1) {
/* Hard links need be counted only once. */
int j = i + 1;
FileListRec jlp = flp + 1;
int found = 0;
for (; j < fi->fc; j++, jlp++) {
while (((jlp - fl->fileList) < (fl->fileListRecsUsed - 1)) &&
!strcmp(jlp->fileURL, jlp[1].fileURL))
jlp++;
if (jlp->flags & RPMFILE_EXCLUDE) {
j--;
continue;
}
if (jlp->flags & RPMFILE_GHOST)
continue;
if (!S_ISREG(jlp->fl_mode))
continue;
if (flp->fl_nlink != jlp->fl_nlink)
continue;
if (flp->fl_ino != jlp->fl_ino)
continue;
if (flp->fl_dev != jlp->fl_dev)
continue;
found = 1;
break;
}
if (!found) /* last entry in hardlink set */
fl->totalFileSize += flp->fl_size;
}
fi->fsts[i] = flp->fl_st;
}
(void) headerAddEntry(h, RPMTAG_SIZE, RPM_INT32_TYPE,
&(fl->totalFileSize), 1);
/*@-branchstate@*/
if (cpioList)
*cpioList = fi;
@ -1713,7 +1635,7 @@ static int processBinaryFile(/*@unused@*/ Package pkg, FileList fl,
fileSystem@*/
/*@modifies *fl, fl->processingFailed,
fl->fileList, fl->fileListRecsAlloced, fl->fileListRecsUsed,
fl->totalFileSize, fl->fileCount, fl->isDir,
fl->fileCount, fl->isDir,
rpmGlobalMacroContext, fileSystem @*/
{
int doGlob;
@ -1846,7 +1768,6 @@ static int processPackageFiles(Spec spec, Package pkg,
fl.buildRootURL = rpmGenPath(spec->rootURL, spec->buildRootURL, NULL);
fl.fileCount = 0;
fl.totalFileSize = 0;
fl.processingFailed = 0;
fl.passedSpecialDoc = 0;
@ -2006,11 +1927,6 @@ static int processPackageFiles(Spec spec, Package pkg,
if (fl.processingFailed)
goto exit;
/* Verify that file attributes scope over hardlinks correctly. */
if (checkHardLinks(&fl))
(void) rpmlibNeedsFeature(pkg->header,
"PartialHardlinkSets", "4.0.4-1");
genCpioListAndHeader(spec, &fl, (TFI_t *)&pkg->cpioList, pkg->header, 0);
if (spec->timeCheck)
@ -2163,7 +2079,6 @@ int processSourceFiles(Spec spec)
fl.fileList = xcalloc((spec->numSources + 1), sizeof(*fl.fileList));
fl.processingFailed = 0;
fl.fileListRecsUsed = 0;
fl.totalFileSize = 0;
fl.buildRootURL = NULL;
s = getStringBuf(sourceFiles);
@ -2805,6 +2720,59 @@ exit:
return rc;
}
static int finalizePkg(Package pkg)
{
TFI_t fi = pkg->cpioList;
if (fi == NULL)
return 0;
int totalFileSize = 0;
int partialHardlinkSets = 0;
int i, j;
for (i = 0; i < fi->fc; i++) {
if (fi->actions[i] == FA_SKIP) // GHOST
continue;
if (!S_ISREG(fi->fsts[i].st_mode))
continue;
if (fi->fsts[i].st_nlink == 1) {
totalFileSize += fi->fsts[i].st_size;
continue;
}
assert(fi->fsts[i].st_nlink > 1);
int found = 0;
for (j = 0; j < i; j++) {
if (fi->actions[j] == FA_SKIP)
continue;
if (fi->fsts[i].st_dev != fi->fsts[j].st_dev)
continue;
if (fi->fsts[i].st_ino != fi->fsts[j].st_ino)
continue;
found = 1;
break;
}
if (found)
continue;
// first hardlink occurrence
totalFileSize += fi->fsts[i].st_size;
int nlink = 1;
for (j = i + 1; j < fi->fc; j++) {
if (fi->actions[j] == FA_SKIP)
continue;
if (fi->fsts[i].st_dev != fi->fsts[j].st_dev)
continue;
if (fi->fsts[i].st_ino != fi->fsts[j].st_ino)
continue;
// XXX check for identical locale coloring?
nlink++;
}
assert(nlink <= fi->fsts[i].st_nlink);
if (nlink < fi->fsts[i].st_nlink)
partialHardlinkSets = 1;
}
headerAddEntry(fi->h, RPMTAG_SIZE, RPM_INT32_TYPE, &totalFileSize, 1);
// XXX handle PartialHardlinkSets?
return 0;
}
/**
*/
static void printDepMsg(DepMsg_t * dm, int count, const char ** names,
@ -2946,5 +2914,12 @@ int processBinaryFiles(Spec spec, int installSpecialDoc, int test)
if (rc == 0)
rc = checkFiles(spec);
for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {
if (pkg->fileList == NULL)
continue;
rc = finalizePkg(pkg);
if (rc) break;
}
return rc;
}

5
build/interdep.c
View File

@ -287,10 +287,11 @@ void fiPrune(TFI_t fi, char pruned[])
PruneV(fi->fmapflags);
PruneV(fi->fuids);
PruneV(fi->fgids);
PruneV(fi->fsts);
struct transactionFileInfo_s save_fi;
#define MV(a) save_fi.a = fi->a; fi->a = NULL
MV(bnl); MV(dnl); MV(dil);
MV(apath); MV(actions); MV(fmapflags); MV(fuids); MV(fgids);
MV(apath); MV(actions); MV(fmapflags); MV(fuids); MV(fgids); MV(fsts);
save_fi.h = fi->h;
save_fi.astriplen = fi->astriplen;
freeFi(fi);
@ -303,7 +304,7 @@ void fiPrune(TFI_t fi, char pruned[])
#undef MV
#define MV(a) fi->a = save_fi.a
MV(bnl); MV(dnl); MV(dil);
MV(apath); MV(actions); MV(fmapflags); MV(fuids); MV(fgids);
MV(apath); MV(actions); MV(fmapflags); MV(fuids); MV(fgids); MV(fsts);
fi->astriplen = save_fi.astriplen;
}

1
lib/psm.c
View File

@ -260,6 +260,7 @@ TFI_t freeFi(TFI_t fi)
fi->fuids = _free(fi->fuids);
fi->fgids = _free(fi->fgids);
fi->fmapflags = _free(fi->fmapflags);
fi->fsts = _free(fi->fsts);
fi->fsm = freeFSM(fi->fsm);

2
lib/psm.h
View File

@ -107,6 +107,8 @@ struct transactionFileInfo_s {
unsigned int record;
const char *digest;
/*@owned@*/
struct stat *fsts; /*!< File stat(s) (from buildroot) */
};
/**