From ed274c24d7fb037bce0946c8816c85cb9dfd4013 Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Fri, 12 Jul 2024 16:10:28 -0700
Subject: [PATCH] Just output metrics in the order declared

---
 ConflictSet.cpp            | 8 ++------
 aarch64-symbol-imports.txt | 4 +---
 apple-symbol-imports.txt   | 2 --
 symbol-imports.txt         | 4 +---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 2d2177a..a60e1cb 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -3264,17 +3264,13 @@ struct __attribute__((visibility("hidden"))) ConflictSet::Impl {
   int metricsCount = 0;
   void initMetrics() {
     metrics = (MetricsV1 *)safe_malloc(metricsCount * sizeof(metrics[0]));
-    for (auto [i, m] = std::make_tuple(0, metricList); i < metricsCount;
-         ++i, m = m->prev) {
+    for (auto [i, m] = std::make_tuple(metricsCount - 1, metricList); i >= 0;
+         --i, m = m->prev) {
       metrics[i].name = m->name;
       metrics[i].help = m->help;
       metrics[i].p = m;
       metrics[i].type = m->type;
     }
-    std::sort(metrics, metrics + metricsCount,
-              [](const MetricsV1 &lhs, const MetricsV1 &rhs) -> bool {
-                return std::string_view(lhs.name) < std::string_view(rhs.name);
-              });
   }
 
   Metric *metricList = nullptr;
diff --git a/aarch64-symbol-imports.txt b/aarch64-symbol-imports.txt
index cced1fe..998befb 100644
--- a/aarch64-symbol-imports.txt
+++ b/aarch64-symbol-imports.txt
@@ -5,8 +5,6 @@ __stack_chk_guard@GLIBC_2.17
 abort@GLIBC_2.17
 free@GLIBC_2.17
 malloc@GLIBC_2.17
-memcmp@GLIBC_2.17
 memcpy@GLIBC_2.17
 memmove@GLIBC_2.17
-memset@GLIBC_2.17
-strlen@GLIBC_2.17
\ No newline at end of file
+memset@GLIBC_2.17
\ No newline at end of file
diff --git a/apple-symbol-imports.txt b/apple-symbol-imports.txt
index d799242..d54df83 100644
--- a/apple-symbol-imports.txt
+++ b/apple-symbol-imports.txt
@@ -5,8 +5,6 @@ _abort
 _bzero
 _free
 _malloc
-_memcmp
 _memcpy
 _memmove
-_strlen
 dyld_stub_binder
\ No newline at end of file
diff --git a/symbol-imports.txt b/symbol-imports.txt
index e352235..1222232 100644
--- a/symbol-imports.txt
+++ b/symbol-imports.txt
@@ -6,8 +6,6 @@ __tls_get_addr@GLIBC_2.3
 abort@GLIBC_2.2.5
 free@GLIBC_2.2.5
 malloc@GLIBC_2.2.5
-memcmp@GLIBC_2.2.5
 memcpy@GLIBC_2.14
 memmove@GLIBC_2.2.5
-memset@GLIBC_2.2.5
-strlen@GLIBC_2.2.5
\ No newline at end of file
+memset@GLIBC_2.2.5
\ No newline at end of file