refactor: Delete tox_memory, align on mem and os_memory.

os_memory will be os_mem later.

Author: iphydf

CMakeLists.txt

@@ -358,9 +358,6 @@ set(toxcore_SOURCES
   toxcore/tox_events.h
   toxcore/tox_log_level.c
   toxcore/tox_log_level.h
-  toxcore/tox_memory.c
-  toxcore/tox_memory.h
-  toxcore/tox_memory_impl.h
   toxcore/tox_options.c
   toxcore/tox_options.h
   toxcore/tox_private.c

other/bootstrap_daemon/src/tox-bootstrapd.c

@@ -290,7 +290,7 @@ int main(int argc, char *argv[])
     IP ip;
     ip_init(&ip, enable_ipv6);
 
-    const Tox_Memory *mem = os_memory();
+    const Memory *mem = os_memory();
     const Tox_Random *rng = os_random();
     const Network *ns = os_network();
 

testing/support/BUILD.bazel

@@ -50,7 +50,6 @@ cc_library(
         "//c-toxcore/toxcore:network",
         "//c-toxcore/toxcore:tox",
         "//c-toxcore/toxcore:tox_events",
-        "//c-toxcore/toxcore:tox_memory",
         "//c-toxcore/toxcore:tox_options",
         "//c-toxcore/toxcore:tox_random",
         "@psocket",

testing/support/doubles/fake_memory.hh

@@ -7,7 +7,7 @@
 #include "../public/memory.hh"
 
 // Forward declaration
-struct Tox_Memory;
+struct Memory;
 
 namespace tox::test {
 
@@ -30,9 +30,9 @@ public:
     void set_observer(Observer observer);
 
     /**
-     * @brief Returns C-compatible Tox_Memory struct.
+     * @brief Returns C-compatible Memory struct.
      */
-    struct Tox_Memory c_memory() override;
+    struct Memory c_memory() override;
 
     size_t current_allocation() const;
     size_t max_allocation() const;

testing/support/public/memory.hh

@@ -5,7 +5,7 @@
 #include <cstdint>
 
 // Forward declaration
-struct Tox_Memory;
+struct Memory;
 
 namespace tox::test {
 
@@ -21,9 +21,9 @@ public:
     virtual void free(void *ptr) = 0;
 
     /**
-     * @brief Returns C-compatible Tox_Memory struct.
+     * @brief Returns C-compatible Memory struct.
      */
-    virtual struct Tox_Memory c_memory() = 0;
+    virtual struct Memory c_memory() = 0;
 };
 
 }  // namespace tox::test

testing/support/public/simulated_environment.hh

@@ -13,7 +13,7 @@
 #include <sys/socket.h>
 #endif
 
-#include "../../../toxcore/tox_memory_impl.h"
+#include "../../../toxcore/mem.h"
 #include "../../../toxcore/tox_private.h"
 #include "../../../toxcore/tox_random_impl.h"
 #include "../doubles/fake_clock.hh"
@@ -34,7 +34,7 @@ struct ScopedToxSystem {
     // C structs
     struct Network c_network;
     struct Tox_Random c_random;
-    struct Tox_Memory c_memory;
+    struct Memory c_memory;
 
     // The main struct passed to tox_new
     Tox_System system;

testing/support/public/simulation.hh

@@ -16,8 +16,8 @@
 #include <sys/socket.h>
 #endif
 
+#include "../../../toxcore/mem.h"
 #include "../../../toxcore/tox.h"
-#include "../../../toxcore/tox_memory_impl.h"
 #include "../../../toxcore/tox_private.h"
 #include "../../../toxcore/tox_random_impl.h"
 #include "../doubles/fake_clock.hh"
@@ -172,7 +172,7 @@ private:
 public:
     struct Network c_network;
     struct Tox_Random c_random;
-    struct Tox_Memory c_memory;
+    struct Memory c_memory;
     struct IP ip;
 };
 

testing/support/src/fake_memory.cc

@@ -4,13 +4,13 @@
 #include <iostream>
 #include <new>
 
-#include "../../../toxcore/tox_memory_impl.h"
+#include "../../../toxcore/mem.h"
 
 namespace tox::test {
 
 // --- Trampolines ---
 
-static const Tox_Memory_Funcs kFakeMemoryVtable = {
+static const Memory_Funcs kFakeMemoryVtable = {
     .malloc_callback
     = [](void *obj, uint32_t size) { return static_cast<FakeMemory *>(obj)->malloc(size); },
     .realloc_callback
@@ -127,7 +127,7 @@ void FakeMemory::set_failure_injector(FailureInjector injector)
 
 void FakeMemory::set_observer(Observer observer) { observer_ = std::move(observer); }
 
-struct Tox_Memory FakeMemory::c_memory() { return Tox_Memory{&kFakeMemoryVtable, this}; }
+struct Memory FakeMemory::c_memory() { return Memory{&kFakeMemoryVtable, this}; }
 
 size_t FakeMemory::current_allocation() const { return current_allocation_.load(); }
 

toxav/toxav.c

@@ -86,7 +86,7 @@ typedef struct DecodeTimeStats {
 } DecodeTimeStats;
 
 struct ToxAV {
-    const struct Tox_Memory *mem;
+    const struct Memory *mem;
     Logger *log;
     Tox *tox;
     MSISession *msi;

toxcore/BUILD.bazel

@@ -54,28 +54,14 @@ cc_library(
     deps = [":attributes"],
 )
 
-cc_library(
-    name = "tox_memory",
-    srcs = ["tox_memory.c"],
-    hdrs = [
-        "tox_memory.h",
-        "tox_memory_impl.h",
-    ],
-    visibility = ["//c-toxcore:__subpackages__"],
-    deps = [
-        ":ccompat",
-        ":tox_attributes",
-    ],
-)
-
 cc_library(
     name = "os_memory",
     srcs = ["os_memory.c"],
     hdrs = ["os_memory.h"],
     visibility = ["//c-toxcore:__subpackages__"],
     deps = [
         ":attributes",
-        ":tox_memory",
+        ":mem",
     ],
 )
 
@@ -89,8 +75,8 @@ cc_library(
     visibility = ["//c-toxcore:__subpackages__"],
     deps = [
         ":ccompat",
+        ":mem",
         ":tox_attributes",
-        ":tox_memory",
     ],
 )
 
@@ -115,7 +101,6 @@ cc_library(
     deps = [
         ":attributes",
         ":ccompat",
-        ":tox_memory",
     ],
 )