Merge branch '1764-Brittle-Step_Executive-Implementation' into 1764-B…

…rittle-Step

CMakeLists.txt

@@ -146,7 +146,6 @@ set( IO_SRC
   ${CMAKE_BINARY_DIR}/temp_src/io_src/io_DRHDF5.cpp
   ${CMAKE_BINARY_DIR}/temp_src/io_src/io_DataRecordDispatcher.cpp
   ${CMAKE_BINARY_DIR}/temp_src/io_src/io_DataRecordGroup.cpp
-  ${CMAKE_BINARY_DIR}/temp_src/io_src/io_DebugPause.cpp
   ${CMAKE_BINARY_DIR}/temp_src/io_src/io_EchoJobs.cpp
   ${CMAKE_BINARY_DIR}/temp_src/io_src/io_EnumAttributesMap.cpp
   ${CMAKE_BINARY_DIR}/temp_src/io_src/io_Environment.cpp

Makefile

@@ -28,7 +28,6 @@ SIM_SERV_DIRS = \
 	${TRICK_HOME}/trick_source/sim_services/Collect \
 	${TRICK_HOME}/trick_source/sim_services/CommandLineArguments \
 	${TRICK_HOME}/trick_source/sim_services/DataRecord \
-	${TRICK_HOME}/trick_source/sim_services/DebugPause \
 	${TRICK_HOME}/trick_source/sim_services/EchoJobs \
 	${TRICK_HOME}/trick_source/sim_services/Environment \
 	${TRICK_HOME}/trick_source/sim_services/EventManager \

include/trick/Executive.hh

@@ -47,6 +47,9 @@ namespace Trick {
             /** gets #except_return */
             virtual int get_except_return() const;
 
+            /** Set to true to pause before every job call during sim execution.\n */
+            bool debug_pause_flag ;               /**< trick_units(--) */
+
         protected:
             /** Attempts to attach a debugger in the event a signal shuts down the simulation.\n */
             bool attach_debugger;            /**< trick_units(--) */
@@ -174,6 +177,12 @@ namespace Trick {
             /** Next scheduled jobs call time.\n */
             long long job_call_time_tics;   /**< trick_units(--) */
 
+            /** Semaphore used to control pausing.\n */
+            sem_t * debug_sem ;                   /**< trick_io(**) trick_units(--) */
+
+            /** Semaphore name for debug_sem.\n */
+            std::string debug_sem_name ;                /**< trick_io(**) trick_units(--) */
+
             /** stream to record elapsed time of default_data, 
                 input_processor, and initialization queues \n */
             std::ofstream init_log_stream; /**< trick_units(--) */
@@ -1338,6 +1347,34 @@ namespace Trick {
              @return always 0
             */
             virtual int exec_terminate(const char *file_name, const char *error);
+
+            /**
+             @brief Instrumentation class job that pauses before each job when debug_pause is on.
+             Waits on a semapahore before execution continues.
+             @param curr_job - pointer to current instrument job that points to the job to pause at
+             @return always 0
+             */
+            int debug_pause(Trick::JobData * curr_job) ;
+
+            /**
+             @brief Command to post the semaphore so that execution continues after pause.
+             @return always 0
+             */
+            int debug_signal() ;
+
+            /**
+             @brief Command to set debug_pause_flag to true which turns on the debug pausing.
+             Calls Trick::Executive::instrument_job_before to insert the debug_pause routine before every job to pause at.
+             @return always 0
+             */
+            int debug_pause_on() ;
+
+            /**
+             @brief Command to set debug_pause_flag to false which turns off the debug pausing.
+             Calls Trick::Executive::instrument_job_remove to remove the debug_pause routine from all job queues that it was inserted in.
+             @return always 0
+             */
+            int debug_pause_off() ;
 
             /* deleted functions  */
       private:

include/trick/exec_proto.h

@@ -90,6 +90,10 @@ extern "C" {
     int exec_add_scheduled_job_class(const char * in_name) ;
     int exec_add_depends_on_job( const char * target_job_string , unsigned int t_instance , const char * depend_job_string , unsigned int d_instance ) ;
 
+    int debug_pause_on(void) ;
+    int debug_pause_off(void) ;
+    int debug_signal(void) ;
+
 #ifdef __cplusplus
 }
 #endif

include/trick/files_to_ICG.hh

@@ -81,7 +81,6 @@
 #include "trick/DRAscii.hh"
 #include "trick/DRBinary.hh"
 #include "trick/DRHDF5.hh"
-#include "trick/DebugPause.hh"
 #include "trick/EchoJobs.hh"
 #include "trick/FrameLog.hh"
 #include "trick/UnitTest.hh"

share/trick/sim_objects/default_trick_sys.sm

@@ -72,7 +72,6 @@ a replacement SimObject will create an uncompilable sim.
 ##include "trick/JSONVariableServer.hh"
 ##include "trick/data_record_proto.h"
 ##include "trick/DataRecordDispatcher.hh"
-##include "trick/DebugPause.hh"
 ##include "trick/EchoJobs.hh"
 ##include "trick/FrameLog.hh"
 ##include "trick/UnitTest.hh"
@@ -157,6 +156,8 @@ class SysSimObject : public Trick::SimObject {
             {TRK} ("system_advance_sim_time") sched.advance_sim_time() ;
 
             {TRK} ("system_thread_sync") sched.thread_sync() ;
+
+            {TRK} ("instrumentation") sched.debug_pause(curr_job) ;
         }
 
     private:
@@ -665,12 +666,10 @@ class InstrumentationSimObject : public Trick::SimObject {
 
     public:
         Trick::EchoJobs echo_jobs ;
-        Trick::DebugPause debug_pause ;
 
         InstrumentationSimObject() {
             // Instrumentation class jobs.  Not scheduled by default
             {TRK} ("instrumentation") echo_jobs.echo_job(curr_job) ;
-            {TRK} ("instrumentation") debug_pause.debug_pause(curr_job) ;
         }
 }
 

trick_source/java/src/main/java/trick/simcontrol/SimControlApplication.java

@@ -527,7 +527,7 @@ public void getInitializationPacket() {
             	simRunDirField[i].setText("Slave " + i);
             }
 
-            commandSimcom.put("trick.var_exists(\"trick_instruments.debug_pause.debug_pause_flag\")\n") ;
+            commandSimcom.put("trick.var_exists(\"trick_sys.sched.debug_pause_flag\")\n") ;
             results = commandSimcom.get().split("\t");
             debug_present = Integer.parseInt(results[1]);
 
@@ -832,7 +832,7 @@ private void scheduleGetSimState() {
                           "trick.var_add(\"trick_real_time.rt_sync.active\") \n";
 
             if ( debug_present != 0 ) {
-                status_vars += "trick.var_add(\"trick_instruments.debug_pause.debug_pause_flag\")\n" ;
+                status_vars += "trick.var_add(\"trick_sys.sched.debug_pause_flag\")\n" ;
             }
             if ( overrun_present != 0 ) {
                 status_vars += "trick.var_add(\"trick_real_time.rt_sync.total_overrun\")\n" ;

trick_source/sim_services/CMakeLists.txt

@@ -23,8 +23,6 @@ set( SS_SRC
   DataRecord/DataRecordDispatcher
   DataRecord/DataRecordGroup
   DataRecord/data_record_utilities
-  DebugPause/DebugPause
-  DebugPause/DebugPause_c_intf
   EchoJobs/EchoJobs
   EchoJobs/EchoJobs_c_intf
   Environment/Environment

trick_source/sim_services/Executive/Executive.cpp

@@ -51,6 +51,9 @@ Trick::Executive::Executive() {
     software_frame = 1.0;
     frame_count = 0 ;
     stack_trace = true ;
+
+    debug_pause_flag = false ;
+
     /** @li (if on new-enough Linux) allow any process to ptrace this one.
      *      This allows stack trace / debugger attach when ptrace is
      *      restricted (e.g. on Ubuntu 16).

trick_source/sim_services/Executive/Executive_c_intf.cpp

@@ -1108,3 +1108,34 @@ int exec_register_scheduler( Trick::Scheduler * scheduler ) {
     return -1 ;
 }
 
+/**
+ * @relates Trick::DebugPause
+ * @copydoc Trick::DebugPause::debug_pause_on
+ * C wrapper for Trick::DebugPause::debug_pause_on
+ */
+extern "C" int debug_pause_on(void) {
+    if (the_exec != NULL) {
+        return the_exec->debug_pause_on() ;
+    }
+    return(0) ;
+}
+
+/**
+ * @relates Trick::DebugPause
+ * @copydoc Trick::DebugPause::debug_pause_off
+ * C wrapper for Trick::DebugPause::debug_pause_off
+ */
+extern "C" int debug_pause_off(void) {
+    if (the_exec != NULL) {
+        return the_exec->debug_pause_off() ;
+    }
+    return(0) ;
+}
+
+extern "C" int debug_signal(void) {
+    if (the_exec != NULL) {
+        return the_exec->debug_signal() ;
+    }
+    return(0) ;
+}
+