Squashed 'external/toxcore/c-toxcore/' changes from c9cdae001..9ed2fa80d
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:
152
toxcore/ev_bench.cc
Normal file
152
toxcore/ev_bench.cc
Normal file
@@ -0,0 +1,152 @@
|
||||
/* SPDX-License-Identifier: GPL-3.0-or-later
|
||||
* Copyright © 2026 The TokTok team.
|
||||
*/
|
||||
|
||||
#include <benchmark/benchmark.h>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <vector>
|
||||
|
||||
#include "ev_test_util.hh"
|
||||
#include "logger.h"
|
||||
#include "net.h"
|
||||
#include "os_event.h"
|
||||
#include "os_memory.h"
|
||||
#include "os_network.h"
|
||||
|
||||
namespace {
|
||||
|
||||
class EvBenchFixture : public benchmark::Fixture {
|
||||
public:
|
||||
void SetUp(const ::benchmark::State &state) override
|
||||
{
|
||||
if (os_network() == nullptr) {
|
||||
setup_error = "os_network failed";
|
||||
return;
|
||||
}
|
||||
mem = os_memory();
|
||||
log = logger_new(mem);
|
||||
// We don't want log output during benchmark
|
||||
ev = os_event_new(mem, log);
|
||||
}
|
||||
|
||||
void TearDown(const ::benchmark::State &state) override
|
||||
{
|
||||
for (size_t i = 0; i < sockets_r.size(); ++i) {
|
||||
close_pair(sockets_r[i], sockets_w[i]);
|
||||
}
|
||||
sockets_r.clear();
|
||||
sockets_w.clear();
|
||||
ev_kill(ev);
|
||||
logger_kill(log);
|
||||
}
|
||||
|
||||
const Memory *mem = nullptr;
|
||||
Logger *log = nullptr;
|
||||
Ev *ev = nullptr;
|
||||
std::vector<Socket> sockets_r;
|
||||
std::vector<Socket> sockets_w;
|
||||
int tag = 1;
|
||||
std::string setup_error;
|
||||
};
|
||||
|
||||
// Specialized SetUp to handle socket creation based on range
|
||||
class EvBenchSocketsFixture : public EvBenchFixture {
|
||||
public:
|
||||
void SetUp(const ::benchmark::State &state) override
|
||||
{
|
||||
EvBenchFixture::SetUp(state);
|
||||
if (!setup_error.empty()) {
|
||||
return;
|
||||
}
|
||||
const int num_sockets = state.range(0);
|
||||
|
||||
for (int i = 0; i < num_sockets; ++i) {
|
||||
Socket r{}, w{};
|
||||
if (create_pair(&r, &w) != 0) {
|
||||
setup_error = "Failed to create socket pair";
|
||||
return;
|
||||
}
|
||||
sockets_r.push_back(r);
|
||||
sockets_w.push_back(w);
|
||||
if (!ev_add(ev, r, EV_READ, &tag)) {
|
||||
setup_error = "Failed to add socket to event loop";
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
BENCHMARK_DEFINE_F(EvBenchSocketsFixture, EventLoopRun)(benchmark::State &state)
|
||||
{
|
||||
if (!setup_error.empty()) {
|
||||
state.SkipWithError(setup_error.c_str());
|
||||
return;
|
||||
}
|
||||
// Sockets are already created in SetUp.
|
||||
|
||||
Ev_Result results[1];
|
||||
char buf = 'x';
|
||||
|
||||
// We trigger the last socket
|
||||
if (write_socket(sockets_w.back(), &buf, 1) != 1) {
|
||||
state.SkipWithError("Failed to write to socket");
|
||||
return;
|
||||
}
|
||||
|
||||
for (auto _ : state) {
|
||||
int32_t n = ev_run(ev, results, 1, 100);
|
||||
if (n != 1) {
|
||||
state.SkipWithError("ev_run did not return event");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
BENCHMARK_REGISTER_F(EvBenchSocketsFixture, EventLoopRun)->Range(8, 1024);
|
||||
|
||||
BENCHMARK_DEFINE_F(EvBenchSocketsFixture, EventLoopMultipleActive)(benchmark::State &state)
|
||||
{
|
||||
if (!setup_error.empty()) {
|
||||
state.SkipWithError(setup_error.c_str());
|
||||
return;
|
||||
}
|
||||
|
||||
const int num_sockets = state.range(0);
|
||||
const int num_active = state.range(1);
|
||||
|
||||
if (num_active > num_sockets) {
|
||||
state.SkipWithError("Active sockets cannot exceed total sockets");
|
||||
return;
|
||||
}
|
||||
|
||||
char buf = 'x';
|
||||
// Trigger 'num_active' sockets
|
||||
for (int i = 0; i < num_active; ++i) {
|
||||
if (write_socket(sockets_w[i], &buf, 1) != 1) {
|
||||
state.SkipWithError("Failed to write socket");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
std::vector<Ev_Result> results(num_active);
|
||||
|
||||
for (auto _ : state) {
|
||||
int32_t n = ev_run(ev, results.data(), num_active, 100);
|
||||
if (n != num_active) {
|
||||
state.SkipWithError("ev_run did not return expected number of events");
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Fix N=1024, vary M
|
||||
BENCHMARK_REGISTER_F(EvBenchSocketsFixture, EventLoopMultipleActive)
|
||||
->Args({1024, 1})
|
||||
->Args({1024, 10})
|
||||
->Args({1024, 100})
|
||||
->Args({1024, 1024});
|
||||
|
||||
} // namespace
|
||||
|
||||
BENCHMARK_MAIN();
|
||||
Reference in New Issue
Block a user