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

Updates EventManager job loops

develop
Josh Cooper 2021-08-06 08:32:37 -07:00 committed by Myk
parent 07ffa0b8da
commit c550a6caf0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/modules/EventManager.cpp
Unescape Escape View File

@ -410,7 +410,7 @@ static void manageJobInitiatedEvent(color_ostream& out) {
auto &handler = iter.second; auto &handler = iter.second;
if (tick - eventLastTick[handler.eventHandler] >= handler.freq) { if (tick - eventLastTick[handler.eventHandler] >= handler.freq) {
eventLastTick[handler.eventHandler] = tick; eventLastTick[handler.eventHandler] = tick;
for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { for ( df::job_list_link* link = df::global::world->jobs.list.next; link != NULL; link = link->next ) {
if ( link->item == NULL ) if ( link->item == NULL )
continue; continue;
if ( link->item->id <= lastJobId ) if ( link->item->id <= lastJobId )
@ -436,7 +436,7 @@ static void manageJobStartedEvent(color_ostream& out){
for(auto &iter : copy) { //iterate handlers for(auto &iter : copy) { //iterate handlers
auto &handler = iter.second; auto &handler = iter.second;
// build a list of newly started jobs // build a list of newly started jobs
for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { for ( df::job_list_link* link = df::global::world->jobs.list.next; link != NULL; link = link->next ) {
df::job* job = link->item; df::job* job = link->item;
if (job && Job::getWorker(job)) { if (job && Job::getWorker(job)) {
if (startedJobs.emplace(job).second) { if (startedJobs.emplace(job).second) {
@ -469,7 +469,7 @@ static void manageJobCompletedEvent(color_ostream& out) {
multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_COMPLETED].begin(), handlers[EventType::JOB_COMPLETED].end()); multimap<Plugin*,EventHandler> copy(handlers[EventType::JOB_COMPLETED].begin(), handlers[EventType::JOB_COMPLETED].end());
map<int32_t, df::job*> nowJobs; map<int32_t, df::job*> nowJobs;
for ( df::job_list_link* link = &df::global::world->jobs.list; link != NULL; link = link->next ) { for ( df::job_list_link* link = df::global::world->jobs.list.next; link != NULL; link = link->next ) {
if ( link->item == NULL ) if ( link->item == NULL )
continue; continue;
nowJobs[link->item->id] = link->item; nowJobs[link->item->id] = link->item;