diff --git a/cfg/cpu-nanos6-mode.cfg b/cfg/cpu-nanos6-subsystem.cfg similarity index 94% rename from cfg/cpu-nanos6-mode.cfg rename to cfg/cpu-nanos6-subsystem.cfg index 29e7a79..9f729c3 100644 --- a/cfg/cpu-nanos6-mode.cfg +++ b/cfg/cpu-nanos6-subsystem.cfg @@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1 ################################################################################ -< NEW DISPLAYING WINDOW Thread: Nanos6 mode > +< NEW DISPLAYING WINDOW CPU: Nanos6 subsystem > ################################################################################ -window_name CPU: Nanos6 mode +window_name CPU: Nanos6 subsystem window_type single window_id 1 window_position_x 960 @@ -38,6 +38,6 @@ window_labels_to_draw 1 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } window_filter_module evt_type 1 100 -window_filter_module evt_type_label 1 "CPU: Nanos6 running thread mode" +window_filter_module evt_type_label 1 "CPU: Nanos6 running thread subsystem" window_synchronize 1 diff --git a/cfg/cpu-openmp-mode.cfg b/cfg/cpu-openmp-mode.cfg index 3d6e354..984a52d 100644 --- a/cfg/cpu-openmp-mode.cfg +++ b/cfg/cpu-openmp-mode.cfg @@ -4,7 +4,7 @@ ConfigFile.NumWindows: 1 ################################################################################ -< NEW DISPLAYING WINDOW Thread: OpenMP mode > +< NEW DISPLAYING WINDOW CPU: OpenMP mode > ################################################################################ window_name CPU: OpenMP mode window_type single diff --git a/cfg/cpu-tampi-mode.cfg b/cfg/cpu-tampi-mode.cfg index 9e16942..9d1664e 100644 --- a/cfg/cpu-tampi-mode.cfg +++ b/cfg/cpu-tampi-mode.cfg @@ -4,7 +4,7 @@ ConfigFile.NumWindows: 1 ################################################################################ -< NEW DISPLAYING WINDOW Thread: TAMPI mode > +< NEW DISPLAYING WINDOW CPU: TAMPI mode > ################################################################################ window_name CPU: TAMPI mode window_type single diff --git a/cfg/thread-nanos6-mode.cfg b/cfg/thread-nanos6-subsystem.cfg similarity index 91% rename from cfg/thread-nanos6-mode.cfg rename to cfg/thread-nanos6-subsystem.cfg index ec8eac7..f20cfc6 100644 --- a/cfg/thread-nanos6-mode.cfg +++ b/cfg/thread-nanos6-subsystem.cfg @@ -4,9 +4,9 @@ ConfigFile.NumWindows: 1 ################################################################################ -< NEW DISPLAYING WINDOW Thread: Nanos6 mode > +< NEW DISPLAYING WINDOW Thread: Nanos6 subsystem > ################################################################################ -window_name Thread: Nanos6 mode +window_name Thread: Nanos6 subsystem window_type single window_id 1 window_position_x 960 @@ -38,6 +38,6 @@ window_labels_to_draw 1 window_selected_functions { 14, { {cpu, Active Thd}, {appl, Adding}, {task, Adding}, {thread, Last Evt Val}, {node, Adding}, {system, Adding}, {workload, Adding}, {from_obj, All}, {to_obj, All}, {tag_msg, All}, {size_msg, All}, {bw_msg, All}, {evt_type, =}, {evt_value, All} } } window_compose_functions { 9, { {compose_cpu, As Is}, {compose_appl, As Is}, {compose_task, As Is}, {compose_thread, As Is}, {compose_node, As Is}, {compose_system, As Is}, {compose_workload, As Is}, {topcompose1, As Is}, {topcompose2, As Is} } } window_filter_module evt_type 1 50 -window_filter_module evt_type_label 1 "Thread: Nanos6 mode" +window_filter_module evt_type_label 1 "Thread: Nanos6 subsystem" window_synchronize 1 diff --git a/doc/emu_events.txt b/doc/emu_events.txt index 3fd0c3c..23ceff9 100644 --- a/doc/emu_events.txt +++ b/doc/emu_events.txt @@ -100,27 +100,27 @@ MP[ Parallel region ends -------------------- Nanos6 (model=L) ---------------------- -LR[ Enters the registering of a task's accesses -LR] Exits the registering of a task's accesses +LR[ Begins the registration of a task's accesses +LR] Ends the registration of a task's accesses -LU[ Enters the unregistering of a task's accesses -LU] Exits the unregistering of a task's accesses +LU[ Begins the unregistration of a task's accesses +LU] Ends the unregistration of a task's accesses -LW[ Enters the blocking condition waiting for an If0 task -LW] Exits the blocking condition waiting for an If0 task +LW[ Enters a blocking condition (waiting for an If0 task) +LW] Exits a blocking condition (waiting for an If0 task) -LI[ Enters the inline execution of an If0 task -LI] Exits the inline execution of an If0 task +LI[ Beings the inline execution of an If0 task +LI] Ends the inline execution of an If0 task LT[ Enters a taskwait LT] Exits a taskwait -LC[ Enters the creation of a task -LC] Exits the creation of a task +LC[ Begins the creation of a task +LC] Ends the creation of a task -LS[ Enters the submit of a task -LS] Exits the submit of a task +LS[ Begins the submit of a task +LS] Ends the submit of a task -LP[ Enters the spawning of a function -LP] Exits the spawning of a function +LP[ Begins the spawn of a function +LP] Ends the spawn of a function diff --git a/emu.h b/emu.h index ebff90f..9f6d7f4 100644 --- a/emu.h +++ b/emu.h @@ -101,13 +101,13 @@ enum openmp_state { }; enum nanos6_state { - ST_NANOS6_REGISTERING = 1, - ST_NANOS6_UNREGISTERING = 2, + ST_NANOS6_REGISTER = 1, + ST_NANOS6_UNREGISTER = 2, ST_NANOS6_IF0_WAIT = 3, ST_NANOS6_IF0_INLINE = 4, ST_NANOS6_TASKWAIT = 5, - ST_NANOS6_CREATING = 6, - ST_NANOS6_SUBMITTING = 7, + ST_NANOS6_CREATE = 6, + ST_NANOS6_SUBMIT = 7, ST_NANOS6_SPAWN = 8, }; diff --git a/emu_nanos6.c b/emu_nanos6.c index 0b7bee5..ee4a10b 100644 --- a/emu_nanos6.c +++ b/emu_nanos6.c @@ -96,13 +96,13 @@ hook_pre_nanos6(struct ovni_emu *emu) switch(emu->cur_ev->header.category) { - case 'R': pre_subsystem(emu, ST_NANOS6_REGISTERING); break; - case 'U': pre_subsystem(emu, ST_NANOS6_UNREGISTERING); break; + case 'R': pre_subsystem(emu, ST_NANOS6_REGISTER); break; + case 'U': pre_subsystem(emu, ST_NANOS6_UNREGISTER); break; case 'W': pre_subsystem(emu, ST_NANOS6_IF0_WAIT); break; case 'I': pre_subsystem(emu, ST_NANOS6_IF0_INLINE); break; case 'T': pre_subsystem(emu, ST_NANOS6_TASKWAIT); break; - case 'C': pre_subsystem(emu, ST_NANOS6_CREATING); break; - case 'S': pre_subsystem(emu, ST_NANOS6_SUBMITTING); break; + case 'C': pre_subsystem(emu, ST_NANOS6_CREATE); break; + case 'S': pre_subsystem(emu, ST_NANOS6_SUBMIT); break; case 'P': pre_subsystem(emu, ST_NANOS6_SPAWN); break; default: break; diff --git a/pcf.c b/pcf.c index ccf74e5..157ef07 100644 --- a/pcf.c +++ b/pcf.c @@ -365,28 +365,28 @@ struct event_type thread_openmp_mode = { /* ---------------- CHAN_NANOS6_SUBSYSTEM ---------------- */ struct event_value nanos6_mode_values[] = { - { ST_NULL, "NULL" }, - { ST_TOO_MANY_TH, "Nanos6: Multiple threads running" }, - { ST_NANOS6_REGISTERING, "Dependencies: Register task accesses" }, - { ST_NANOS6_UNREGISTERING, "Dependencies: Unregister task accesses" }, - { ST_NANOS6_IF0_WAIT, "If0: Wait for If0 task" }, - { ST_NANOS6_IF0_INLINE, "If0: Execute If0 task inline" }, - { ST_NANOS6_TASKWAIT, "Taskwait: Taskwait" }, - { ST_NANOS6_CREATING, "Add Task: Create a task" }, - { ST_NANOS6_SUBMITTING, "Add Task: Submit a task" }, - { ST_NANOS6_SPAWN, "Spawn Function: Spawn a function" }, + { ST_NULL, "NULL" }, + { ST_TOO_MANY_TH, "Nanos6: Multiple threads running" }, + { ST_NANOS6_REGISTER, "Dependencies: Registering task accesses" }, + { ST_NANOS6_UNREGISTER, "Dependencies: Unregistering task accesses" }, + { ST_NANOS6_IF0_WAIT, "If0: Waiting for an If0 task" }, + { ST_NANOS6_IF0_INLINE, "If0: Executing an If0 task inline" }, + { ST_NANOS6_TASKWAIT, "Taskwait: Taskwait" }, + { ST_NANOS6_CREATE, "Add Task: Creating a task" }, + { ST_NANOS6_SUBMIT, "Add Task: Submitting a task" }, + { ST_NANOS6_SPAWN, "Spawn Function: Spawning a function" }, { -1, NULL }, }; struct event_type cpu_nanos6_mode = { 0, chan_to_prvtype[CHAN_NANOS6_SUBSYSTEM][CHAN_CPU], - "CPU: Nanos6 mode of the RUNNING thread", + "CPU: Nanos6 subsystem of the RUNNING thread", nanos6_mode_values }; struct event_type thread_nanos6_mode = { 0, chan_to_prvtype[CHAN_NANOS6_SUBSYSTEM][CHAN_TH], - "Thread: Nanos6 mode of the RUNNING thread", + "Thread: Nanos6 subsystem of the RUNNING thread", nanos6_mode_values };