apt/ftparchive, branch 2.9.12Debians commandline package managerhttps://git.kalnischkies.de/apt/atom?h=2.9.122024-11-14T19:02:57ZMerge branch 'noref' into 'main'2024-11-14T19:02:57ZJulian Andres Klodejak@debian.org2024-11-14T19:02:57Zurn:sha1:4f0f7d2ba3ec25068e5cfe72bf403b1966a21dbf
std::string_view const & -> std::string_view
See merge request apt-team/apt!397Merge branch 'append' into 'main'2024-11-14T19:02:34ZJulian Andres Klodejak@debian.org2024-11-14T19:02:34Zurn:sha1:6ee247f4e5130a348c46ed385a0f405f32cc92d4
(+=)+= -> append().append()
See merge request apt-team/apt!398(+=)+= -> append().append()2024-11-14T18:08:42Zнабnabijaczleweli@nabijaczleweli.xyz2024-11-14T18:08:42Zurn:sha1:fdd846cd67def08f04cc616530adc144fc5435d7std::string_view const & -> std::string_view2024-11-14T17:41:26Zнабnabijaczleweli@nabijaczleweli.xyz2024-11-14T17:37:57Zurn:sha1:323fcee3730fc8e3edd555f458bf260382f6d3ef
Fixes: 2c03eed649068c8838d971ceeb1a09603dcc8e9c
pkgTagSection::Tag constructors: std::string const& -> std::string_view (always copied) [#if APT_PKG_ABI > 600]2024-11-14T17:24:31Zнабnabijaczleweli@nabijaczleweli.xyz2024-11-14T16:16:50Zurn:sha1:c2c98b6e251d221faea879058aa0e92436048e76ftparchive/: prepare for APT::StringView -> std::string_view2024-11-14T15:16:45Zнабnabijaczleweli@nabijaczleweli.xyz2024-11-12T16:59:26Zurn:sha1:2c03eed649068c8838d971ceeb1a09603dcc8e9cTurn char[APT_BUFFER_SIZE] buffers into std::array<char, APT_BUFFER_SIZE>2024-11-11T14:52:43Zнабnabijaczleweli@nabijaczleweli.xyz2024-11-11T14:23:46Zurn:sha1:e59793e29ecb47c63b72de4f9d1e6d044a0ff6f2Bump read()/write() loop buffers from 4k to APT_BUFFER_SIZE (64k). Bump FileFdPrivate's read()/discard buffer from 1k to APT_BUFFER_SIZE (64k)2024-11-07T12:46:19Zнабnabijaczleweli@nabijaczleweli.xyz2024-11-07T12:46:19Zurn:sha1:a05376bca3649da9e8ca2c48836aad1d27f7d1dbftparchive: contents: Avoid exponential complexity and overflows2024-10-07T14:17:32ZJulian Andres Klodejulian.klode@canonical.com2024-10-04T16:35:15Zurn:sha1:604d1fac652965ec71629fec09ca39660c8bb8dc
Wstored directory entries as a binary tree, but we did not balance it,
leading to exponential complexity on insertion and potentially
exponential levels of stack recursion in DoPrint(), causing overflows.
Simply use an std::set storing pairs of (path, package) instead,
this is very simple, and handles aspects such as ordering or the
same package appearing multiple times correctly.
Iteration becomes a bit tricky: After seeing (file1, pkg1) when
we see (file1, pkg2) we need to append pkg2 to the current line;
once we see (file2, anything), we need write out the line and
start a new one.
For memory optimization, we use a new class StringInBlock to handle
the block-managed C strings generated by Mystrdup() in a type-safe
manner. This ensures proper lifetime of objects and no accidental
conversions to std::string. This saves a significant amount of
space (a pair of std::string is 64-byte large; a pair of pointers
is 16 byte large, a 48 byte saving per entry); reproducing the Contents
file of Ubuntu 24.10, using straight-forward std::string resulted in
GB of memory usage, whereas the C-style string only uses 1.35 GB.
As a side effect of the patch we also remove arbitrary 1024-byte
buffer sizes. There also is a change in output: The package names
are now sorted alphabetically, instead of being in visit order.
LP: #2083697
ftparchive: Mystrdup: Add safety check and bump buffer size2024-10-07T14:02:06ZJulian Andres Klodejulian.klode@canonical.com2024-10-07T13:55:44Zurn:sha1:d61d86c73104d1aa84fd6ca506c2230e67727b17
Add a safety check to ensure that the block were are allocating
actually fits the string we want to write. If it doesn't, abort
the program.
While we are here, bump the buffer size from 40 KiB to 4 MiB,
because why bother with smaller buffers.