From: <aa...@us...> - 2007-09-28 16:50:47
|
Revision: 305 http://gull.svn.sourceforge.net/gull/?rev=305&view=rev Author: aajjan Date: 2007-09-28 09:50:51 -0700 (Fri, 28 Sep 2007) Log Message: ----------- NEW: Add log user level Modified Paths: -------------- seagull/trunk/src/generator-core/C_Generator.cpp seagull/trunk/src/generator-core/C_GeneratorConfig.cpp seagull/trunk/src/generator-core/GeneratorTrace.cpp seagull/trunk/src/generator-core/GeneratorTrace.hpp Modified: seagull/trunk/src/generator-core/C_Generator.cpp =================================================================== --- seagull/trunk/src/generator-core/C_Generator.cpp 2007-09-28 16:48:38 UTC (rev 304) +++ seagull/trunk/src/generator-core/C_Generator.cpp 2007-09-28 16:50:51 UTC (rev 305) @@ -646,6 +646,12 @@ } } + if (L_genError == E_GEN_NO_ERROR) { + init_trace (L_logLevel, + L_log_file, + m_config->get_timestamp_log()) ; + } + // scenario management if (L_genError == E_GEN_NO_ERROR) { m_scen_control->set_external_data_controller(m_external_data_control); @@ -672,14 +678,7 @@ if (L_genError == E_GEN_NO_ERROR) { - init_trace (L_logLevel, - L_log_file, - m_config->get_timestamp_log()) ; - } - - if (L_genError == E_GEN_NO_ERROR) { - #if BYTE_ORDER == BIG_ENDIAN GEN_LOG_EVENT_FORCE("Platform use BIG_ENDIAN coding"); #else Modified: seagull/trunk/src/generator-core/C_GeneratorConfig.cpp =================================================================== --- seagull/trunk/src/generator-core/C_GeneratorConfig.cpp 2007-09-28 16:48:38 UTC (rev 304) +++ seagull/trunk/src/generator-core/C_GeneratorConfig.cpp 2007-09-28 16:50:51 UTC (rev 305) @@ -157,6 +157,10 @@ case 'v': m_option_log_level |= gen_mask_table[LOG_LEVEL_VERDICT] ; break ; + case 'U': + case 'u': + m_option_log_level |= gen_mask_table[LOG_LEVEL_USER] ; + break ; case 'A': case 'a': m_option_log_level |= gen_mask_table[LOG_LEVEL_ALL] ; @@ -243,7 +247,7 @@ { E_CMDLINE_log_level, (char*)"llevel", C_GeneratorConfig::E_OT_OPTIONAL, 1 , one_value_string, (char*)"<logging level mask>", - (char*)"levels: \n M: msg, B: buffer, E: error,\n W: warning, N: no error, T: traffic error,\n V: Verdict, A: all. Default E"}, + (char*)"levels: \n M: msg, B: buffer, E: error,\n W: warning, N: no error, T: traffic error,\n V: Verdict, U: User, A: all. Default E"}, { E_CMDLINE_help, (char*)"help", C_GeneratorConfig::E_OT_OPTIONAL, 0, NULL, @@ -1155,6 +1159,9 @@ if (P_conf.m_option_log_level & gen_mask_table[LOG_LEVEL_VERDICT]) { logstring += "V" ; } + if (P_conf.m_option_log_level & gen_mask_table[LOG_LEVEL_USER]) { + logstring += "U" ; + } } P_ostream << GEN_HEADER_LOG << GEN_HEADER_NO_LEVEL << "option_log_level [" << logstring << "]" << iostream_endl ; Modified: seagull/trunk/src/generator-core/GeneratorTrace.cpp =================================================================== --- seagull/trunk/src/generator-core/GeneratorTrace.cpp 2007-09-28 16:48:38 UTC (rev 304) +++ seagull/trunk/src/generator-core/GeneratorTrace.cpp 2007-09-28 16:50:51 UTC (rev 305) @@ -33,6 +33,7 @@ 0x00000008, 0x00000010, 0x00000020, + 0x00000040, 0xFFFFFFFF } ; @@ -44,6 +45,7 @@ 'B', 'T', 'V', + 'U', 'A' } ; Modified: seagull/trunk/src/generator-core/GeneratorTrace.hpp =================================================================== --- seagull/trunk/src/generator-core/GeneratorTrace.hpp 2007-09-28 16:48:38 UTC (rev 304) +++ seagull/trunk/src/generator-core/GeneratorTrace.hpp 2007-09-28 16:50:51 UTC (rev 305) @@ -40,6 +40,7 @@ LOG_LEVEL_BUF, LOG_LEVEL_TRAFFIC_ERR, LOG_LEVEL_VERDICT, + LOG_LEVEL_USER, LOG_LEVEL_ALL } T_LogLevel ; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |