X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Flog.h;h=f6088bcb202401610f37bce3a66e446750186f43;hb=de636dbe4e9fb2c1f4d29de203d9ff2528206afc;hp=d0f1a9f8192f166a346eccc82e43b539de6a4353;hpb=2ce3523cd91426310d4bd1e2563cb7af09d0d5bd;p=libucw.git

diff --git a/ucw/log.h b/ucw/log.h
index d0f1a9f8..f6088bcb 100644
--- a/ucw/log.h
+++ b/ucw/log.h
@@ -11,7 +11,7 @@
 #ifndef _UCW_LOG_H_
 #define _UCW_LOG_H_
 
-#include "ucw/clists.h"
+#include <ucw/clists.h>
 
 /*** === Messages and streams ***/
 
@@ -22,6 +22,7 @@ struct log_msg {
   char *m;				// The formatted message itself, ending with \n\0
   int m_len;				// Length without the \0
   struct tm *tm;			// Current time
+  struct timeval *tv;
   uns flags;				// Category and other flags as passed to msg()
   char *raw_msg;			// Unformatted parts
   char *stime;
@@ -43,6 +44,7 @@ struct log_stream {
   clist substreams;			// Pass the message to these streams (simple_list of pointers)
   int (*handler)(struct log_stream *ls, struct log_msg *m);	// Called to commit the message, return 0 for success, errno on error
   void (*close)(struct log_stream* ls);	// Called upon log_close_stream()
+  void *user_data;			// Not used by the logging system
   // Private data of the handler follow
 };
 
@@ -110,6 +112,8 @@ enum ls_flagmasks {			// Bit masks of groups
 #define LS_SET_TYPE(type)	((type) << LS_TYPE_POS)				/** Convert message type to flags **/
 #define LS_SET_CTRL(ctrl)	((ctrl) << LS_CTRL_POS)				/** Convert control bits to flags **/
 
+#define LS_NUM_TYPES (1 << LS_TYPE_BITS)
+
 /** Register a new message type and return the corresponding flag set (encoded by `LS_SET_TYPE`). **/
 int log_register_type(const char *name);
 
@@ -175,6 +179,17 @@ static inline struct log_stream *log_default_stream(void)
   return log_stream_by_flags(0);
 }
 
+/**
+ * Make the specified stream the default destination.
+ *
+ * In fact, it takes the fixed default stream and attaches @ls as its only
+ * substream. If there were any other substreams, they are removed.
+ *
+ * Log streams created by log_file() or log_configured() are made default
+ * by calling this function.
+ **/
+void log_set_default_stream(struct log_stream *ls);
+
 /**
  * Close all open streams, un-initialize the module, free all memory and
  * reset the logging mechanism to use stderr only.
@@ -188,8 +203,14 @@ void log_close_all(void);
  * even in multi-threaded programs.
  ***/
 
-struct log_stream *log_new_file(const char *path);		/** Create a stream bound to a log file. **/
-struct log_stream *log_new_fd(int fd);				/** Create a stream bound to a file descriptor. **/
+struct log_stream *log_new_file(const char *path, uns flags);	/** Create a stream bound to a log file. See `FF_xxx` for @flags. **/
+struct log_stream *log_new_fd(int fd, uns flags);		/** Create a stream bound to a file descriptor. See `FF_xxx` for @flags. **/
+
+enum log_file_flag {		/** Flags used for file-based logging **/
+  FF_FORMAT_NAME = 1,		// Internal: Name contains strftime escapes
+  FF_CLOSE_FD = 2,		// Close the fd with the stream (use with log_new_fd())
+  FF_FD2_FOLLOWS = 4,		// Maintain stderr as a clone of this stream
+};
 
 /**
  * When a time-based name of the log file changes, the logger switches to a new