randombit
diff --git a/‎doc/dev_ref/todo.rst‎
Lines changed: 0 additions & 1 deletion b/‎doc/dev_ref/todo.rst‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/cli/perf.cpp‎
Lines changed: 41 additions & 0 deletions b/‎src/cli/perf.cpp‎
Lines changed: 41 additions & 0 deletions
diff --git a/‎src/cli/perf.h‎
Lines changed: 70 additions & 0 deletions b/‎src/cli/perf.h‎
Lines changed: 70 additions & 0 deletions
@@ -135,7 +135,6 @@ CLI
 
 * Add a ``--completion`` option to dump autocomplete info, write
   support for autocompletion in bash/zsh.
-* Refactor ``speed``
 * Change `tls_server` to be a tty<->socket app, like `tls_client` is,
   instead of a bogus echo server.
 * `encrypt` / `decrypt` tools providing password based file encryption
 
@@ -0,0 +1,41 @@
+/*
+* (C) 2024 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
+#include "perf.h"
+#include "cli_exceptions.h"
+#include <map>
+
+namespace Botan_CLI {
+
+PerfTest::Registration::Registration(const std::string& name, const PerfTest::pt_maker_fn& maker_fn) {
+   std::map<std::string, PerfTest::pt_maker_fn>& reg = PerfTest::global_registry();
+
+   if(reg.contains(name)) {
+      throw CLI_Error("Duplicated registration of command " + name);
+   }
+
+   reg.insert(std::make_pair(name, maker_fn));
+}
+
+//static
+std::map<std::string, PerfTest::pt_maker_fn>& PerfTest::global_registry() {
+   static std::map<std::string, PerfTest::pt_maker_fn> g_perf_tests;
+   return g_perf_tests;
+}
+
+//static
+std::unique_ptr<PerfTest> PerfTest::get(const std::string& name) {
+   const auto& reg = PerfTest::global_registry();
+
+   auto i = reg.find(name);
+   if(i != reg.end()) {
+      return i->second();
+   }
+
+   return nullptr;
+}
+
+}  // namespace Botan_CLI
@@ -0,0 +1,70 @@
+/*
+* (C) 2024 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
+#ifndef BOTAN_CLI_PERF_H_
+#define BOTAN_CLI_PERF_H_
+
+#include <botan/rng.h>
+#include <botan/internal/fmt.h>
+#include <botan/internal/timer.h>
+#include <chrono>
+#include <functional>
+#include <iosfwd>
+#include <map>
+#include <string>
+
+namespace Botan_CLI {
+
+class PerfConfig {
+   public:
+      virtual ~PerfConfig() = default;
+
+      virtual std::chrono::milliseconds runtime() const = 0;
+
+      //virtual std::vector<std::string> providers() const = 0;
+
+      virtual const std::vector<size_t>& buffer_sizes() const = 0;
+
+      virtual std::ostream& error_output() const = 0;
+
+      virtual Botan::RandomNumberGenerator& rng() const = 0;
+
+      virtual void record_result(const Botan::Timer& timer) const = 0;
+
+      virtual std::unique_ptr<Botan::Timer> make_timer(const std::string& alg,
+                                                       uint64_t event_mult = 1,
+                                                       const std::string& what = "",
+                                                       const std::string& provider = "",
+                                                       size_t buf_size = 0) const = 0;
+};
+
+class PerfTest {
+   public:
+      virtual ~PerfTest() = default;
+
+      // Returns nullptr if unknown / not available
+      static std::unique_ptr<PerfTest> get(const std::string& alg);
+
+      virtual void go(const PerfConfig& config) = 0;
+
+      typedef std::function<std::unique_ptr<PerfTest>()> pt_maker_fn;
+
+      class Registration final {
+         public:
+            Registration(const std::string& name, const std::function<std::unique_ptr<PerfTest>()>& maker_fn);
+      };
+
+   private:
+      static std::map<std::string, pt_maker_fn>& global_registry();
+};
+
+#define BOTAN_REGISTER_PERF_TEST(name, Perf_Class)                \
+   const Botan_CLI::PerfTest::Registration reg_perf_##Perf_Class( \
+      name, []() -> std::unique_ptr<Botan_CLI::PerfTest> { return std::make_unique<Perf_Class>(); })
+
+}  // namespace Botan_CLI
+
+#endif