Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d

Browse Source 
9ed2fa80d fix(toxav): remove extra copy of video frame on encode
de30cf3ad docs: Add new file kinds, that should be useful to all clients.
d5b5e879d fix(DHT): Correct node skipping logic timed out nodes.
30e71fe97 refactor: Generate event dispatch functions and add tox_events_dispatch.
8fdbb0b50 style: Format parameter lists in event handlers.
d00dee12b refactor: Add warning logs when losing chat invites.
b144e8db1 feat: Add a way to look up a file number by ID.
849281ea0 feat: Add a way to fetch groups by chat ID.
a2c177396 refactor: Harden event system and improve type safety.
8f5caa656 refactor: Add MessagePack string support to bin_pack.
34e8d5ad5 chore: Add GitHub CodeQL workflow and local Docker runner.
f7b068010 refactor: Add nullability annotations to event headers.
788abe651 refactor(toxav): Use system allocator for mutexes.
2e4b423eb refactor: Use specific typedefs for public API arrays.
2baf34775 docs(toxav): update idle iteration interval see 679444751876fa3882a717772918ebdc8f083354
2f87ac67b feat: Add Event Loop abstraction (Ev).
f8dfc38d8 test: Fix data race in ToxScenario virtual_clock.
38313921e test(TCP): Add regression test for TCP priority queue integrity.
f94a50d9a refactor(toxav): Replace mutable_mutex with dynamically allocated mutex.
ad054511e refactor: Internalize DHT structs and add debug helpers.
8b467cc96 fix: Prevent potential integer overflow in group chat handshake.
4962bdbb8 test: Improve TCP simulation and add tests
5f0227093 refactor: Allow nullable data in group chat handlers.
e97b18ea9 chore: Improve Windows Docker support.
b14943bbd refactor: Move Logger out of Messenger into Tox.
dd3136250 cleanup: Apply nullability qualifiers to C++ codebase.
1849f70fc refactor: Extract low-level networking code to net and os_network.
8fec75421 refactor: Delete tox_random, align on rng and os_random.
a03ae8051 refactor: Delete tox_memory, align on mem and os_memory.
4c88fed2c refactor: Use `std::` prefixes more consistently in C++ code.
72452f2ae test: Add some more tests for onion and shared key cache.
d5a51b09a cleanup: Use tox_attributes.h in tox_private.h and install it.
b6f5b9fc5 test: Add some benchmarks for various high level things.
8a8d02785 test(support): Introduce threaded Tox runner and simulation barrier
d68d1d095 perf(toxav): optimize audio and video intermediate buffers by keeping them around
REVERT: c9cdae001 fix(toxav): remove extra copy of video frame on encode

git-subtree-dir: external/toxcore/c-toxcore
git-subtree-split: 9ed2fa80d582c714d6bdde6a7648220a92cddff8
This commit is contained in:
Green Sky
2026-02-01 14:26:52 +01:00
parent 565efa4f39
commit 9b36dd9d99
274 changed files with 11891 additions and 4292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

221
testing/bench/tox_messenger_bench.cc Normal file
View File

@@ -0,0 +1,221 @@
/* SPDX-License-Identifier: GPL-3.0-or-later
* Copyright © 2026 The TokTok team.
*/
#include <benchmark/benchmark.h>
#include <iostream>
#include "../../testing/support/public/simulation.hh"
#include "../../toxcore/network.h"
#include "../../toxcore/tox.h"
namespace {
using tox::test::Simulation;
struct Context {
size_t count = 0;
};
void BM_ToxMessengerThroughput(benchmark::State &state)
{
Simulation sim;
sim.net().set_latency(5);
auto node1 = sim.create_node();
auto node2 = sim.create_node();
auto opts1 = std::unique_ptr<Tox_Options, decltype(&tox_options_free)>(
tox_options_new(nullptr), tox_options_free);
tox_options_set_log_user_data(opts1.get(), const_cast<char *>("Tox1"));
tox_options_set_ipv6_enabled(opts1.get(), false);
tox_options_set_local_discovery_enabled(opts1.get(), false);
auto opts2 = std::unique_ptr<Tox_Options, decltype(&tox_options_free)>(
tox_options_new(nullptr), tox_options_free);
tox_options_set_log_user_data(opts2.get(), const_cast<char *>("Tox2"));
tox_options_set_ipv6_enabled(opts2.get(), false);
tox_options_set_local_discovery_enabled(opts2.get(), false);
auto tox1 = node1->create_tox(opts1.get());
auto tox2 = node2->create_tox(opts2.get());
if (!tox1 || !tox2) {
state.SkipWithError("Failed to create Tox instances");
return;
}
uint8_t tox1_pk[TOX_PUBLIC_KEY_SIZE];
tox_self_get_public_key(tox1.get(), tox1_pk);
uint8_t tox2_pk[TOX_PUBLIC_KEY_SIZE];
tox_self_get_public_key(tox2.get(), tox2_pk);
uint8_t tox1_dht_id[TOX_PUBLIC_KEY_SIZE];
tox_self_get_dht_id(tox1.get(), tox1_dht_id);
uint8_t tox2_dht_id[TOX_PUBLIC_KEY_SIZE];
tox_self_get_dht_id(tox2.get(), tox2_dht_id);
Tox_Err_Friend_Add friend_add_err;
uint32_t f1 = tox_friend_add_norequest(tox1.get(), tox2_pk, &friend_add_err);
uint32_t f2 = tox_friend_add_norequest(tox2.get(), tox1_pk, &friend_add_err);
uint16_t port1 = node1->get_primary_socket()->local_port();
uint16_t port2 = node2->get_primary_socket()->local_port();
char ip1[TOX_INET6_ADDRSTRLEN];
ip_parse_addr(&node1->ip, ip1, sizeof(ip1));
char ip2[TOX_INET6_ADDRSTRLEN];
ip_parse_addr(&node2->ip, ip2, sizeof(ip2));
tox_bootstrap(tox2.get(), ip1, port1, tox1_dht_id, nullptr);
tox_bootstrap(tox1.get(), ip2, port2, tox2_dht_id, nullptr);
bool connected = false;
sim.run_until(
[&]() {
tox_iterate(tox1.get(), nullptr);
tox_iterate(tox2.get(), nullptr);
sim.advance_time(90); // +10ms from run_until = 100ms
connected
= (tox_friend_get_connection_status(tox1.get(), f1, nullptr) != TOX_CONNECTION_NONE
&& tox_friend_get_connection_status(tox2.get(), f2, nullptr)
!= TOX_CONNECTION_NONE);
return connected;
},
60000);
if (!connected) {
state.SkipWithError("Failed to connect toxes within 60s");
return;
}
const uint8_t msg[] = "benchmark message";
const size_t msg_len = sizeof(msg);
Context ctx;
tox_callback_friend_message(tox2.get(),
[](Tox *, uint32_t, Tox_Message_Type, const uint8_t *, size_t, void *user_data) {
static_cast<Context *>(user_data)->count++;
});
for (auto _ : state) {
tox_friend_send_message(tox1.get(), f1, TOX_MESSAGE_TYPE_NORMAL, msg, msg_len, nullptr);
for (int i = 0; i < 5; ++i) {
sim.advance_time(1);
tox_iterate(tox1.get(), nullptr);
tox_iterate(tox2.get(), &ctx);
}
}
state.counters["messages_received"]
= benchmark::Counter(static_cast<double>(ctx.count), benchmark::Counter::kAvgThreads);
}
BENCHMARK(BM_ToxMessengerThroughput);
void BM_ToxMessengerBidirectional(benchmark::State &state)
{
Simulation sim;
sim.net().set_latency(5);
auto node1 = sim.create_node();
auto node2 = sim.create_node();
auto opts1 = std::unique_ptr<Tox_Options, decltype(&tox_options_free)>(
tox_options_new(nullptr), tox_options_free);
tox_options_set_log_user_data(opts1.get(), const_cast<char *>("Tox1"));
tox_options_set_ipv6_enabled(opts1.get(), false);
tox_options_set_local_discovery_enabled(opts1.get(), false);
auto opts2 = std::unique_ptr<Tox_Options, decltype(&tox_options_free)>(
tox_options_new(nullptr), tox_options_free);
tox_options_set_log_user_data(opts2.get(), const_cast<char *>("Tox2"));
tox_options_set_ipv6_enabled(opts2.get(), false);
tox_options_set_local_discovery_enabled(opts2.get(), false);
auto tox1 = node1->create_tox(opts1.get());
auto tox2 = node2->create_tox(opts2.get());
if (!tox1 || !tox2) {
state.SkipWithError("Failed to create Tox instances");
return;
}
uint8_t tox1_pk[TOX_PUBLIC_KEY_SIZE];
tox_self_get_public_key(tox1.get(), tox1_pk);
uint8_t tox2_pk[TOX_PUBLIC_KEY_SIZE];
tox_self_get_public_key(tox2.get(), tox2_pk);
uint8_t tox1_dht_id[TOX_PUBLIC_KEY_SIZE];
tox_self_get_dht_id(tox1.get(), tox1_dht_id);
uint8_t tox2_dht_id[TOX_PUBLIC_KEY_SIZE];
tox_self_get_dht_id(tox2.get(), tox2_dht_id);
Tox_Err_Friend_Add friend_add_err;
uint32_t f1 = tox_friend_add_norequest(tox1.get(), tox2_pk, &friend_add_err);
uint32_t f2 = tox_friend_add_norequest(tox2.get(), tox1_pk, &friend_add_err);
uint16_t port1 = node1->get_primary_socket()->local_port();
uint16_t port2 = node2->get_primary_socket()->local_port();
char ip1[TOX_INET6_ADDRSTRLEN];
ip_parse_addr(&node1->ip, ip1, sizeof(ip1));
char ip2[TOX_INET6_ADDRSTRLEN];
ip_parse_addr(&node2->ip, ip2, sizeof(ip2));
tox_bootstrap(tox2.get(), ip1, port1, tox1_dht_id, nullptr);
tox_bootstrap(tox1.get(), ip2, port2, tox2_dht_id, nullptr);
bool connected = false;
sim.run_until(
[&]() {
tox_iterate(tox1.get(), nullptr);
tox_iterate(tox2.get(), nullptr);
sim.advance_time(90); // +10ms from run_until = 100ms
connected
= (tox_friend_get_connection_status(tox1.get(), f1, nullptr) != TOX_CONNECTION_NONE
&& tox_friend_get_connection_status(tox2.get(), f2, nullptr)
!= TOX_CONNECTION_NONE);
return connected;
},
60000);
if (!connected) {
state.SkipWithError("Failed to connect toxes within 60s");
return;
}
const uint8_t msg[] = "benchmark message";
const size_t msg_len = sizeof(msg);
Context ctx1, ctx2;
tox_callback_friend_message(tox1.get(),
[](Tox *, uint32_t, Tox_Message_Type, const uint8_t *, size_t, void *user_data) {
static_cast<Context *>(user_data)->count++;
});
tox_callback_friend_message(tox2.get(),
[](Tox *, uint32_t, Tox_Message_Type, const uint8_t *, size_t, void *user_data) {
static_cast<Context *>(user_data)->count++;
});
for (auto _ : state) {
tox_friend_send_message(tox1.get(), f1, TOX_MESSAGE_TYPE_NORMAL, msg, msg_len, nullptr);
tox_friend_send_message(tox2.get(), f2, TOX_MESSAGE_TYPE_NORMAL, msg, msg_len, nullptr);
for (int i = 0; i < 5; ++i) {
sim.advance_time(1);
tox_iterate(tox1.get(), &ctx1);
tox_iterate(tox2.get(), &ctx2);
}
}
state.counters["messages_received"] = benchmark::Counter(
static_cast<double>(ctx1.count + ctx2.count), benchmark::Counter::kAvgThreads);
}
BENCHMARK(BM_ToxMessengerBidirectional);
} // namespace
BENCHMARK_MAIN();