From 724144cbba8d2ad85341ed059fe7c1cc9504d330 Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Thu, 26 Mar 2020 12:19:26 +0100 Subject: [PATCH] cosmetics (tooooo many functions there) --- src/instr/instr_paje_header.cpp | 71 ++++++--------------------------- 1 file changed, 12 insertions(+), 59 deletions(-) diff --git a/src/instr/instr_paje_header.cpp b/src/instr/instr_paje_header.cpp index 780dc8262f..cfd8a036df 100644 --- a/src/instr/instr_paje_header.cpp +++ b/src/instr/instr_paje_header.cpp @@ -9,7 +9,7 @@ extern std::ofstream tracing_file; -static void TRACE_header_PajeDefineContainerType(bool basic) +static void TRACE_header_PajeTypes(bool basic) { tracing_file << "%EventDef PajeDefineContainerType " << simgrid::instr::PAJE_DefineContainerType << std::endl; tracing_file << "% Alias string" << std::endl; @@ -20,10 +20,7 @@ static void TRACE_header_PajeDefineContainerType(bool basic) } tracing_file << "% Name string" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeDefineVariableType(bool basic) -{ tracing_file << "%EventDef PajeDefineVariableType " << simgrid::instr::PAJE_DefineVariableType << std::endl; tracing_file << "% Alias string" << std::endl; if (basic){ @@ -34,10 +31,7 @@ static void TRACE_header_PajeDefineVariableType(bool basic) tracing_file << "% Name string" << std::endl; tracing_file << "% Color color" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeDefineStateType(bool basic) -{ tracing_file << "%EventDef PajeDefineStateType " << simgrid::instr::PAJE_DefineStateType << std::endl; tracing_file << "% Alias string" << std::endl; if (basic){ @@ -47,10 +41,7 @@ static void TRACE_header_PajeDefineStateType(bool basic) } tracing_file << "% Name string" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeDefineEventType(bool basic) -{ tracing_file << "%EventDef PajeDefineEventType " << simgrid::instr::PAJE_DefineEventType << std::endl; tracing_file << "% Alias string" << std::endl; if (basic){ @@ -60,10 +51,7 @@ static void TRACE_header_PajeDefineEventType(bool basic) } tracing_file << "% Name string" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeDefineLinkType(bool basic) -{ tracing_file << "%EventDef PajeDefineLinkType " << simgrid::instr::PAJE_DefineLinkType << std::endl; tracing_file << "% Alias string" << std::endl; if (basic){ @@ -93,7 +81,7 @@ static void TRACE_header_PajeDefineEntityValue(bool basic) tracing_file << "%EndEventDef" << std::endl; } -static void TRACE_header_PajeCreateContainer() +static void TRACE_header_PajeContainer() { tracing_file << "%EventDef PajeCreateContainer " << simgrid::instr::PAJE_CreateContainer << std::endl; tracing_file << "% Time date" << std::endl; @@ -102,10 +90,7 @@ static void TRACE_header_PajeCreateContainer() tracing_file << "% Container string" << std::endl; tracing_file << "% Name string" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeDestroyContainer() -{ tracing_file << "%EventDef PajeDestroyContainer " << simgrid::instr::PAJE_DestroyContainer << std::endl; tracing_file << "% Time date" << std::endl; tracing_file << "% Type string" << std::endl; @@ -113,7 +98,7 @@ static void TRACE_header_PajeDestroyContainer() tracing_file << "%EndEventDef" << std::endl; } -static void TRACE_header_PajeSetVariable() +static void TRACE_header_PajeVariable() { tracing_file << "%EventDef PajeSetVariable " << simgrid::instr::PAJE_SetVariable << std::endl; tracing_file << "% Time date" << std::endl; @@ -121,20 +106,14 @@ static void TRACE_header_PajeSetVariable() tracing_file << "% Container string" << std::endl; tracing_file << "% Value double" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeAddVariable() -{ tracing_file << "%EventDef PajeAddVariable " << simgrid::instr::PAJE_AddVariable << std::endl; tracing_file << "% Time date" << std::endl; tracing_file << "% Type string" << std::endl; tracing_file << "% Container string" << std::endl; tracing_file << "% Value double" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeSubVariable() -{ tracing_file << "%EventDef PajeSubVariable " << simgrid::instr::PAJE_SubVariable << std::endl; tracing_file << "% Time date" << std::endl; tracing_file << "% Type string" << std::endl; @@ -143,7 +122,7 @@ static void TRACE_header_PajeSubVariable() tracing_file << "%EndEventDef" << std::endl; } -static void TRACE_header_PajeSetState() +static void TRACE_header_PajeState(bool basic, int size) { tracing_file << "%EventDef PajeSetState " << simgrid::instr::PAJE_SetState << std::endl; tracing_file << "% Time date" << std::endl; @@ -151,10 +130,7 @@ static void TRACE_header_PajeSetState() tracing_file << "% Container string" << std::endl; tracing_file << "% Value string" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajePushState(int size) -{ tracing_file << "%EventDef PajePushState " << simgrid::instr::PAJE_PushState << std::endl; tracing_file << "% Time date" << std::endl; tracing_file << "% Type string" << std::endl; @@ -164,28 +140,19 @@ static void TRACE_header_PajePushState(int size) tracing_file << "% Size int" << std::endl; #if HAVE_SMPI if (simgrid::config::get_value("smpi/trace-call-location")) { - /** - * paje currently (May 2016) uses "Filename" and "Linenumber" as - * reserved words. We cannot use them... - */ + /* paje currently (May 2016) uses "Filename" and "Linenumber" as reserved words. We cannot use them... */ tracing_file << "% Fname string" << std::endl; tracing_file << "% Lnumber int" << std::endl; } #endif tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajePopState() -{ tracing_file << "%EventDef PajePopState " << simgrid::instr::PAJE_PopState << std::endl; tracing_file << "% Time date" << std::endl; tracing_file << "% Type string" << std::endl; tracing_file << "% Container string" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeResetState(bool basic) -{ if (basic) return; @@ -196,7 +163,7 @@ static void TRACE_header_PajeResetState(bool basic) tracing_file << "%EndEventDef" << std::endl; } -static void TRACE_header_PajeStartLink(bool basic, bool size) +static void TRACE_header_PajeLink(bool basic, bool size) { tracing_file << "%EventDef PajeStartLink " << simgrid::instr::PAJE_StartLink << std::endl; tracing_file << "% Time date" << std::endl; @@ -205,17 +172,14 @@ static void TRACE_header_PajeStartLink(bool basic, bool size) tracing_file << "% Value string" << std::endl; if (basic){ tracing_file << "% SourceContainer string" << std::endl; - }else{ + } else { tracing_file << "% StartContainer string" << std::endl; } tracing_file << "% Key string" << std::endl; if (size) tracing_file << "% Size int" << std::endl; tracing_file << "%EndEventDef" << std::endl; -} -static void TRACE_header_PajeEndLink(bool basic) -{ tracing_file << "%EventDef PajeEndLink " << simgrid::instr::PAJE_EndLink << std::endl; tracing_file << "% Time date" << std::endl; tracing_file << "% Type string" << std::endl; @@ -242,22 +206,11 @@ static void TRACE_header_PajeNewEvent() void TRACE_header(bool basic, bool size) { - TRACE_header_PajeDefineContainerType(basic); - TRACE_header_PajeDefineVariableType(basic); - TRACE_header_PajeDefineStateType(basic); - TRACE_header_PajeDefineEventType(basic); - TRACE_header_PajeDefineLinkType(basic); + TRACE_header_PajeTypes(basic); TRACE_header_PajeDefineEntityValue(basic); - TRACE_header_PajeCreateContainer(); - TRACE_header_PajeDestroyContainer(); - TRACE_header_PajeSetVariable(); - TRACE_header_PajeAddVariable(); - TRACE_header_PajeSubVariable(); - TRACE_header_PajeSetState(); - TRACE_header_PajePushState(size); - TRACE_header_PajePopState(); - TRACE_header_PajeResetState(basic); - TRACE_header_PajeStartLink (basic, size); - TRACE_header_PajeEndLink(basic); + TRACE_header_PajeContainer(); + TRACE_header_PajeVariable(); + TRACE_header_PajeState(basic, size); + TRACE_header_PajeLink(basic, size); TRACE_header_PajeNewEvent(); } -- 2.20.1