From 5664bb2020530c0a8bbd0dc4c889743921b42429 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 27 Sep 2016 18:16:13 +0200 Subject: debListParser: Convert to use pkgTagSection::Key-based lookup This basically gets rid of 40-50% of the hash table lookups, making things a bit faster that way, and the profiles look far cleaner. --- apt-pkg/deb/deblistparser.cc | 80 +++++++++++++++++++++++--------------------- apt-pkg/deb/deblistparser.h | 4 +-- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index 0f9fe310f..43fc4aa3a 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -68,7 +69,7 @@ debListParser::debListParser(FileFd *File) : // --------------------------------------------------------------------- /* This is to return the name of the package this section describes */ string debListParser::Package() { - string Result = Section.Find("Package").to_string(); + string Result = Section.Find(pkgTagSection::Key::Package).to_string(); // Normalize mixed case package names to lower case, like dpkg does // See Bug#807012 for details @@ -83,7 +84,7 @@ string debListParser::Package() { // --------------------------------------------------------------------- /* This will return the Architecture of the package this section describes */ APT::StringView debListParser::Architecture() { - auto const Arch = Section.Find("Architecture"); + auto const Arch = Section.Find(pkgTagSection::Key::Architecture); return Arch.empty() ? "none" : Arch; } /*}}}*/ @@ -91,7 +92,7 @@ APT::StringView debListParser::Architecture() { // --------------------------------------------------------------------- /* */ bool debListParser::ArchitectureAll() { - return Section.Find("Architecture") == "all"; + return Section.Find(pkgTagSection::Key::Architecture) == "all"; } /*}}}*/ // ListParser::Version - Return the version string /*{{{*/ @@ -101,13 +102,13 @@ bool debListParser::ArchitectureAll() { entry is assumed to only describe package properties */ APT::StringView debListParser::Version() { - return Section.Find("Version"); + return Section.Find(pkgTagSection::Key::Version); } /*}}}*/ unsigned char debListParser::ParseMultiArch(bool const showErrors) /*{{{*/ { unsigned char MA; - auto const MultiArch = Section.Find("Multi-Arch"); + auto const MultiArch = Section.Find(pkgTagSection::Key::Multi_Arch); if (MultiArch.empty() == true || MultiArch == "no") MA = pkgCache::Version::No; else if (MultiArch == "same") { @@ -148,7 +149,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver) const char *Stop; // Parse the section - if (Section.Find("Section",Start,Stop) == true) + if (Section.Find(pkgTagSection::Key::Section,Start,Stop) == true) { map_stringitem_t const idx = StoreString(pkgCacheGenerator::SECTION, Start, Stop - Start); Ver->Section = idx; @@ -157,7 +158,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver) pkgCache::GrpIterator G = Ver.ParentPkg().Group(); Ver->SourcePkgName = G->Name; Ver->SourceVerStr = Ver->VerStr; - if (Section.Find("Source",Start,Stop) == true) + if (Section.Find(pkgTagSection::Key::Source,Start,Stop) == true) { const char * const Space = (const char * const) memchr(Start, ' ', Stop - Start); pkgCache::VerIterator V; @@ -209,36 +210,36 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver) Ver->MultiArch = ParseMultiArch(true); // Archive Size - Ver->Size = Section.FindULL("Size"); + Ver->Size = Section.FindULL(pkgTagSection::Key::Size); // Unpacked Size (in K) - Ver->InstalledSize = Section.FindULL("Installed-Size"); + Ver->InstalledSize = Section.FindULL(pkgTagSection::Key::Installed_Size); Ver->InstalledSize *= 1024; // Priority - if (Section.Find("Priority",Start,Stop) == true) + if (Section.Find(pkgTagSection::Key::Priority,Start,Stop) == true) { if (GrabWord(StringView(Start,Stop-Start),PrioList,Ver->Priority) == false) Ver->Priority = pkgCache::State::Extra; } - if (ParseDepends(Ver,"Pre-Depends",pkgCache::Dep::PreDepends) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Pre_Depends,pkgCache::Dep::PreDepends) == false) return false; - if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Depends,pkgCache::Dep::Depends) == false) return false; - if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Conflicts,pkgCache::Dep::Conflicts) == false) return false; - if (ParseDepends(Ver,"Breaks",pkgCache::Dep::DpkgBreaks) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Breaks,pkgCache::Dep::DpkgBreaks) == false) return false; - if (ParseDepends(Ver,"Recommends",pkgCache::Dep::Recommends) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Recommends,pkgCache::Dep::Recommends) == false) return false; - if (ParseDepends(Ver,"Suggests",pkgCache::Dep::Suggests) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Suggests,pkgCache::Dep::Suggests) == false) return false; - if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Replaces,pkgCache::Dep::Replaces) == false) return false; - if (ParseDepends(Ver,"Enhances",pkgCache::Dep::Enhances) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Enhances,pkgCache::Dep::Enhances) == false) return false; // Obsolete. - if (ParseDepends(Ver,"Optional",pkgCache::Dep::Suggests) == false) + if (ParseDepends(Ver,pkgTagSection::Key::Optional,pkgCache::Dep::Suggests) == false) return false; if (ParseProvides(Ver) == false) @@ -278,10 +279,10 @@ std::vector debListParser::AvailableDescriptionLanguages() */ MD5SumValue debListParser::Description_md5() { - StringView const value = Section.Find("Description-md5"); + StringView const value = Section.Find(pkgTagSection::Key::Description_md5); if (value.empty() == true) { - StringView const desc = Section.Find("Description"); + StringView const desc = Section.Find(pkgTagSection::Key::Description); if (desc == "\n") return MD5SumValue(); @@ -316,9 +317,9 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg, string const static essential = _config->Find("pkgCacheGen::Essential", "all"); if (essential == "all" || (essential == "native" && Pkg->Arch != 0 && myArch == Pkg.Arch())) - if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + if (Section.FindFlag(pkgTagSection::Key::Essential,Pkg->Flags,pkgCache::Flag::Essential) == false) return false; - if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false) + if (Section.FindFlag(pkgTagSection::Key::Important,Pkg->Flags,pkgCache::Flag::Important) == false) return false; if (std::find(forceEssential.begin(), forceEssential.end(), Pkg.Name()) != forceEssential.end()) @@ -342,17 +343,18 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg, /* */ unsigned short debListParser::VersionHash() { - static const StringView Sections[] ={"Installed-Size", - "Depends", - "Pre-Depends", -// "Suggests", -// "Recommends", - "Conflicts", - "Breaks", - "Replaces"}; + static constexpr pkgTagSection::Key Sections[] ={ + pkgTagSection::Key::Installed_Size, + pkgTagSection::Key::Depends, + pkgTagSection::Key::Pre_Depends, +// pkgTagSection::Key::Suggests, +// pkgTagSection::Key::Recommends", + pkgTagSection::Key::Conflicts, + pkgTagSection::Key::Breaks, + pkgTagSection::Key::Replaces}; unsigned long Result = INIT_FCS; char S[1024]; - for (StringView I : Sections) + for (auto I : Sections) { const char *Start; const char *End; @@ -402,13 +404,13 @@ bool debStatusListParser::ParseStatus(pkgCache::PkgIterator &Pkg, { const char *Start; const char *Stop; - if (Section.Find("Status",Start,Stop) == false) + if (Section.Find(pkgTagSection::Key::Status,Start,Stop) == false) return true; // UsePackage() is responsible for setting the flag in the default case bool const static essential = _config->Find("pkgCacheGen::Essential", "") == "installed"; if (essential == true && - Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false) + Section.FindFlag(pkgTagSection::Key::Essential,Pkg->Flags,pkgCache::Flag::Essential) == false) return false; // Isolate the first word @@ -808,11 +810,11 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop, /* This is the higher level depends parser. It takes a tag and generates a complete depends tree for the given version. */ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, - StringView Tag,unsigned int Type) + pkgTagSection::Key Key,unsigned int Type) { const char *Start; const char *Stop; - if (Section.Find(Tag,Start,Stop) == false || Start == Stop) + if (Section.Find(Key,Start,Stop) == false || Start == Stop) return true; string const pkgArch = Ver.Arch(); @@ -825,7 +827,7 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver, Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false); if (Start == 0) - return _error->Error("Problem parsing dependency %.*s",(int)Tag.length(), Tag.data()); + return _error->Error("Problem parsing dependency %zu",static_cast(Key)); // TODO size_t const found = Package.rfind(':'); if (found == string::npos) @@ -882,7 +884,7 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver) string const Arch = Ver.Arch(); const char *Start; const char *Stop; - if (Section.Find("Provides",Start,Stop) == true) + if (Section.Find(pkgTagSection::Key::Provides,Start,Stop) == true) { StringView Package; StringView Version; @@ -1010,7 +1012,7 @@ bool debListParser::SameVersion(unsigned short const Hash, /*{{{*/ // status file has no (Download)Size, but all others are fair game // status file is parsed last, so the first version we encounter is // probably also the version we have downloaded - unsigned long long const Size = Section.FindULL("Size"); + unsigned long long const Size = Section.FindULL(pkgTagSection::Key::Size); if (Size != 0 && Ver->Size != 0 && Size != Ver->Size) return false; // available everywhere, but easier to check here than to include in VersionHash diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h index 102cd62aa..43ce0cfd3 100644 --- a/apt-pkg/deb/deblistparser.h +++ b/apt-pkg/deb/deblistparser.h @@ -52,10 +52,8 @@ class APT_HIDDEN debListParser : public pkgCacheListParser map_filesize_t iOffset; virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver); -#ifdef APT_PKG_EXPOSE_STRING_VIEW - bool ParseDepends(pkgCache::VerIterator &Ver, APT::StringView Tag, + bool ParseDepends(pkgCache::VerIterator &Ver, pkgTagSection::Key Key, unsigned int Type); -#endif bool ParseProvides(pkgCache::VerIterator &Ver); #ifdef APT_PKG_EXPOSE_STRING_VIEW -- cgit v1.2.3