refactor: Move some OS-specifics into tox_system.

TokTok · Sep 11, 2023 · aa453e3 · aa453e3
1 parent 0cef46e
commit aa453e3
Show file tree

Hide file tree

Showing 170 changed files with 4,044 additions and 1,916 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+_build
+_install
diff --git a/.github/scripts/flags.sh b/.github/scripts/flags.sh
@@ -29,7 +29,7 @@ add_flag -O3 -march=native
 # Warn on non-ISO C.
 add_c_flag -pedantic
 add_c_flag -std=c99
-add_cxx_flag -std=c++11
+add_cxx_flag -std=c++17
 
 add_flag -g3
 add_flag -ftrapv
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -5,29 +5,75 @@ package(features = ["layering_check"])
 
 project()
 
+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 = [
+        "toxav.h",
+        "tox.h",
+        "toxencryptsave.h",
         "//c-toxcore/toxav:toxav.h",
-        "//c-toxcore/toxcore:tox.h",
         "//c-toxcore/toxencryptsave:toxencryptsave.h",
     ],
     outs = [
         "tox/toxav.h",
         "tox/tox.h",
         "tox/toxencryptsave.h",
+        "tox/toxav/toxav.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/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
@@ -282,6 +282,17 @@ 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/ping_array.c
   toxcore/ping_array.h
   toxcore/ping.c
@@ -302,11 +313,31 @@ 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_events.c
   toxcore/tox_events.h
-  toxcore/tox.h
+  toxcore/tox_log.c
+  toxcore/tox_log.h
+  toxcore/tox_log_impl.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_unpack.c
@@ -316,9 +347,24 @@ set(toxcore_SOURCES
 set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${LIBSODIUM_LIBRARIES})
 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)
+  ${toxcore_SOURCE_DIR}/toxcore/tox_log.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)
 
 ################################################################################
 #
@@ -346,6 +392,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)
 
   set(toxcore_LINK_MODULES ${toxcore_LINK_MODULES} ${OPUS_LIBRARIES} ${VPX_LIBRARIES})
@@ -362,6 +409,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:Messenger",
         "//c-toxcore/toxcore:mono_time",
         "//c-toxcore/toxcore:tox",
+        "//c-toxcore/toxcore:tox_time",
     ],
 )
 
@@ -61,9 +62,13 @@ flaky_tests = {
         "//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",