refactor: Implement buffered event dispatch in tox_iterate.

Aligns the behaviour of events and non-events iterate code.

Author: iphydf

auto_tests/BUILD.bazel

@@ -15,13 +15,13 @@ cc_library(
     deps = [
         ":check_compat",
         "//c-toxcore/testing:misc_tools",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:DHT",
         "//c-toxcore/toxcore:Messenger",
         "//c-toxcore/toxcore:mono_time",
         "//c-toxcore/toxcore:net_crypto",
         "//c-toxcore/toxcore:tox",
         "//c-toxcore/toxcore:tox_dispatch",
-        "//c-toxcore/toxcore:tox_events",
         "//c-toxcore/toxcore:tox_log_level",
     ],
 )
@@ -58,6 +58,7 @@ extra_data = {
         ":check_compat",
         "//c-toxcore/testing:misc_tools",
         "//c-toxcore/toxav",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:Messenger",
         "//c-toxcore/toxcore:TCP_client",
         "//c-toxcore/toxcore:TCP_common",
@@ -80,8 +81,6 @@ extra_data = {
         "//c-toxcore/toxcore:os_random",
         "//c-toxcore/toxcore:tox",
         "//c-toxcore/toxcore:tox_dispatch",
-        "//c-toxcore/toxcore:tox_events",
-        "//c-toxcore/toxcore:tox_unpack",
         "//c-toxcore/toxcore:util",
         "//c-toxcore/toxencryptsave",
         "@libsodium",

auto_tests/scenarios/BUILD.bazel

@@ -8,13 +8,13 @@ cc_library(
     visibility = ["//visibility:public"],
     deps = [
         "//c-toxcore/testing:misc_tools",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:attributes",
         "//c-toxcore/toxcore:ccompat",
         "//c-toxcore/toxcore:mono_time",
         "//c-toxcore/toxcore:network",
         "//c-toxcore/toxcore:tox",
         "//c-toxcore/toxcore:tox_dispatch",
-        "//c-toxcore/toxcore:tox_events",
     ],
 )
 
@@ -25,7 +25,7 @@ cc_library(
     deps = [
         ":scenario_framework",
         "//c-toxcore/toxav",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:tox_events",
     ],
 ) for src in glob(["scenario_*_test.c"])]

auto_tests/scenarios/framework/framework.c

@@ -577,7 +577,6 @@ ToxNode *tox_scenario_add_node_ex(ToxScenario *s, const char *alias, tox_node_sc
     }
 
     node->dispatch = tox_dispatch_new(nullptr);
-    tox_events_init(node->tox);
     mono_time_set_current_time_callback(node->tox->mono_time, get_scenario_clock, s);
 
     // Initial mirror population
@@ -784,7 +783,6 @@ void tox_node_reload(ToxNode *node)
 
     ck_assert_msg(new_tox != nullptr, "tox_new said OK but returned NULL");
     Tox_Dispatch *new_dispatch = tox_dispatch_new(nullptr);
-    tox_events_init(new_tox);
     mono_time_set_current_time_callback(new_tox->mono_time, get_scenario_clock, s);
 
     pthread_mutex_lock(&s->mutex);

auto_tests/tox_dispatch_test.c

@@ -108,7 +108,6 @@ static void test_tox_events(void)
     for (uint32_t i = 0; i < 2; ++i) {
         index[i] = i + 1;
         toxes[i] = tox_new_log(nullptr, nullptr, &index[i]);
-        tox_events_init(toxes[i]);
         ck_assert_msg(toxes[i] != nullptr, "failed to create tox instances %u", i);
     }
 

other/docker/esp32/BUILD.bazel

@@ -9,8 +9,8 @@ cc_binary(
         "main/tox_main.h",
     ],
     deps = [
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:ccompat",
         "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:tox_events",
     ],
 )

other/docker/modules/check

@@ -110,8 +110,8 @@ class BuildContext:
     def bzl_exports_files(self, *args: Any, **kwargs: Any) -> None:
         pass
 
-    def bzl_alias(self, *args: Any, **kwargs: Any) -> None:
-        pass
+    def bzl_alias(self, name: str, actual: str, **kwargs: Any) -> None:
+        self._add_target(name, (), (), (actual, ))
 
     def bzl_sh_library(self, *args: Any, **kwargs: Any) -> None:
         pass

other/event_tooling/generate_event_c.cpp

@@ -9,9 +9,8 @@ cc_fuzz_test(
     corpus = ["//tools/toktok-fuzzer/corpus:bootstrap_fuzz_test"],
     deps = [
         "//c-toxcore/testing/support",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:tox_dispatch",
-        "//c-toxcore/toxcore:tox_events",
     ],
 )
 
@@ -24,10 +23,9 @@ cc_fuzz_test(
     data = ["//tools/toktok-fuzzer/init:e2e_fuzz_test.dat"],
     deps = [
         "//c-toxcore/testing/support",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:crypto_core",
         "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:tox_dispatch",
-        "//c-toxcore/toxcore:tox_events",
     ],
 )
 
@@ -49,9 +47,8 @@ cc_binary(
     copts = ["-UNDEBUG"],
     deps = [
         "//c-toxcore/testing/support",
+        "//c-toxcore/toxcore",
         "//c-toxcore/toxcore:tox",
-        "//c-toxcore/toxcore:tox_dispatch",
-        "//c-toxcore/toxcore:tox_events",
         "//c-toxcore/toxcore:util",
     ],
 )

testing/fuzzing/BUILD.bazel

@@ -190,8 +190,6 @@ void TestBootstrap(Fuzz_Data &input)
     tox_bootstrap(tox, "127.0.0.2", 33446, pub_key, nullptr);
     tox_add_tcp_relay(tox, "127.0.0.2", 33446, pub_key, nullptr);
 
-    tox_events_init(tox);
-
     Tox_Dispatch *dispatch = tox_dispatch_new(nullptr);
     assert(dispatch != nullptr);
     setup_callbacks(dispatch);

testing/fuzzing/bootstrap_fuzz_test.cc

@@ -202,8 +202,6 @@ void TestEndToEnd(Fuzz_Data &input)
     assert(error_new == TOX_ERR_NEW_OK);
     assert(error_new_testing == TOX_ERR_NEW_TESTING_OK);
 
-    tox_events_init(tox);
-
     Tox_Dispatch *dispatch = tox_dispatch_new(nullptr);
     assert(dispatch != nullptr);
     setup_callbacks(dispatch);