python: Followed merging debugger support into Cmdenv.

Author: levy

python/inet/simulation/iderunner.py

@@ -17,11 +17,11 @@ def run(self, simulation_task, args):
         name = simulation_task.get_parameters_string()
         if simulation_task.debug:
             if simulation_task.break_at_matching_event:
-                debugger_init_commands = [f"breakpoint set -G true -n cSimulation::setupNetwork -C \"expression (void) omnetpp::cmdenv::setDbgenvMatchEventCondition([] (omnetpp::cEvent *event) -> bool {{ return {simulation_task.break_at_matching_event.replace('\"', '\\\"')}; }})\"",
-                                          f"breakpoint set -G true -n omnetpp::cmdenv::Dbgenv::handleMatchingEvent -C \"break set -o true -r '.*::handleMessage'\""]
+                debugger_init_commands = [f"breakpoint set -G true -n cSimulation::setupNetwork -C \"expression (void) omnetpp::cmdenv::Cmdenv::setMatchEventCondition([] (omnetpp::cEvent *event) -> bool {{ return {simulation_task.break_at_matching_event.replace('\"', '\\\"')}; }})\"",
+                                          f"breakpoint set -G true -n omnetpp::cmdenv::Cmdenv::handleMatchingEvent -C \"break set -o true -r '.*::handleMessage'\""]
             elif simulation_task.break_at_event_number:
-                debugger_init_commands = [f"breakpoint set -G true -n cSimulation::setupNetwork -C \"expression (void) omnetpp::cmdenv::setDbgenvMatchEventCondition([] (omnetpp::cEvent *event) -> bool {{ return omnetpp::cSimulation::getActiveSimulation()->getEventNumber() == {simulation_task.break_at_event_number}; }})\"",
-                                          f"breakpoint set -G true -n omnetpp::cmdenv::Dbgenv::handleMatchingEvent -C \"break set -o true -r '.*::handleMessage' -c 'omnetpp::cSimulation::getActiveSimulation()->getEventNumber() == {simulation_task.break_at_event_number}'\""]
+                debugger_init_commands = [f"breakpoint set -G true -n cSimulation::setupNetwork -C \"expression (void) omnetpp::cmdenv::Cmdenv::setMatchEventCondition([] (omnetpp::cEvent *event) -> bool {{ return omnetpp::cSimulation::getActiveSimulation()->getEventNumber() == {simulation_task.break_at_event_number - 1}; }})\"",
+                                          f"breakpoint set -G true -n omnetpp::cmdenv::Cmdenv::handleMatchingEvent -C \"break set -o true -r '.*::handleMessage' -c 'omnetpp::cSimulation::getActiveSimulation()->getEventNumber() == {simulation_task.break_at_event_number}'\""]
             else:
                 debugger_init_commands = []
             return debug_program(name, args[0], args[1:], full_working_directory, debugger_init_commands=debugger_init_commands, remove_launch=simulation_task.remove_launch)

python/inet/simulation/task.py

@@ -132,7 +132,7 @@ class SimulationTask(Task):
     Please note that undocumented features are not supposed to be called by the user.
     """
 
-    def __init__(self, simulation_config=None, run_number=0, itervars=None, mode="release", debug=None, remove_launch=True, break_at_event_number=None, break_at_matching_event=None, user_interface=None, result_folder="results", sim_time_limit=None, cpu_time_limit=None, record_eventlog=None, record_pcap=None, wait=True, name="simulation", task_result_class=SimulationTaskResult, **kwargs):
+    def __init__(self, simulation_config=None, run_number=0, itervars=None, mode="release", debug=None, remove_launch=True, break_at_event_number=None, break_at_matching_event=None, user_interface="Cmdenv", result_folder="results", sim_time_limit=None, cpu_time_limit=None, record_eventlog=None, record_pcap=None, wait=True, name="simulation", task_result_class=SimulationTaskResult, **kwargs):
         """
         Parameters:
             simulation_config (:py:class:`SimulationConfig <inet.simulation.config.SimulationConfig>`):
@@ -200,7 +200,7 @@ def __init__(self, simulation_config=None, run_number=0, itervars=None, mode="re
         self.remove_launch = remove_launch
         self.break_at_event_number = break_at_event_number
         self.break_at_matching_event = break_at_matching_event
-        self.user_interface = user_interface or ("Dbgenv" if debug else "Cmdenv")
+        self.user_interface = user_interface
         self.result_folder = result_folder
         self.sim_time_limit = sim_time_limit
         self.cpu_time_limit = cpu_time_limit