refactor: Move some OS-specifics into tox_system.

TokTok · Nov 27, 2024 · d53319e · d53319e
1 parent 9e8c8b7
commit d53319e
Show file tree

Hide file tree

Showing 177 changed files with 4,188 additions and 2,025 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -3,32 +3,75 @@ load("//tools/project:build_defs.bzl", "project")
 
 project(license = "gpl3-https")
 
+genrule(
+    name = "toxcore_headers",
+    srcs = ["//c-toxcore/toxcore:public"],
+    outs = [
+        "tox/toxcore/os_log.h",
+        "tox/toxcore/os_memory.h",
+        "tox/toxcore/os_network.h",
+        "tox/toxcore/os_random.h",
+        "tox/toxcore/os_system.h",
+        "tox/toxcore/tox.h",
+        "tox/toxcore/tox_attributes.h",
+        "tox/toxcore/tox_dispatch.h",
+        "tox/toxcore/tox_events.h",
+        "tox/toxcore/tox_log.h",
+        "tox/toxcore/tox_log_impl.h",
+        "tox/toxcore/tox_memory.h",
+        "tox/toxcore/tox_memory_impl.h",
+        "tox/toxcore/tox_network.h",
+        "tox/toxcore/tox_network_impl.h",
+        "tox/toxcore/tox_options.h",
+        "tox/toxcore/tox_random.h",
+        "tox/toxcore/tox_random_impl.h",
+        "tox/toxcore/tox_system.h",
+        "tox/toxcore/tox_system_impl.h",
+        "tox/toxcore/tox_time.h",
+        "tox/toxcore/tox_time_impl.h",
+    ],
+    cmd = "cp $(locations //c-toxcore/toxcore:public) $(GENDIR)/c-toxcore/tox/toxcore/",
+    visibility = ["//visibility:public"],
+)
+
 genrule(
     name = "public_headers",
     srcs = [
+        "tox.h",
+        "toxav.h",
+        "toxencryptsave.h",
         "//c-toxcore/toxav:toxav.h",
-        "//c-toxcore/toxcore:tox.h",
-        "//c-toxcore/toxcore:tox_private.h",
         "//c-toxcore/toxencryptsave:toxencryptsave.h",
     ],
     outs = [
-        "tox/toxav.h",
         "tox/tox.h",
-        "tox/tox_private.h",
+        "tox/toxav.h",
+        "tox/toxav/toxav.h",
         "tox/toxencryptsave.h",
+        "tox/toxencryptsave/toxencryptsave.h",
     ],
     cmd = """
-        cp $(location //c-toxcore/toxav:toxav.h) $(GENDIR)/c-toxcore/tox/toxav.h
-        cp $(location //c-toxcore/toxcore:tox.h) $(GENDIR)/c-toxcore/tox/tox.h
-        cp $(location //c-toxcore/toxcore:tox_private.h) $(GENDIR)/c-toxcore/tox/tox_private.h
-        cp $(location //c-toxcore/toxencryptsave:toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave.h
+        cp $(location toxav.h) $(GENDIR)/c-toxcore/tox/toxav.h
+        cp $(location tox.h) $(GENDIR)/c-toxcore/tox/tox.h
+        cp $(location toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave.h
+        cp $(location //c-toxcore/toxav:toxav.h) $(GENDIR)/c-toxcore/tox/toxav/toxav.h
+        cp $(location //c-toxcore/toxencryptsave:toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave/toxencryptsave.h
     """,
     visibility = ["//visibility:public"],
 )
 
+filegroup(
+    name = "public",
+    srcs = [
+        ":public_headers",
+        ":toxcore_headers",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 cc_library(
     name = "c-toxcore",
-    hdrs = [":public_headers"],
+    hdrs = [":public"],
     includes = ["."],
     visibility = ["//visibility:public"],
     deps = [

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,6 +30,7 @@ endif()
 set_source_files_properties(
   toxcore/mono_time.c
   toxcore/network.c
+  toxcore/os_time.c
   toxcore/tox.c
   toxcore/util.c
   PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
@@ -317,6 +318,19 @@ set(toxcore_SOURCES
   toxcore/onion_client.c
   toxcore/onion_client.h
   toxcore/onion.h
+  toxcore/os_log.c
+  toxcore/os_log.h
+  toxcore/os_memory.c
+  toxcore/os_memory.h
+  toxcore/os_network.c
+  toxcore/os_network.h
+  toxcore/os_network_impl.h
+  toxcore/os_random.c
+  toxcore/os_random.h
+  toxcore/os_system.c
+  toxcore/os_system.h
+  toxcore/os_time.c
+  toxcore/os_time.h
   toxcore/ping_array.c
   toxcore/ping_array.h
   toxcore/ping.c
@@ -337,13 +351,35 @@ set(toxcore_SOURCES
   toxcore/timed_auth.h
   toxcore/tox_api.c
   toxcore/tox.c
+  toxcore/tox.h
   toxcore/tox_dispatch.c
   toxcore/tox_dispatch.h
   toxcore/tox_event.c
   toxcore/tox_event.h
   toxcore/tox_events.c
   toxcore/tox_events.h
-  toxcore/tox.h
+  toxcore/tox_log.c
+  toxcore/tox_log.h
+  toxcore/tox_log_impl.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_network.c
+  toxcore/tox_network.h
+  toxcore/tox_network_impl.h
+  toxcore/tox_options.c
+  toxcore/tox_options.h
+  toxcore/tox_random.c
+  toxcore/tox_random.h
+  toxcore/tox_random_impl.h
+  toxcore/tox_system.c
+  toxcore/tox_system.h
+  toxcore/tox_system_impl.h
+  toxcore/tox_time.c
+  toxcore/tox_time.h
+  toxcore/tox_time_impl.h
   toxcore/tox_private.c
   toxcore/tox_private.h
   toxcore/tox_pack.c
@@ -364,13 +400,25 @@ else()
 endif()
 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
 set(toxcore_API_HEADERS
+  ${toxcore_SOURCE_DIR}/tox.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/os_log.h^os
+  ${toxcore_SOURCE_DIR}/toxcore/os_memory.h^os
+  ${toxcore_SOURCE_DIR}/toxcore/os_network.h^os
+  ${toxcore_SOURCE_DIR}/toxcore/os_random.h^os
+  ${toxcore_SOURCE_DIR}/toxcore/os_system.h^os
   ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_attributes.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
   ${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
-  ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox)
-if(EXPERIMENTAL_API)
-  set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
-    ${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)
-endif()
+  ${toxcore_SOURCE_DIR}/toxcore/tox_log.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_log_level.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_memory.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_network.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_options.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_random.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_system.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_system_impl.h^tox
+  ${toxcore_SOURCE_DIR}/toxcore/tox_time.h^tox)
 
 ################################################################################
 #
@@ -399,6 +447,7 @@ if(BUILD_TOXAV)
     toxav/video.c
     toxav/video.h)
   set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
+    ${toxcore_SOURCE_DIR}/toxav.h^toxav
     ${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)
 
   if(TARGET Opus::opus AND TARGET libvpx::libvpx)
@@ -424,6 +473,7 @@ set(toxcore_SOURCES ${toxcore_SOURCES}
   toxencryptsave/toxencryptsave.c
   toxencryptsave/toxencryptsave.h)
 set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
+  ${toxcore_SOURCE_DIR}/toxencryptsave.h^tox
   ${toxcore_SOURCE_DIR}/toxencryptsave/toxencryptsave.h^tox)
 
 ################################################################################

diff --git a/auto_tests/BUILD.bazel b/auto_tests/BUILD.bazel
@@ -19,6 +19,7 @@ cc_library(
         "//c-toxcore/toxcore:tox",
         "//c-toxcore/toxcore:tox_dispatch",
         "//c-toxcore/toxcore:tox_events",
+        "//c-toxcore/toxcore:tox_time",
     ],
 )
 
@@ -75,9 +76,13 @@ extra_data = {
         "//c-toxcore/toxcore:onion",
         "//c-toxcore/toxcore:onion_announce",
         "//c-toxcore/toxcore:onion_client",
+        "//c-toxcore/toxcore:os_memory",
+        "//c-toxcore/toxcore:os_network",
+        "//c-toxcore/toxcore:os_random",
         "//c-toxcore/toxcore:tox",
         "//c-toxcore/toxcore:tox_dispatch",
         "//c-toxcore/toxcore:tox_events",
+        "//c-toxcore/toxcore:tox_time",
         "//c-toxcore/toxcore:util",
         "//c-toxcore/toxencryptsave",
         "@libsodium",

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
@@ -8,6 +8,9 @@
 #include "../toxcore/TCP_server.h"
 #include "../toxcore/crypto_core.h"
 #include "../toxcore/mono_time.h"
+#include "../toxcore/os_random.h"
+#include "../toxcore/os_network.h"
+#include "../toxcore/os_memory.h"
 #include "../toxcore/util.h"
 #include "auto_test_support.h"
 
@@ -52,7 +55,7 @@ static void test_basic(void)
     const Memory *mem = os_memory();
     ck_assert(mem != nullptr);
 
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
     Logger *logger = logger_new(mem);
     logger_callback_log(logger, print_debug_logger, nullptr, nullptr);
 
@@ -311,7 +314,7 @@ static void test_some(void)
     const Memory *mem = os_memory();
     ck_assert(mem != nullptr);
 
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
     Logger *logger = logger_new(mem);
 
     uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
@@ -507,7 +510,7 @@ static void test_client(void)
     ck_assert(mem != nullptr);
 
     Logger *logger = logger_new(mem);
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
 
     uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
     uint8_t self_secret_key[CRYPTO_SECRET_KEY_SIZE];
@@ -642,7 +645,7 @@ static void test_client_invalid(void)
     const Memory *mem = os_memory();
     ck_assert(mem != nullptr);
 
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
     Logger *logger = logger_new(mem);
 
     uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
@@ -720,7 +723,7 @@ static void test_tcp_connection(void)
     const Memory *mem = os_memory();
     ck_assert(mem != nullptr);
 
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
     Logger *logger = logger_new(mem);
 
     tcp_data_callback_called = 0;
@@ -833,7 +836,7 @@ static void test_tcp_connection2(void)
     const Memory *mem = os_memory();
     ck_assert(mem != nullptr);
 
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
     Logger *logger = logger_new(mem);
 
     tcp_oobdata_callback_called = 0;

diff --git a/auto_tests/announce_test.c b/auto_tests/announce_test.c
@@ -7,6 +7,9 @@
 #include "../toxcore/mono_time.h"
 #include "../toxcore/forwarding.h"
 #include "../toxcore/net_crypto.h"
+#include "../toxcore/os_memory.h"
+#include "../toxcore/os_network.h"
+#include "../toxcore/os_random.h"
 #include "../toxcore/util.h"
 #include "auto_test_support.h"
 #include "check_compat.h"
@@ -60,13 +63,13 @@ static void test_store_data(void)
     Logger *log = logger_new(mem);
     ck_assert(log != nullptr);
     logger_callback_log(log, print_debug_logger, nullptr, nullptr);
-    Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
+    Mono_Time *mono_time = mono_time_new(mem, nullptr);
     ck_assert(mono_time != nullptr);
     Networking_Core *net = new_networking_no_udp(log, mem, ns);
     ck_assert(net != nullptr);
     DHT *dht = new_dht(log, mem, rng, ns, mono_time, net, true, true);
     ck_assert(dht != nullptr);
-    Forwarding *forwarding = new_forwarding(log, rng, mono_time, dht);
+    Forwarding *forwarding = new_forwarding(log, mem, rng, mono_time, dht);
     ck_assert(forwarding != nullptr);
     Announcements *announce = new_announcements(log, mem, rng, mono_time, forwarding);
     ck_assert(announce != nullptr);

diff --git a/auto_tests/auto_test_support.c b/auto_tests/auto_test_support.c
@@ -7,7 +7,8 @@
 #include "../toxcore/mono_time.h"
 #include "../toxcore/tox_dispatch.h"
 #include "../toxcore/tox_events.h"
-#include "../toxcore/tox_struct.h"
+#include "../toxcore/tox_impl.h"
+#include "../toxcore/tox_time_impl.h"
 
 #include "auto_test_support.h"
 
@@ -157,17 +158,25 @@ static uint64_t get_state_clock_callback(void *user_data)
     return *clock;
 }
 
+static const Tox_Time_Funcs autotox_time_funcs = {
+    get_state_clock_callback,
+};
+
 void set_mono_time_callback(AutoTox *autotox)
 {
     ck_assert(autotox != nullptr);
 
+    if (autotox->tm == nullptr) {
+        autotox->tm = tox_time_new(&autotox_time_funcs, &autotox->clock, autotox->tox->sys.mem);
+    }
+
     Mono_Time *mono_time = autotox->tox->mono_time;
 
+    mono_time_set_current_time_callback(mono_time, nullptr);  // set to default first
     autotox->clock = current_time_monotonic(mono_time);
     ck_assert_msg(autotox->clock >= 1000,
                   "clock is too low (not initialised?): %lu", (unsigned long)autotox->clock);
-    mono_time_set_current_time_callback(mono_time, nullptr, nullptr);  // set to default first
-    mono_time_set_current_time_callback(mono_time, get_state_clock_callback, &autotox->clock);
+    mono_time_set_current_time_callback(mono_time, autotox->tm);
 }
 
 void save_autotox(AutoTox *autotox)
@@ -194,6 +203,8 @@ void kill_autotox(AutoTox *autotox)
     autotox->alive = false;
     tox_dispatch_free(autotox->dispatch);
     tox_kill(autotox->tox);
+    tox_time_free(autotox->tm);
+    autotox->tm = nullptr;
 }
 
 void reload(AutoTox *autotox)
@@ -399,6 +410,7 @@ void run_auto_test(struct Tox_Options *options, uint32_t tox_count, autotox_test
     for (uint32_t i = 0; i < tox_count; ++i) {
         tox_dispatch_free(autotoxes[i].dispatch);
         tox_kill(autotoxes[i].tox);
+        tox_time_free(autotoxes[i].tm);
         free(autotoxes[i].state);
         free(autotoxes[i].save_state);
     }

diff --git a/auto_tests/auto_test_support.h b/auto_tests/auto_test_support.h
@@ -12,6 +12,7 @@
 typedef struct AutoTox {
     Tox *tox;
     Tox_Dispatch *dispatch;
+    Tox_Time *tm;
 
     uint32_t index;
     uint64_t clock;

diff --git a/auto_tests/conference_av_test.c b/auto_tests/conference_av_test.c
@@ -7,6 +7,7 @@
 #include <stdint.h>
 
 #include "../toxav/toxav.h"
+#include "../toxcore/os_random.h"
 #include "check_compat.h"
 
 #define NUM_AV_GROUP_TOX 16

diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
@@ -6,6 +6,7 @@
 #include <time.h>
 #include <stdint.h>
 
+#include "../toxcore/os_random.h"
 #include "../toxcore/util.h"
 
 #include "check_compat.h"