pyrite-dev/fishbowl
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: alternate syntax for threads

Browse source
This commit is contained in:
maelstrom 2026-05-28 18:04:14 +02:00
commit aa57bab764
6 changed files with 70 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
engine/include/fishbone/machdep.h
View file

@ -4,6 +4,7 @@
#include <vector>
#include <string>
#include <fstream>
#include <functional>
#include <cstdio>
#include <cstring>

6
engine/include/fishbone/thread.h
View file

@ -14,7 +14,11 @@ namespace fishbone {
Impl* impl;
public:
Thread(void (*call)(fishbone::Thread* thread, void* arg), void* arg);
using Callable = void(*)(fishbone::Thread* thread, void* arg);
using CallableFunc = std::function<void(fishbone::Thread* thread)>;
Thread(Callable call, void* arg);
Thread(CallableFunc call);
~Thread();
void join();

33
engine/src/thread/sdl2.cc
View file

@ -3,9 +3,14 @@
#include <fishbone/foundation.h>
struct call_arg {
void (*call)(fishbone::Thread* thread, void* arg);
fishbone::Thread* thread;
void* arg;
fishbone::Thread::Callable call;
fishbone::Thread* thread;
void* arg;
};
struct call_arg2 {
fishbone::Thread::CallableFunc call;
fishbone::Thread* thread;
};
static int SDLCALL thread_call(void* data) {
@ -18,11 +23,21 @@ static int SDLCALL thread_call(void* data) {
return 0;
}
static int SDLCALL thread_call2(void* data) {
struct call_arg2* arg = (struct call_arg2*)data;
arg->call(arg->thread);
delete arg;
return 0;
}
struct fishbone::Thread::Impl {
SDL_Thread* thread;
};
fishbone::Thread::Thread(void (*call)(fishbone::Thread* thread, void* arg), void* arg) {
fishbone::Thread::Thread(Callable call, void* arg) {
struct call_arg* data = new struct call_arg();
data->call = call;
@ -33,6 +48,16 @@ fishbone::Thread::Thread(void (*call)(fishbone::Thread* thread, void* arg), void
this->impl->thread = SDL_CreateThread(thread_call, "FBThread", data);
}
fishbone::Thread::Thread(CallableFunc call) {
struct call_arg2* data = new struct call_arg2();
data->call = call;
data->thread = this;
this->impl = new fishbone::Thread::Impl();
this->impl->thread = SDL_CreateThread(thread_call2, "FBThread", data);
}
fishbone::Thread::~Thread() {
this->join();
}

1
engine/tests/src/placeholder.cc
View file

@ -1 +0,0 @@
#include <catch2/catch_test_macros.hpp>

33
engine/tests/src/thread.cc Normal file
View file

@ -0,0 +1,33 @@
#include "fishbone/thread.h"
#include <catch2/catch_test_macros.hpp>
struct thread_arg {
int& a;
};
TEST_CASE("Thread") {
int a = 0;
fishbone::Thread th([&a](auto) {
for (int i = 0; i < 100; i++) {
a++;
}
});
th.join();
REQUIRE(a == 100);
a = 0;
thread_arg arg { a };
fishbone::Thread th2([](auto, void* data) {
thread_arg& arg = *static_cast<thread_arg*>(data);
for (int i = 0; i < 100; i++) {
arg.a++;
}
}, &arg);
th.join();
REQUIRE(a == 100);
}