Merge branch 'tracemgrsplit' into 'master'

[simgrid.git] / include / xbt / log.h

diff --git a/include/xbt/log.h b/include/xbt/log.h
index a6df123..1053dbf 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -31,6 +31,7 @@
 
 #include <stdarg.h>
 #include <stddef.h> /* NULL */
+#include <stdio.h>  /* FILE */
 #include <xbt/misc.h>
 SG_BEGIN_DECL()
 /**@brief Log priorities
@@ -299,6 +300,7 @@ XBT_PUBLIC void xbt_log_additivity_set(xbt_log_category_t cat, int additivity);
  */
 XBT_PUBLIC xbt_log_layout_t xbt_log_layout_simple_new(const char* arg);
 XBT_PUBLIC xbt_log_layout_t xbt_log_layout_format_new(const char* arg);
+XBT_PUBLIC xbt_log_appender_t xbt_log_appender_stream(FILE* f);
 XBT_PUBLIC xbt_log_appender_t xbt_log_appender_file_new(const char* arg);
 XBT_PUBLIC xbt_log_appender_t xbt_log_appender2_file_new(const char* arg, int roll);
 
@@ -644,5 +646,11 @@ extern xbt_log_layout_t xbt_log_default_layout;
  */
 #define XBT_HERE(...) XBT_LOG(xbt_log_priority_trace, "-- was here" __VA_ARGS__)
 
+/** @ingroup XBT_log
+ *  @hideinitializer
+ *  @brief Log help messages through category xbt.xbt_help.
+ */
+#define XBT_HELP(...) XBT_CINFO(xbt_help, __VA_ARGS__)
+
 SG_END_DECL()
 #endif                          /* ! _XBT_LOG_H_ */