Merge branch 'solver3' into 'main'

Introduce JSONL performance counter logging and constexpr-ify the solver and cache

See merge request apt-team/apt!551

1 files changed, 2 insertions, 0 deletions

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index f7f508f85..2a9ef50d2 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -19,6 +19,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/macros.h>
+#include <apt-pkg/perf.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/prettyprinters.h>
 #include <apt-pkg/progress.h>
@@ -225,6 +226,7 @@ bool pkgDepCache::CheckConsistency(char const *const msgtag)		/*{{{*/
 /* This allocats the extension buffers and initializes them. */
 bool pkgDepCache::Init(OpProgress * const Prog)
 {
+   APT::PerformanceContext perf{"pkgDepCache::Init"};
    // Suppress mark updates during this operation (just in case) and
    // run a mark operation when Init terminates.
    ActionGroup actions(*this);