Fixed new job index calc (#1791)

* Fixed new job index calc * Added additional index test
nasa · Sep 30, 2024 · 1bdabad · 1bdabad
1 parent ab2c5b2
commit 1bdabad
Show file tree

Hide file tree

Showing 2 changed files with 112 additions and 1 deletion.
diff --git a/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp b/trick_source/sim_services/ScheduledJobQueue/ScheduledJobQueue.cpp
@@ -92,7 +92,7 @@ int Trick::ScheduledJobQueue::push( JobData * new_job ) {
     /* Increment the size of the queue */
     list_size++ ;
 
-    int new_job_index = (insert_pt - list) / sizeof(JobData**);
+    int new_job_index = ((unsigned long)insert_pt - (unsigned long)list) / sizeof(JobData**);
     if(new_job_index < curr_index) {
         curr_index++;	
     }

diff --git a/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp b/trick_source/sim_services/ScheduledJobQueue/test/ScheduledJobQueue_test.cpp
@@ -70,6 +70,117 @@ TEST_F( ScheduledJobQueueTest , PushJobsbyJobOrder ) {
     EXPECT_TRUE( sjq.empty() ) ;
 }
 
+TEST_F( ScheduledJobQueueTest , PushJobOntoSameIndex_CurrIndex0 ) {
+
+    Trick::JobData * job_ptr ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+    EXPECT_TRUE( sjq.empty() ) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
+    job_ptr->sim_object_id = 4 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)1) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)0) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
+    job_ptr->sim_object_id = 3 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)2) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)0) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
+    job_ptr->sim_object_id = 2 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)3) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)0) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
+    job_ptr->sim_object_id = 1 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)0) ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_1") ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+
+    sjq.clear() ;
+    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+    EXPECT_TRUE( sjq.empty() ) ;
+}
+
+TEST_F( ScheduledJobQueueTest , PushJobOntoSameIndex_CurrIndex1 ) {
+
+    Trick::JobData * job_ptr ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+    EXPECT_TRUE( sjq.empty() ) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_1") ;
+    job_ptr->sim_object_id = 1 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    sjq.get_next_job() ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)1) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)1) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_4") ;
+    job_ptr->sim_object_id = 4 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)2) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)1) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_3") ;
+    job_ptr->sim_object_id = 3 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)3) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)1) ;
+
+    job_ptr = new Trick::JobData(0, 2 , "class_100", NULL, 1.0 , "job_2") ;
+    job_ptr->sim_object_id = 2 ;
+    job_ptr->job_class = 100 ;
+    sjq.push(job_ptr) ;
+
+    EXPECT_EQ( sjq.size() , (unsigned int)4) ;
+    EXPECT_EQ( sjq.get_curr_index() , (unsigned int)1) ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_2") ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_3") ;
+
+    job_ptr = sjq.get_next_job() ;
+    EXPECT_STREQ( job_ptr->name.c_str() , "job_4") ;
+
+    sjq.clear() ;
+    EXPECT_EQ( sjq.size() , (unsigned int)0) ;
+    EXPECT_TRUE( sjq.empty() ) ;
+}
+
 TEST_F( ScheduledJobQueueTest , PushJobsbySimObjectOrder ) {
 	//req.add_requirement("512154259");