Skip to content

Commit 15f6cc3

Browse files
iphydfiphydf
committed
refactor: Move some OS-specifics into tox_system.
1 parent d408c98 commit 15f6cc3

File tree

149 files changed

+3417
-1516
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+3417
-1516
lines changed

‎BUILD.bazel‎

Lines changed: 53 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,76 @@ load("//tools/project:build_defs.bzl", "project")
33

44
project(license = "gpl3-https")
55

6+
genrule(
7+
name = "toxcore_headers",
8+
srcs = ["//c-toxcore/toxcore:public"],
9+
outs = [
10+
"tox/toxcore/os_log.h",
11+
"tox/toxcore/os_memory.h",
12+
"tox/toxcore/os_network.h",
13+
"tox/toxcore/os_random.h",
14+
"tox/toxcore/os_system.h",
15+
"tox/toxcore/tox.h",
16+
"tox/toxcore/tox_attributes.h",
17+
"tox/toxcore/tox_dispatch.h",
18+
"tox/toxcore/tox_events.h",
19+
"tox/toxcore/tox_log.h",
20+
"tox/toxcore/tox_log_impl.h",
21+
"tox/toxcore/tox_log_level.h",
22+
"tox/toxcore/tox_memory.h",
23+
"tox/toxcore/tox_memory_impl.h",
24+
"tox/toxcore/tox_network.h",
25+
"tox/toxcore/tox_network_impl.h",
26+
"tox/toxcore/tox_options.h",
27+
"tox/toxcore/tox_random.h",
28+
"tox/toxcore/tox_random_impl.h",
29+
"tox/toxcore/tox_system.h",
30+
"tox/toxcore/tox_system_impl.h",
31+
"tox/toxcore/tox_time.h",
32+
"tox/toxcore/tox_time_impl.h",
33+
],
34+
cmd = "cp $(locations //c-toxcore/toxcore:public) $(GENDIR)/c-toxcore/tox/toxcore/",
35+
visibility = ["//visibility:public"],
36+
)
37+
638
genrule(
739
name = "public_headers",
840
srcs = [
41+
"tox.h",
42+
"toxav.h",
43+
"toxencryptsave.h",
944
"//c-toxcore/toxav:toxav.h",
10-
"//c-toxcore/toxcore:tox.h",
11-
"//c-toxcore/toxcore:tox_dispatch.h",
12-
"//c-toxcore/toxcore:tox_events.h",
13-
"//c-toxcore/toxcore:tox_options.h",
14-
"//c-toxcore/toxcore:tox_private.h",
15-
"//c-toxcore/toxcore:tox_types.h",
1645
"//c-toxcore/toxencryptsave:toxencryptsave.h",
1746
],
1847
outs = [
19-
"tox/toxav.h",
2048
"tox/tox.h",
21-
"tox/tox_dispatch.h",
22-
"tox/tox_events.h",
23-
"tox/tox_options.h",
24-
"tox/tox_private.h",
25-
"tox/tox_types.h",
49+
"tox/toxav.h",
50+
"tox/toxav/toxav.h",
2651
"tox/toxencryptsave.h",
52+
"tox/toxencryptsave/toxencryptsave.h",
2753
],
2854
cmd = """
29-
cp $(location //c-toxcore/toxav:toxav.h) $(GENDIR)/c-toxcore/tox/toxav.h
30-
cp $(location //c-toxcore/toxcore:tox.h) $(GENDIR)/c-toxcore/tox/tox.h
31-
cp $(location //c-toxcore/toxcore:tox_dispatch.h) $(GENDIR)/c-toxcore/tox/tox_dispatch.h
32-
cp $(location //c-toxcore/toxcore:tox_events.h) $(GENDIR)/c-toxcore/tox/tox_events.h
33-
cp $(location //c-toxcore/toxcore:tox_options.h) $(GENDIR)/c-toxcore/tox/tox_options.h
34-
cp $(location //c-toxcore/toxcore:tox_private.h) $(GENDIR)/c-toxcore/tox/tox_private.h
35-
cp $(location //c-toxcore/toxcore:tox_types.h) $(GENDIR)/c-toxcore/tox/tox_types.h
36-
cp $(location //c-toxcore/toxencryptsave:toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave.h
55+
cp $(location toxav.h) $(GENDIR)/c-toxcore/tox/toxav.h
56+
cp $(location tox.h) $(GENDIR)/c-toxcore/tox/tox.h
57+
cp $(location toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave.h
58+
cp $(location //c-toxcore/toxav:toxav.h) $(GENDIR)/c-toxcore/tox/toxav/toxav.h
59+
cp $(location //c-toxcore/toxencryptsave:toxencryptsave.h) $(GENDIR)/c-toxcore/tox/toxencryptsave/toxencryptsave.h
3760
""",
3861
visibility = ["//visibility:public"],
3962
)
4063

64+
filegroup(
65+
name = "public",
66+
srcs = [
67+
":public_headers",
68+
":toxcore_headers",
69+
],
70+
visibility = ["//visibility:public"],
71+
)
72+
4173
cc_library(
4274
name = "c-toxcore",
43-
hdrs = [":public_headers"],
75+
hdrs = [":public"],
4476
includes = ["."],
4577
visibility = ["//visibility:public"],
4678
deps = [

‎CMakeLists.txt‎

Lines changed: 56 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ endif()
3030
set_source_files_properties(
3131
toxcore/mono_time.c
3232
toxcore/network.c
33+
toxcore/os_network.c
34+
toxcore/os_time.c
3335
toxcore/tox.c
3436
toxcore/util.c
3537
PROPERTIES SKIP_UNITY_BUILD_INCLUSION TRUE)
@@ -319,6 +321,19 @@ set(toxcore_SOURCES
319321
toxcore/onion_client.c
320322
toxcore/onion_client.h
321323
toxcore/onion.h
324+
toxcore/os_log.c
325+
toxcore/os_log.h
326+
toxcore/os_memory.c
327+
toxcore/os_memory.h
328+
toxcore/os_network.c
329+
toxcore/os_network.h
330+
toxcore/os_network_impl.h
331+
toxcore/os_random.c
332+
toxcore/os_random.h
333+
toxcore/os_system.c
334+
toxcore/os_system.h
335+
toxcore/os_time.c
336+
toxcore/os_time.h
322337
toxcore/ping_array.c
323338
toxcore/ping_array.h
324339
toxcore/ping.c
@@ -341,21 +356,39 @@ set(toxcore_SOURCES
341356
toxcore/timed_auth.h
342357
toxcore/tox_api.c
343358
toxcore/tox.c
359+
toxcore/tox.h
344360
toxcore/tox_dispatch.c
345361
toxcore/tox_dispatch.h
346362
toxcore/tox_event.c
347363
toxcore/tox_event.h
348364
toxcore/tox_events.c
349365
toxcore/tox_events.h
350-
toxcore/tox.h
366+
toxcore/tox_log.c
367+
toxcore/tox_log.h
368+
toxcore/tox_log_impl.h
369+
toxcore/tox_log_level.c
370+
toxcore/tox_log_level.h
371+
toxcore/tox_memory.c
372+
toxcore/tox_memory.h
373+
toxcore/tox_memory_impl.h
374+
toxcore/tox_network.c
375+
toxcore/tox_network.h
376+
toxcore/tox_network_impl.h
351377
toxcore/tox_options.c
352378
toxcore/tox_options.h
379+
toxcore/tox_random.c
380+
toxcore/tox_random.h
381+
toxcore/tox_random_impl.h
382+
toxcore/tox_system.c
383+
toxcore/tox_system.h
384+
toxcore/tox_system_impl.h
385+
toxcore/tox_time.c
386+
toxcore/tox_time.h
387+
toxcore/tox_time_impl.h
353388
toxcore/tox_private.c
354389
toxcore/tox_private.h
355390
toxcore/tox_pack.c
356391
toxcore/tox_pack.h
357-
toxcore/tox_types.c
358-
toxcore/tox_types.h
359392
toxcore/tox_unpack.c
360393
toxcore/tox_unpack.h
361394
toxcore/util.c
@@ -372,14 +405,27 @@ else()
372405
endif()
373406
set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
374407
set(toxcore_API_HEADERS
408+
${toxcore_SOURCE_DIR}/tox.h^tox
375409
${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
376-
${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
377-
${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
378-
${toxcore_SOURCE_DIR}/toxcore/tox_options.h^tox
379-
${toxcore_SOURCE_DIR}/toxcore/tox_types.h^tox)
410+
${toxcore_SOURCE_DIR}/toxcore/tox_log_level.h^tox
411+
${toxcore_SOURCE_DIR}/toxcore/tox_options.h^tox)
380412
if(EXPERIMENTAL_API)
381413
set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
382-
${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)
414+
${toxcore_SOURCE_DIR}/toxcore/os_log.h^os
415+
${toxcore_SOURCE_DIR}/toxcore/os_memory.h^os
416+
${toxcore_SOURCE_DIR}/toxcore/os_network.h^os
417+
${toxcore_SOURCE_DIR}/toxcore/os_random.h^os
418+
${toxcore_SOURCE_DIR}/toxcore/os_system.h^os
419+
${toxcore_SOURCE_DIR}/toxcore/tox_attributes.h^tox
420+
${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
421+
${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
422+
${toxcore_SOURCE_DIR}/toxcore/tox_log.h^tox
423+
${toxcore_SOURCE_DIR}/toxcore/tox_memory.h^tox
424+
${toxcore_SOURCE_DIR}/toxcore/tox_network.h^tox
425+
${toxcore_SOURCE_DIR}/toxcore/tox_random.h^tox
426+
${toxcore_SOURCE_DIR}/toxcore/tox_system.h^tox
427+
${toxcore_SOURCE_DIR}/toxcore/tox_system_impl.h^tox
428+
${toxcore_SOURCE_DIR}/toxcore/tox_time.h^tox)
383429
endif()
384430

385431
################################################################################
@@ -409,6 +455,7 @@ if(BUILD_TOXAV)
409455
toxav/video.c
410456
toxav/video.h)
411457
set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
458+
${toxcore_SOURCE_DIR}/toxav.h^toxav
412459
${toxcore_SOURCE_DIR}/toxav/toxav.h^toxav)
413460

414461
if(TARGET Opus::opus AND TARGET libvpx::libvpx)
@@ -434,6 +481,7 @@ set(toxcore_SOURCES ${toxcore_SOURCES}
434481
toxencryptsave/toxencryptsave.c
435482
toxencryptsave/toxencryptsave.h)
436483
set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
484+
${toxcore_SOURCE_DIR}/toxencryptsave.h^tox
437485
${toxcore_SOURCE_DIR}/toxencryptsave/toxencryptsave.h^tox)
438486

439487
################################################################################

‎auto_tests/BUILD.bazel‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ cc_library(
1919
"//c-toxcore/toxcore:tox",
2020
"//c-toxcore/toxcore:tox_dispatch",
2121
"//c-toxcore/toxcore:tox_events",
22+
"//c-toxcore/toxcore:tox_time",
2223
],
2324
)
2425

@@ -75,10 +76,14 @@ extra_data = {
7576
"//c-toxcore/toxcore:onion",
7677
"//c-toxcore/toxcore:onion_announce",
7778
"//c-toxcore/toxcore:onion_client",
79+
"//c-toxcore/toxcore:os_memory",
80+
"//c-toxcore/toxcore:os_network",
81+
"//c-toxcore/toxcore:os_random",
7882
"//c-toxcore/toxcore:tox",
7983
"//c-toxcore/toxcore:tox_dispatch",
8084
"//c-toxcore/toxcore:tox_events",
8185
"//c-toxcore/toxcore:tox_unpack",
86+
"//c-toxcore/toxcore:tox_time",
8287
"//c-toxcore/toxcore:util",
8388
"//c-toxcore/toxencryptsave",
8489
"@libsodium",

‎auto_tests/TCP_test.c‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
#include "../toxcore/TCP_server.h"
99
#include "../toxcore/crypto_core.h"
1010
#include "../toxcore/mono_time.h"
11-
#include "../toxcore/network.h"
11+
#include "../toxcore/os_random.h"
12+
#include "../toxcore/os_network.h"
13+
#include "../toxcore/os_memory.h"
1214
#include "auto_test_support.h"
1315

1416
#define NUM_PORTS 3
@@ -52,7 +54,7 @@ static void test_basic(void)
5254
const Memory *mem = os_memory();
5355
ck_assert(mem != nullptr);
5456

55-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
57+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
5658
Logger *logger = logger_new(mem);
5759
logger_callback_log(logger, print_debug_logger, nullptr, nullptr);
5860

@@ -319,7 +321,7 @@ static void test_some(void)
319321
const Memory *mem = os_memory();
320322
ck_assert(mem != nullptr);
321323

322-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
324+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
323325
Logger *logger = logger_new(mem);
324326

325327
uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
@@ -518,7 +520,7 @@ static void test_client(void)
518520
ck_assert(mem != nullptr);
519521

520522
Logger *logger = logger_new(mem);
521-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
523+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
522524

523525
uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
524526
uint8_t self_secret_key[CRYPTO_SECRET_KEY_SIZE];
@@ -655,7 +657,7 @@ static void test_client_invalid(void)
655657
const Memory *mem = os_memory();
656658
ck_assert(mem != nullptr);
657659

658-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
660+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
659661
Logger *logger = logger_new(mem);
660662

661663
uint8_t self_public_key[CRYPTO_PUBLIC_KEY_SIZE];
@@ -734,7 +736,7 @@ static void test_tcp_connection(void)
734736
const Memory *mem = os_memory();
735737
ck_assert(mem != nullptr);
736738

737-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
739+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
738740
Logger *logger = logger_new(mem);
739741

740742
tcp_data_callback_called = 0;
@@ -849,7 +851,7 @@ static void test_tcp_connection2(void)
849851
const Memory *mem = os_memory();
850852
ck_assert(mem != nullptr);
851853

852-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
854+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
853855
Logger *logger = logger_new(mem);
854856

855857
tcp_oobdata_callback_called = 0;

‎auto_tests/announce_test.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#include "../toxcore/mono_time.h"
88
#include "../toxcore/forwarding.h"
99
#include "../toxcore/net_crypto.h"
10+
#include "../toxcore/os_memory.h"
11+
#include "../toxcore/os_network.h"
12+
#include "../toxcore/os_random.h"
1013
#include "../toxcore/util.h"
1114
#include "auto_test_support.h"
1215
#include "check_compat.h"
@@ -60,7 +63,7 @@ static void test_store_data(void)
6063
Logger *log = logger_new(mem);
6164
ck_assert(log != nullptr);
6265
logger_callback_log(log, print_debug_logger, nullptr, nullptr);
63-
Mono_Time *mono_time = mono_time_new(mem, nullptr, nullptr);
66+
Mono_Time *mono_time = mono_time_new(mem, nullptr);
6467
ck_assert(mono_time != nullptr);
6568
Networking_Core *net = new_networking_no_udp(log, mem, ns);
6669
ck_assert(net != nullptr);

‎auto_tests/auto_test_support.c‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
#include "check_compat.h"
55
#include "../testing/misc_tools.h"
6-
#include "../toxcore/Messenger.h"
76
#include "../toxcore/mono_time.h"
87
#include "../toxcore/tox_dispatch.h"
98
#include "../toxcore/tox_events.h"
10-
#include "../toxcore/tox_struct.h"
9+
#include "../toxcore/tox_impl.h" // IWYU pragma: keep
10+
#include "../toxcore/tox_time_impl.h" // IWYU pragma: keep
1111

1212
#include "auto_test_support.h"
1313

@@ -157,17 +157,25 @@ static uint64_t get_state_clock_callback(void *user_data)
157157
return *clock;
158158
}
159159

160+
static const Tox_Time_Funcs autotox_time_funcs = {
161+
get_state_clock_callback,
162+
};
163+
160164
void set_mono_time_callback(AutoTox *autotox)
161165
{
162166
ck_assert(autotox != nullptr);
163167

168+
if (autotox->tm == nullptr) {
169+
autotox->tm = tox_time_new(&autotox_time_funcs, &autotox->clock, autotox->tox->sys.mem);
170+
}
171+
164172
Mono_Time *mono_time = autotox->tox->mono_time;
165173

174+
mono_time_set_current_time_callback(mono_time, nullptr); // set to default first
166175
autotox->clock = current_time_monotonic(mono_time);
167176
ck_assert_msg(autotox->clock >= 1000,
168177
"clock is too low (not initialised?): %lu", (unsigned long)autotox->clock);
169-
mono_time_set_current_time_callback(mono_time, nullptr, nullptr); // set to default first
170-
mono_time_set_current_time_callback(mono_time, get_state_clock_callback, &autotox->clock);
178+
mono_time_set_current_time_callback(mono_time, autotox->tm);
171179
}
172180

173181
void save_autotox(AutoTox *autotox)
@@ -194,6 +202,8 @@ void kill_autotox(AutoTox *autotox)
194202
autotox->alive = false;
195203
tox_dispatch_free(autotox->dispatch);
196204
tox_kill(autotox->tox);
205+
tox_time_free(autotox->tm);
206+
autotox->tm = nullptr;
197207
}
198208

199209
void reload(AutoTox *autotox)
@@ -399,6 +409,7 @@ void run_auto_test(struct Tox_Options *options, uint32_t tox_count, autotox_test
399409
for (uint32_t i = 0; i < tox_count; ++i) {
400410
tox_dispatch_free(autotoxes[i].dispatch);
401411
tox_kill(autotoxes[i].tox);
412+
tox_time_free(autotoxes[i].tm);
402413
free(autotoxes[i].state);
403414
free(autotoxes[i].save_state);
404415
}

‎auto_tests/auto_test_support.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
typedef struct AutoTox {
1313
Tox *tox;
1414
Tox_Dispatch *dispatch;
15+
Tox_Time *tm;
1516

1617
uint32_t index;
1718
uint64_t clock;

0 commit comments

Comments
 (0)