summaryrefslogtreecommitdiff
path: root/apt-pkg
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add d-pointers to groups, packages, versions, and filesJulian Andres Klode2020-02-251-2/+17
| | | | | | | | | | | | | | | | This allows us to extend those in-cache objects with more data later on without breaking the ABI. Reserve 12 pointers for private data in the pkgCache class, and double the size of pools to 24.
* | Silence narrow conversion warnings, add error checksJulian Andres Klode2020-02-251-7/+20
| | | | | | | | | | | | When converting a long offset to a uint32_t to be stored in the map, check that this is safe to do. If the offset is negative, or we lose data in the conversion, we lost.
* | Make map_pointer<T> typesafeJulian Andres Klode2020-02-247-32/+54
| | | | | | | | | | | | | | | | | | | | | | Instead of just using uint32_t, which would allow you to assign e.g. a map_pointer<Version> to a map_pointer<Package>, use our own smarter struct that has strict type checking. We allow creating a map_pointer from a nullptr, and we allow comparing map_pointer to nullptr, which also deals with comparisons against 0 which are often used, as 0 will be implictly converted to nullptr.
* | Wrap AllocateInMap with a templated versionJulian Andres Klode2020-02-242-15/+20
| |
* | Replace map_pointer_t with map_pointer<T>Julian Andres Klode2020-02-244-98/+98
|/ | | | | | This is a first step to a type safe cache, adding typing information everywhere. Next, we'll replace map_pointer<T> implementation with a type safe one.
* Merge branch 'source_to_debsrc' into 'master'Julian Andres Klode2020-02-181-1/+1
|\ | | | | | | | | apt-pkg/srcrecords.cc: 'source' means 'deb-src' in error message See merge request apt-team/apt!101
| * apt-pkg/srcrecords.cc: 'source' means 'deb-src' in error messageNis Martensen2020-02-121-1/+1
| | | | | | | | | | | | | | | | The filename "sources.list" suggests that all contained lines are meant to describe some package source, so users might not immediately understand that this refers to 'deb-src' type lines. Please see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919285 for an example of the resulting confusion.
* | Remove CRC-16 implementationJulian Andres Klode2020-02-183-97/+0
| |
* | Use a 32-bit djb VersionHash instead of CRC-16Julian Andres Klode2020-02-187-15/+15
| |
* | Merge branch 'pu/source-version' into 'master'Julian Andres Klode2020-02-184-37/+78
|\ \ | | | | | | | | | | | | ABI BREAK: Implement pinning by source package See merge request apt-team/apt!96
| * | policy: Implement pinning by source packageJulian Andres Klode2020-01-171-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the src: syntax inside policy, allowing you to pin by source package. This by default only pins the native architecuture, use src:pkg:any to pin for all architectures in your cache. Closes: #166032
| * | Allow querying all binaries built by a source packageJulian Andres Klode2020-01-173-23/+35
| | | | | | | | | | | | | | | | | | This adds a simple way to lookup binaries by a source package, but this adds all binaries into one list, even with different source versions. Be careful.
* | | Remove code tagged APT_PKG_590, add some missing includesJulian Andres Klode2020-02-1814-2047/+4
| | | | | | | | | | | | | | | | | | Remove all code scheduled to be removed after 5.90, and fix files to include files they previously got from hashes.h including more headers.
* | | Bump ABI to 6.0Julian Andres Klode2020-02-181-2/+2
| | |
* | | Revert "Add a Packages-Require-Authorization Release file field"Julian Andres Klode2020-02-166-61/+3
| | | | | | | | | | | | | | | | | | | | | | | | This experiment did not turn out sensibly, as some servers do not accept credentials when none are expected and fail, so you cannot mirror such a repository. This reverts commit c2b9b0489538fed4770515bd8853a960b13a2618.
* | | policy: Add SetPriority() methodsJulian Andres Klode2020-02-162-0/+17
| |/ |/| | | | | | | These allow overriding priorities, however, pins set by SetPriority for package files will be overriden by calls to InitDefaults().
* | Fix remaining usec vs sec time-delta calculation typosDavid Kalnischkies2020-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While moving to a more stable clock in 79b61ae I typoed the microsecond calculation part and copied it all over the place… Julian fixed the first two instances in 089e6271 and Trent reported the apt-ftparchive instances leaving one instance in progress (invisible for user though). A bit ironic that in an attempt to stop "confusing (and amusing) users" I managed to hide a typo for close to two years doing just that… Sadly we can't really test this as while "apt-ftparchive generate /dev/null" is a great interactive test, it is hard to teach our test framework that the output is "reasonably below an hour" (usually 0s, but on busy test systems it is perhaps longer…). Thanks: Trent W. Buck for initial patch Closes: #950776 References: 79b61ae7673eb6213493e2cb202f0d70c390932d, 089e627153781ae7c320a5a0724c6c70d684b689
* | patterns: test for empty terms, reject themJulian Andres Klode2020-02-032-1/+4
| |
* | Correctly stop parsing short form arguments on space, also on ?Julian Andres Klode2020-02-032-10/+13
| | | | | | | | | | | | | | | | | | we have to stop parsing on space so that things like ~ramd64 | ~rall work correctly. aptitude does not stop parsing on ?, but we'll do as it gets very confusing otherwise if you write stuff like ~ramd64?name(foo), and it resolves to ?and(?architecture(amd64?name), (foo))...
* | patterns: Implement parsing of (...) groupsJulian Andres Klode2020-02-032-0/+27
| |
* | Implement | as orJulian Andres Klode2020-02-032-3/+42
| |
* | patterns: Allow rendering patterns as patterns instead of json-ishJulian Andres Klode2020-02-031-9/+10
| |
* | patterns: Parse sequence of patterns as ?andJulian Andres Klode2020-02-032-1/+32
| |
* | patterns: Allow bare words only in argumentsJulian Andres Klode2020-02-032-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the syntax from approximately expr = unary unary = '!'? primary primary = pattern | short-pattern | word | quoted-word pattern = '?' name [ '(' expr [',' expr]* ')' ] short-pattern = ~ name | ~name expr to: primary = pattern | short-pattern argument = word | quoted-word | expr pattern = '?' name [ '(' argument [',' argument]* ')' ] short-pattern = ~ name | ~name argument
* | patterns: Implement unary !Julian Andres Klode2020-02-032-1/+29
| |
* | Implement short patterns (patterns starting with ~)Julian Andres Klode2020-02-033-1/+59
| | | | | | | | | | | | Also make pattern detector in cacheset and private's list accept such patterns. We probably should just try to parse and see if it is a (start of a) pattern.
* | patterns: Use _sv literalsJulian Andres Klode2020-02-031-6/+6
| | | | | | | | | | This will make it easier to extend those views, given that we do not need to hardcode their length.
* | patterns: Provide Node constructor, simplify error throwingJulian Andres Klode2020-02-032-10/+5
| | | | | | | | | | By having a node constructor, we can construct a node inline for error reporting needs, simplifying the code a bit.
* | patterns: Make offset a size_t instead of off_tJulian Andres Klode2020-02-031-1/+1
| | | | | | | | This allows comparing against sentence.size()
* | StringView: Implement operator ""_svJulian Andres Klode2020-02-031-1/+4
| | | | | | | | This allows us to define constexpr string view literals.
* | NewGroup: Create GrpIterator after allocation (fix segfault)Julian Andres Klode2020-01-271-1/+2
| | | | | | | | | | | | | | NewGroup created a GrpIterator and then called WriteStringInMap() which might remap the cache, causing the iterator to go invalid. Avoid this simply by creating the iterator later on.
* | mmap: Do not look for empty pool unless we need toJulian Andres Klode2020-01-171-8/+9
|/ | | | | | | | | | Given that we have a maximum of 12 pools, and much more items to insert, it does not make sense to have two branches in the hot path. Move the search for an empty pool into the unlikely case that no matching pool has been created yet - a condition that is guaranteed to only happens up to 12 times.
* pkgcache.cc: Mix PACKAGE_VERSION into the cache hashJulian Andres Klode2020-01-161-0/+4
| | | | | | | | | | This ensures that caches build with one version can't be opened with another, which makes sense. It's a temporary approach until we can replace major:minor fields with a version string. For example, this would have prevented 1.9.7 from using broken caches from 1.9.6.
* NewProvidesAllArch: Check if group is empty before using itJulian Andres Klode2020-01-161-1/+1
| | | | | | | | | | | | | APT 1.9.6 introduced empty groups by making use of groups to deduplicate package names. This is not normally a problem, but here we assumed that every group has at least one package. This caused a problem because automake was providing automake-1.16 while having the source package automake-1.16. So we found the automake-1.16 group, iterated over its empty package list, trying to store the provides (which hence never happened). LP: #1859952
* Merge branch 'pu/apt-regex-cli' into 'master'Julian Andres Klode2020-01-151-2/+12
|\ | | | | | | | | apt(8): Disable regular expressions and fnmatch See merge request apt-team/apt!95
| * apt(8): Disable regular expressions and fnmatchJulian Andres Klode2020-01-151-2/+12
| | | | | | | | | | This is the first step. Next step will be to add warnings to apt-get and then remove support there as well.
* | netrc: Add warning when ignoring entries for unencrypted protocolsJulian Andres Klode2020-01-151-9/+15
|/ | | | | | | | Commit 93f33052de84e9aeaf19c92291d043dad2665bbd restricted auth.conf entries to only apply to https by default, but this was silent - there was no information why http sources with auth.conf entries suddenly started failing. Add such information, and extend test case to cover it.
* Remove includes of (md5|sha1|sha2).h headersJulian Andres Klode2020-01-147-9/+1
| | | | Remove it everywhere, except where it is still needed.
* Deprecate the Summation classes and mark them for removalJulian Andres Klode2020-01-144-4/+6
|
* Convert users of {MD5,SHA1,SHA256,SHA512}Summation to use HashesJulian Andres Klode2020-01-144-14/+30
| | | | | | | This makes use of the a function GetHashString() that returns the specific hash string. We also need to implement another overload of Add() for signed chars with sizes, so the existing users do not require reinterpret_cast everywhere.
* Raise buffer size for Hashes::AddFD() from 4 KiB to 64 KiBJulian Andres Klode2020-01-143-5/+6
| | | | | | Move APT_BUFFER_SIZE to macros.h and re-use it in hashes, this also might speed up stuff, the motivation for using 64 KiB buffers in fileutl.cc was precisely that after all.
* hashes: Use Libgcrypt for hashing purposesJulian Andres Klode2020-01-143-40/+76
| | | | | Switch the code of the Hashes class to use libgcrypt, which allows us to use hardware-accelerated implementations of SHA1 and friends.
* Merge branch 'pu/source-groups' into 'master'Julian Andres Klode2020-01-093-7/+8
|\ | | | | | | | | Avoid extra out-of-cache hash table deduplication for package names See merge request apt-team/apt!92
| * Avoid extra out-of-cache hash table deduplication for package namesJulian Andres Klode2020-01-083-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were de-duplicating package name strings in StoreString, but also deduplicating most of them by them being in groups, so we had extra hash table lookups that could be avoided in NewGroup(). To continue deduplicating names across binary packages and source packages, insert groups for source packages as well. This is also a good first step in allowing efficient lookup of packages by source package - we can extend Group later by a list of SourceVersion objects, or alternatively, simply add a by-source chain into pkgCache::Version. This change improves performance by about 10% (913 to 814 ms), while having no significant overhead on the cache size: --- before +++ after @@ -1,7 +1,7 @@ -Total package names: 109536 (2.191 k) -Total package structures: 118689 (4.748 k) +Total package names: 119642 (2.393 k) +Total package structures: 118687 (4.747 k) Normal packages: 83309 - Pure virtual packages: 3365 + Pure virtual packages: 3363 Single virtual packages: 17811 Mixed virtual packages: 1973 Missing: 12231 @@ -10,21 +10,21 @@ Total distinct descriptions: 149291 (3.583 k) Total dependencies: 484135/156650 (12,2 M) Total ver/file relations: 57421 (1.378 k) Total Desc/File relations: 18219 (437 k) -Total Provides mappings: 29963 (719 k) +Total Provides mappings: 29959 (719 k) Total globbed strings: 226993 (5.332 k) Total slack space: 26,8 k -Total space accounted for: 38,1 M +Total space accounted for: 38,3 M Total buckets in PkgHashTable: 50503 - Unused: 5727 - Used: 44776 - Utilization: 88.6601% - Average entries: 2.65073 + Unused: 5728 + Used: 44775 + Utilization: 88.6581% + Average entries: 2.65074 Longest: 60 Shortest: 1 Total buckets in GrpHashTable: 50503 - Unused: 5727 - Used: 44776 - Utilization: 88.6601% - Average entries: 2.44631 - Longest: 10 + Unused: 4649 + Used: 45854 + Utilization: 90.7946% + Average entries: 2.60919 + Longest: 11 Shortest: 1
* | acquire: Move queue startup after calling log's Start()Julian Andres Klode2020-01-081-4/+4
|/ | | | | | | | | | Startup() was checking for bad items and failing them, but we did not actually call Start() in the log, so the log might not be setup correctly. This caused a crash in python-apt when items were being failed on queue startup, as it released the GIL when Start() is being called and re-acquires it when running callbacks.
* Only define likely/unlikely if APT_COMPILING_APT setJulian Andres Klode2020-01-071-0/+2
| | | | This ensures that we do not leak simple words like that.
* Remove various unused macros like MAX/MIN/ABS/APT_CONSTJulian Andres Klode2020-01-071-33/+0
| | | | | We don't use them, APT_CONST is APT_PURE now, and MAX/MIN/etc are available as proper templates in the C++ standard library.
* Rename _count() macro to APT_ARRAY_SIZE()Julian Andres Klode2020-01-073-4/+4
|
* Avoid #define _error, use anonymous C++ struct insteadJulian Andres Klode2020-01-072-1/+5
| | | | | | | | | | | | Replace the macro with an anonymous struct that provides an inline operator->() returning the _error pointer. This change is ABI compatible, and the inline macro is not exported. We should consider if we want to avoid the function call and directly export the thread_local variable instead, when we do break ABI. Closes: #948338
* Merge branch 'pu/patterns-phase2' into 'master'Julian Andres Klode2019-12-022-1/+185
|\ | | | | | | | | Pu/patterns phase2 See merge request apt-team/apt!85
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2026-05-14 18:00:48 +0000