Overhaul of thread handling to support blocking functions other than wait

This commit is contained in:
2022-04-25 17:17:41 -04:00
parent bd389c7815
commit 9aec7c5299
15 changed files with 144 additions and 88 deletions

View File

@@ -20,11 +20,13 @@ using ClientVector = eng::vector<UniqueClient>;
class LpxServer : public DrivenEngine {
public:
using StringVec = LuaConsole::StringVec;
UniqueWorld master_;
LuaConsole console_;
ClientVector clients_;
PrintChanneler print_channeler_;
int64_t admin_id_;
Gui gui_;
public:
virtual void event_init(int argc, char *argv[]) {
@@ -61,6 +63,22 @@ public:
stdostream() << "Syntax Error: " << words[1] << std::endl;
}
void do_menu_command(const StringVec &cmd) {
int64_t place = sv::to_int64(cmd[1], admin_id_);
master_->update_gui(admin_id_, place, &gui_);
stdostream() << gui_.menu_debug_string();
}
void do_choose_command(const StringVec &cmd) {
eng::string action = gui_.get_action(sv::to_int64(cmd[1]));
if (action == "") {
stdostream() << "Invalid menu item #" << std::endl;
return;
}
stdostream() << "Invoking plan: " << action << std::endl;
master_->invoke(Invocation(Invocation::KIND_PLAN, admin_id_, gui_.place(), action));
}
void do_tick_command(const util::StringVec &words) {
master_->invoke(Invocation(Invocation::KIND_TICK, admin_id_, admin_id_, ""));
}
@@ -78,6 +96,8 @@ public:
else if (words[0] == "luainvoke") do_luainvoke_command(words);
else if (words[0] == "luaprobe") do_luaprobe_command(words);
else if (words[0] == "syntax") do_syntax_command(words);
else if (words[0] == "menu") do_menu_command(words);
else if (words[0] == "choose") do_choose_command(words);
else if (words[0] == "tick") do_tick_command(words);
else if (words[0] == "cpl") do_cpl_command(words);
else if (words[0] == "quit") do_quit_command(words);