Changeset 988 for vendor/current/lib/util/debug.h

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/util/debug.h (modified) (8 diffs)

vendor/current/lib/util/debug.h

@@ -21 +21 @@
 */
 
-#ifndef _DEBUG_H
-#define _DEBUG_H
+#ifndef _SAMBA_DEBUG_H
+#define _SAMBA_DEBUG_H
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdarg.h>
+#include "attr.h"
+
 
 /* -------------------------------------------------------------------------- **
@@ -37 +43 @@
 #endif
 
-int  Debug1( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
+bool dbgtext_va(const char *, va_list ap) PRINTF_ATTRIBUTE(1,0);
 bool dbgtext( const char *, ... ) PRINTF_ATTRIBUTE(1,2);
 bool dbghdrclass( int level, int cls, const char *location, const char *func);
@@ -80 +86 @@
 #define DBGC_DMAPI              18
 #define DBGC_REGISTRY           19
-
-/* Always ensure this is updated when new fixed classes area added, to ensure the array in debug.c is the right size */
-#define DBGC_MAX_FIXED          19
+#define DBGC_SCAVENGER          20
+#define DBGC_DNS                21
+#define DBGC_LDB                22
+#define DBGC_TEVENT             23
 
 /* So you can define DBGC_CLASS before including debug.h */
@@ -160 +167 @@
     unlikely(DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level)))
 
+#define CHECK_DEBUGLVLC( dbgc_class, level ) \
+  ( ((level) <= MAX_DEBUG_LEVEL) && \
+    unlikely(DEBUGLEVEL_CLASS[ dbgc_class ] >= (level)))
+
 #define DEBUGLVL( level ) \
   ( CHECK_DEBUGLVL(level) \
    && dbghdrclass( level, DBGC_CLASS, __location__, __FUNCTION__ ) )
 
+#define DEBUGLVLC( dbgc_class, level ) \
+  ( CHECK_DEBUGLVLC( dbgc_class, level ) \
+   && dbghdrclass( level, dbgc_class, __location__, __FUNCTION__ ) )
 
 #define DEBUG( level, body ) \
@@ -190 +204 @@
 #define DEBUGSEP(level)\
         DEBUG((level),("===============================================================\n"))
+
+/* Prefix messages with the function name */
+#define DBG_PREFIX(level, body ) \
+        (void)( ((level) <= MAX_DEBUG_LEVEL) &&                 \
+                unlikely(DEBUGLEVEL_CLASS[ DBGC_CLASS ] >= (level))     \
+                && (dbghdrclass(level, DBGC_CLASS, __location__, __func__ )) \
+                && (dbgtext("%s: ", __func__))                          \
+                && (dbgtext body) )
+
+/*
+ * Debug levels matching RFC 3164
+ */
+#define DBGLVL_ERR       0      /* error conditions */
+#define DBGLVL_WARNING   1      /* warning conditions */
+#define DBGLVL_NOTICE    3      /* normal, but significant, condition */
+#define DBGLVL_INFO      5      /* informational message */
+#define DBGLVL_DEBUG    10      /* debug-level message */
+
+#define DBG_ERR(...)            DBG_PREFIX(DBGLVL_ERR,          (__VA_ARGS__))
+#define DBG_WARNING(...)        DBG_PREFIX(DBGLVL_WARNING,      (__VA_ARGS__))
+#define DBG_NOTICE(...)         DBG_PREFIX(DBGLVL_NOTICE,       (__VA_ARGS__))
+#define DBG_INFO(...)           DBG_PREFIX(DBGLVL_INFO,         (__VA_ARGS__))
+#define DBG_DEBUG(...)          DBG_PREFIX(DBGLVL_DEBUG,        (__VA_ARGS__))
 
 /* The following definitions come from lib/debug.c  */
@@ -198 +235 @@
  * the command line, as the smb.conf cannot reset it back to
  * file-based logging */
-enum debug_logtype {DEBUG_DEFAULT_STDERR = 0, DEBUG_STDOUT = 1, DEBUG_FILE = 2, DEBUG_STDERR = 3};
+enum debug_logtype {
+        DEBUG_DEFAULT_STDERR = 0,
+        DEBUG_DEFAULT_STDOUT = 1,
+        DEBUG_FILE = 2,
+        DEBUG_STDOUT = 3,
+        DEBUG_STDERR = 4,
+        DEBUG_CALLBACK = 5
+};
 
 struct debug_settings {
         size_t max_log_size;
-        int syslog;
-        bool syslog_only;
         bool timestamp_logs;
         bool debug_prefix_timestamp;
@@ -214 +256 @@
 void setup_logging(const char *prog_name, enum debug_logtype new_logtype);
 
-void debug_close_dbf(void);
 void gfree_debugsyms(void);
 int debug_add_class(const char *classname);
-int debug_lookup_classname(const char *classname);
 bool debug_parse_levels(const char *params_str);
 void debug_setup_talloc_log(void);
 void debug_set_logfile(const char *name);
-void debug_set_settings(struct debug_settings *settings);
+void debug_set_settings(struct debug_settings *settings,
+                        const char *logging_param,
+                        int syslog_level, bool syslog_only);
 bool reopen_logs_internal( void );
 void force_check_log_size( void );
@@ -228 +270 @@
 void dbgflush( void );
 bool dbghdrclass(int level, int cls, const char *location, const char *func);
-bool dbghdr(int level, const char *location, const char *func);
 bool debug_get_output_is_stderr(void);
+bool debug_get_output_is_stdout(void);
 void debug_schedule_reopen_logs(void);
 char *debug_list_class_names_and_levels(void);
 
+typedef void (*debug_callback_fn)(void *private_ptr, int level, const char *msg);
+
 /**
-  log suspicious usage - print comments and backtrace
-*/      
-_PUBLIC_ void log_suspicious_usage(const char *from, const char *info);
-
-/**
-  print suspicious usage - print comments and backtrace
-*/      
-_PUBLIC_ void print_suspicious_usage(const char* from, const char* info);
-_PUBLIC_ uint32_t get_task_id(void);
-_PUBLIC_ void log_task_id(void);
-
-/* the debug operations structure - contains function pointers to
-   various debug implementations of each operation */
-struct debug_ops {
-        /* function to log (using DEBUG) suspicious usage of data structure */
-        void (*log_suspicious_usage)(const char* from, const char* info);
-
-        /* function to log (using printf) suspicious usage of data structure.
-         * To be used in circumstances when using DEBUG would cause loop. */
-        void (*print_suspicious_usage)(const char* from, const char* info);
-
-        /* function to return process/thread id */
-        uint32_t (*get_task_id)(void);
-
-        /* function to log process/thread id */
-        void (*log_task_id)(int fd);
-};
-
-/**
-  register a set of debug handlers. 
-*/
-_PUBLIC_ void register_debug_handlers(const char *name, struct debug_ops *ops);
-
-#endif
+   Set a callback for all debug messages.  Use in dlz_bind9 to push output to the bind logs
+ */
+void debug_set_callback(void *private_ptr, debug_callback_fn fn);
+
+#endif /* _SAMBA_DEBUG_H */