Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Speed up Trick::ScheduledJobQueue::push #1694

Merged
merged 6 commits into from
Jul 23, 2024
Merged

Speed up Trick::ScheduledJobQueue::push #1694

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
307e7f7
Speed up Trick::ScheduledJobQueue::push
iamthad Apr 16, 2024
1e65bef
Make comparator a static function
iamthad Apr 16, 2024
60e1789
Use upper_bound instead
iamthad Apr 16, 2024
dfb82b7
Use explicit types
iamthad Apr 16, 2024
a0e87a2
Update comment
iamthad Apr 19, 2024
9985458
Fix formatting
iamthad Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
98 changes: 37 additions & 61 deletions trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@

#include <algorithm>
#include <iostream>
#include <sstream>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>

#include "trick/ScheduledJobQueue.hh"
#include "trick/ScheduledJobQueueInstrument.hh"
Expand Down Expand Up @@ -34,6 +35,30 @@ Trick::ScheduledJobQueue::~ScheduledJobQueue( ) {
}
}

struct JobDataCompare {
bool operator()(const Trick::JobData *a, const Trick::JobData *b) {
{
auto ajc = a->job_class;
auto bjc = b->job_class;
if (ajc < bjc) return true;
if (ajc > bjc) return false;
}
{
auto ap = a->phase;
auto bp = b->phase;
if (ap < bp) return true;
if (ap > bp) return false;
}
{
auto asoi = a->sim_object_id;
auto bsoi = b->sim_object_id;
if (asoi < bsoi) return true;
if (asoi > bsoi) return false;
}
return a->id < b->id;
}
};

/**
@design
-# Allocate additional memory for the incoming job
Expand All @@ -46,72 +71,24 @@ Trick::ScheduledJobQueue::~ScheduledJobQueue( ) {
*/
int Trick::ScheduledJobQueue::push( JobData * new_job ) {

unsigned int ii , jj ;

/* Allocate additional memory for the additional job in the queue */
JobData ** new_list = (JobData **)calloc( list_size + 1 , sizeof(JobData *)) ;

new_job->set_handled(true) ;

/* Find the correct insertion spot in the queue by comparing
the job_class, the phase, the sim_object id, and the job_id in that order. */
/* While searching for the correct insertion spot, copy all jobs that precede
the incoming job to the newly allocated queue space. */
for ( ii = jj = 0 ; ii < list_size ; ii++ ) {
if ( list[ii]->job_class == new_job->job_class ) {
if ( list[ii]->phase == new_job->phase ) {
if ( list[ii]->sim_object_id == new_job->sim_object_id ) {
if ( list[ii]->id <= new_job->id ) {
new_list[jj++] = list[ii] ;
} else {
new_list[jj++] = new_job ;
break ;
}
} else if ( list[ii]->sim_object_id < new_job->sim_object_id ) {
new_list[jj++] = list[ii] ;
} else {
new_list[jj++] = new_job ;
break ;
}
} else if ( list[ii]->phase < new_job->phase ) {
new_list[jj++] = list[ii] ;
} else {
new_list[jj++] = new_job ;
break ;
}
} else if ( list[ii]->job_class < new_job->job_class ) {
new_list[jj++] = list[ii] ;
} else {
new_list[jj++] = new_job ;
break ;
}
JobData ** new_list = (JobData **)realloc(list, (list_size + 1) * sizeof(JobData *)) ;
if (!new_list) {
abort();
}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be replaced with some other logic, but the old code wasn't handling allocation failure at all.


/* Copy remaining jobs that execute after the incoming job to the new queue space. */
if ( ii == list_size ) {
/* ii == list_size means the incoming job is the last job */
new_list[list_size] = new_job ;
} else {
/* Inserted new job before the current job. Increment curr_index to point to the correct job */
if ( ii < curr_index ) {
curr_index++ ;
}
for ( ; ii < list_size ; ii++ ) {
new_list[jj++] = list[ii] ;
}
list = new_list;
JobData** list_end = list + list_size;
JobData** insert_pt = std::lower_bound(list, list_end, new_job, JobDataCompare());
if (insert_pt != list_end) {
memmove(insert_pt + 1, insert_pt, (list_end - insert_pt) * sizeof(JobData*));
}
*insert_pt = new_job;

new_job->set_handled(true) ;

/* Increment the size of the queue */
list_size++ ;

/* Free the old queue space */
if ( list ) {
free(list) ;
}

/* Assign the queue pointer to the new space */
list = new_list ;

return(0) ;

}
Expand Down Expand Up @@ -534,4 +511,3 @@ int Trick::ScheduledJobQueue::instrument_remove(std::string job_name) {

return 0 ;
}