ns-3.24: comparison src/core/log.h

equal deleted inserted replaced

-:444ef6129d2e
+:36472385a1cc
 *     send information out on screen. All logging messages
 *     are disabled by default. To enable selected logging
 *     messages, use the ns3::LogComponentEnable
 *     function or use the NS_LOG environment variable and
 *     ns3::LogComponentEnableEnvVar
+*
+* Use the environment variable NS_LOG to define a ';'-separated list of
+* logging components to enable. For example, NS_LOG=a;b;c;DAFD;GH
+* would enable the components 'a', 'b', 'c', 'DAFD', and, 'GH'.
+* NS_LOG=* will enable all available log components.
+*
+* For each component, the "debug" log level is enabled by default
+* but more components can be enabled selectively with the following
+* syntax: NS_LOG='Component1=func|param|warn;Component2=error|debug'
+* This example would enable the 'func', 'param', and 'warn' log
+* levels for 'Component1' and the 'error' and 'debug' log levels
+* for 'Component2'.  The wildcard can be used here as well.  For example
+* NS_LOG='*=level_all|prefix' would enable all log levels and prefix all
+* prints with the component and function names.
+*
 */
 /**
 * \ingroup logging
 * \param name a string
 do                                                            \
 {                                                           \
 if (g_log.IsEnabled (level))                              \
 {                                                       \
 std::clog << g_log.Name () << ":" << __FUNCTION__ <<  \
-"(): " << std::endl;                                \
+"()" << std::endl;                                \
 }                                                       \
 }                                                           \
 while (false)
 #define NS_LOG_ERROR(msg) \
 #endif
 #ifdef NS3_LOG_ENABLE
 /**
-* \brief Enable the logging output based on an environment variable.
-*
-* Use the environment variable NS_LOG to define a ';'-separated list of
-* logging components to enable. For example, NS_LOG=a;b;c;DAFD;GH
-* would enable the components 'a', 'b', 'c', 'DAFD', and, 'GH'.
-* NS_LOG=* will enable all available log components.
-*
-* For each component, the "debug" log level is enabled by default
-* but more components can be enabled selectively with the following
-* syntax: NS_LOG='Component1=func|param|warn;Component2=error|debug'
-* This example would enable the 'func', 'param', and 'warn' log
-* levels for 'Component1' and the 'error' and 'debug' log levels
-* for 'Component2'.  The wildcard can be used here as well.  For example
-* NS_LOG='*=level_all|prefix' would enable all log levels and prefix all
-* prints with the component and function names.
-*
-* The list of available log components can be printed on stdout
-* with the NS_LOG=print-list syntax.
-*/
-void LogComponentEnableEnvVar (void);
-/**
 * \param name a log component name
 * \param level a logging level
 * \param decorate whether or not to add function names to all logs
 * \ingroup logging
 *
 *
 * Enable the logging output for all registered log components.
 */
 void LogComponentEnableAll (enum LogLevel level);
 #else
-#define LogComponentEnableEnvVar()
 #define LogComponentEnable(a,b)
 #define LogComponentEnableAll(a)
 #endif
 #ifdef NS3_LOG_ENABLE
 /**
 * \ingroup logging
 *
 * Print the list of logging messages available.
-* The output of this function can be obtained by setting
-* the NS_LOG environment variable to the special value
-* 'print-list'.
-*
-* For example: NS_LOG=print-list
 */
 #ifdef NS3_LOG_ENABLE
 void LogComponentPrintList (void);
 #else
 #define LogComponentPrintList()
 #ifdef NS3_LOG_ENABLE
 class LogComponent {
 public:
 LogComponent (char const *name);
+void EnvVarCheck (char const *name);
 bool IsEnabled (enum LogLevel level) const;
 bool IsNoneEnabled (void) const;
 void Enable (enum LogLevel level);
 void Disable (enum LogLevel level);
 bool Decorate (void) const;

changeset 1783	36472385a1cc
parent 1775	5abf6f0d1eca
child 1795	820cc1254290