Very janky barely working coroutine version of the game, the UI is more responsive, but not as much as it should be. Still, take a look and study the coro.hpp and other files in this commit for some coroutine stuff.

master
Zed A. Shaw 3 months ago
parent 8f7235ade1
commit cacf72604f
  1. 29
      builder.cpp
  2. 3
      builder.hpp
  3. 3
      coro.hpp
  4. 3
      corotest.cpp
  5. 2
      gui.cpp
  6. 3
      meson.build

@ -2,6 +2,7 @@
#include "dbc.hpp" #include "dbc.hpp"
#include "watcher.hpp" #include "watcher.hpp"
#include "game_engine.hpp" #include "game_engine.hpp"
#include "coro.hpp"
#include <chrono> // for milliseconds #include <chrono> // for milliseconds
#include <efsw/efsw.hpp> #include <efsw/efsw.hpp>
#include <fmt/chrono.h> #include <fmt/chrono.h>
@ -16,7 +17,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> // for EXIT_SUCCESS #include <stdlib.h> // for EXIT_SUCCESS
#include <string> // for operator+, to_string #include <string> // for operator+, to_string
#include <thread> // for sleep_for
#include <unistd.h> #include <unistd.h>
#include <vector> #include <vector>
#include <nlohmann/json.hpp> #include <nlohmann/json.hpp>
@ -36,24 +36,32 @@ Builder::Builder(GUI &g, GameEngine &engine) : gui(g), game(engine) {
config["build_cmd"].template get_to<string>(build_cmd); config["build_cmd"].template get_to<string>(build_cmd);
} }
void Builder::run_build() { Task<unsigned> Builder::run_build() {
regex err_re("(.*?):([0-9]+):([0-9]+):\\s*(.*?):\\s*(.*)\n*"); regex err_re("(.*?):([0-9]+):([0-9]+):\\s*(.*?):\\s*(.*)\n*");
char buffer[BUF_MAX]; // BUF_MAX is a define already? char buffer[BUF_MAX]; // BUF_MAX is a define already?
ofstream stats_out; ofstream stats_out;
co_await Pass{};
stats_out.open("stats.csv", ios::out | ios::app); stats_out.open("stats.csv", ios::out | ios::app);
std::time_t tstamp = std::time(nullptr); std::time_t tstamp = std::time(nullptr);
dbc::check(stats_out.good(), "Error opening stats.csv file."); dbc::check(stats_out.good(), "Error opening stats.csv file.");
dbc::pre("simple test", [&]() { return stats_out.good(); }); dbc::pre("simple test", [&]() { return stats_out.good(); });
co_yield 1;
// need to catch the error message when the command is bad // need to catch the error message when the command is bad
FILE *build_out = popen(build_cmd.c_str(), "r"); FILE *build_out = popen(build_cmd.c_str(), "r");
dbc::check(build_out != nullptr, "Failed to run command."); dbc::check(build_out != nullptr, "Failed to run command.");
co_yield 2;
game.start_round(); game.start_round();
while(fgets(buffer, BUF_MAX, build_out) != nullptr) { while(fgets(buffer, BUF_MAX, build_out) != nullptr) {
co_yield 3;
string line(buffer); // yeah, that's probably a problem string line(buffer); // yeah, that's probably a problem
cerr << buffer; cerr << buffer;
@ -82,8 +90,11 @@ void Builder::run_build() {
gui.you_died(); gui.you_died();
} }
} }
co_yield 4;
} }
co_yield 3;
game.end_round(); game.end_round();
int rc = pclose(build_out); int rc = pclose(build_out);
@ -96,6 +107,8 @@ void Builder::run_build() {
stats_out.close(); stats_out.close();
dbc::post("a post test", [&]() { return !stats_out.is_open(); }); dbc::post("a post test", [&]() { return !stats_out.is_open(); });
co_return 1000;
} }
void Builder::run() { void Builder::run() {
@ -117,22 +130,28 @@ void Builder::run() {
gui.output(format("Watching directory {} for changes...", git_path)); gui.output(format("Watching directory {} for changes...", git_path));
efsw::WatchID wid = fileWatcher->addWatch(git_path, listener, true); efsw::WatchID wid = fileWatcher->addWatch(git_path, listener, true);
auto build_task = run_build();
int rc = gui.main_loop(game, [&] { int rc = gui.main_loop(game, [&] {
fileWatcher->watch(); fileWatcher->watch();
if(listener->changes) { if(listener->changes) {
gui.building(); gui.building();
std::this_thread::sleep_for(std::chrono::milliseconds(100));
gui.output(format("CHANGES! Running build {}", build_cmd)); gui.output(format("CHANGES! Running build {}", build_cmd));
run_build();
if(!build_task.done()) {
unsigned point = build_task();
} else {
if(game.is_dead()) { if(game.is_dead()) {
gui.output("!!!! YOU DIED! !!!! Learn to code luser."); gui.output("!!!! YOU DIED! !!!! Learn to code luser.");
game.reset(); game.reset()
} }
listener->reset_state(); listener->reset_state();
gui.output("^^^^^^^^^^^ END ^^^^^^^^^^^"); gui.output("^^^^^^^^^^^ END ^^^^^^^^^^^");
build_task.destroy();
build_task = run_build();
}
} }
return 0; return 0;

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "gui.hpp" #include "gui.hpp"
#include "game_engine.hpp" #include "game_engine.hpp"
#include "coro.hpp"
class Builder { class Builder {
GUI gui; GUI gui;
@ -12,7 +13,7 @@ class Builder {
Builder(GUI &g, GameEngine &engine); Builder(GUI &g, GameEngine &engine);
void run_build(); Task<unsigned> run_build();
void run(); void run();
}; };

@ -102,3 +102,6 @@ struct Task {
} }
} }
}; };
struct Pass : std::suspend_always {
};

@ -5,7 +5,7 @@
Task<unsigned> task_test() Task<unsigned> task_test()
{ {
co_await std::suspend_always{}; co_await Pass{};
for (unsigned i = 0; i < 3; ++i) for (unsigned i = 0; i < 3; ++i)
co_yield i; co_yield i;
@ -15,7 +15,6 @@ Task<unsigned> task_test()
int main() int main()
{ {
const int task_count = 4; const int task_count = 4;
vector<Task<unsigned>> tasks; vector<Task<unsigned>> tasks;

@ -55,7 +55,7 @@ int GUI::main_loop(GameEngine &game, std::function<bool()> runner) {
gui.startup(); gui.startup();
while (gui.is_open()) { while(gui.is_open()) {
bool result = runner(); bool result = runner();
gui.handle_events(); gui.handle_events();
gui.update_entities(); gui.update_entities();

@ -32,7 +32,8 @@ executable('escape_turings_tarpit',
'builder.cpp', 'builder.cpp',
'sfmlgui.cpp', 'sfmlgui.cpp',
'escape_turings_tarpit.cpp'], 'escape_turings_tarpit.cpp'],
dependencies: dependencies) dependencies: dependencies,
cpp_args: '-fcoroutines')
executable('regtest', 'regtest.cpp', executable('regtest', 'regtest.cpp',
dependencies: [fmt]) dependencies: [fmt])

Loading…
Cancel
Save