MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kittens: fix compiling on Windows thanks to @ragundo

develop
lethosor 2019-06-01 17:30:26 -04:00
parent c8bb0048f8
commit f668914db8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/devel/kittens.cpp
Unescape Escape View File

@ -1,3 +1,4 @@
#include <array>
#include <atomic> #include <atomic>
#include <vector> #include <vector>
#include <random> #include <random>
@ -20,6 +21,11 @@
#include "df/creature_raw.h" #include "df/creature_raw.h"
#include "df/world.h" #include "df/world.h"
// for MSVC alignas(64) issues
#ifdef WIN32
#define _DISABLE_EXTENDED_ALIGNED_STORAGE
#endif
using std::vector; using std::vector;
using std::string; using std::string;
using namespace DFHack; using namespace DFHack;
@ -220,7 +226,7 @@ struct ClearMem : public ConnectedBase {
}; };
struct Connected : public ClearMem<Connected> { struct Connected : public ClearMem<Connected> {
using Sig = Signal<void(int), signal_shared_tag>; using Sig = Signal<void(uint32_t), signal_shared_tag>;
std::array<Sig::Connection,4> con; std::array<Sig::Connection,4> con;
Sig signal; Sig signal;
weak other; weak other;
@ -245,7 +251,7 @@ struct Connected : public ClearMem<Connected> {
// Externally synchronized object destruction is only safe to this // Externally synchronized object destruction is only safe to this
// connect. // connect.
con[pos] = b->signal.connect( con[pos] = b->signal.connect(
[this](int) { [this](uint32_t) {
uint32_t old = callee.fetch_add(1); uint32_t old = callee.fetch_add(1);
assert(old != 0xDEDEDEDE); assert(old != 0xDEDEDEDE);
std::this_thread::sleep_for(delay); std::this_thread::sleep_for(delay);
@ -272,7 +278,7 @@ struct Connected : public ClearMem<Connected> {
if (!sig) if (!sig)
return; return;
con[pos] = sig->connect(b, con[pos] = sig->connect(b,
[this](int) { [this](uint32_t) {
uint32_t old = callee.fetch_add(1); uint32_t old = callee.fetch_add(1);
assert(old != 0xDEDEDEDE); assert(old != 0xDEDEDEDE);
std::this_thread::sleep_for(delay); std::this_thread::sleep_for(delay);
@ -284,7 +290,7 @@ struct Connected : public ClearMem<Connected> {
out = &o; out = &o;
count = c; count = c;
con[pos] = b->signal.connect(a, con[pos] = b->signal.connect(a,
[this](int) { [this](uint32_t) {
uint32_t old = callee.fetch_add(1); uint32_t old = callee.fetch_add(1);
assert(old != 0xDEDEDEDE); assert(old != 0xDEDEDEDE);
std::this_thread::sleep_for(delay); std::this_thread::sleep_for(delay);
@ -345,13 +351,13 @@ command_result sharedsignal (color_ostream &out, vector <string> & parameters)
TRACE(command, out) << "Thread " << c->id << " started." << std::endl; TRACE(command, out) << "Thread " << c->id << " started." << std::endl;
weak ref = c; weak ref = c;
for (;c->caller < c->count; ++c->caller) { for (;c->caller < c->count; ++c->caller) {
c->signal(c->caller); c->signal(std::move(c->caller));
} }
TRACE(command, out) << "Thread " << c->id << " resets shared." << std::endl; TRACE(command, out) << "Thread " << c->id << " resets shared." << std::endl;
c.reset(); c.reset();
while((c = ref.lock())) { while((c = ref.lock())) {
++c->caller; ++c->caller;
c->signal(c->caller); c->signal(std::move(c->caller));
c.reset(); c.reset();
std::this_thread::sleep_for(delay*25); std::this_thread::sleep_for(delay*25);
} }
@ -363,7 +369,7 @@ command_result sharedsignal (color_ostream &out, vector <string> & parameters)
} }
TRACE(command, out) << "running " << std::endl; TRACE(command, out) << "running " << std::endl;
for (;external->caller < external->count; ++external->caller) { for (;external->caller < external->count; ++external->caller) {
external->signal(external->caller); external->signal(std::move(external->caller));
external->reconnect(1); external->reconnect(1);
} }
TRACE(command, out) << "join " << std::endl; TRACE(command, out) << "join " << std::endl;