Add debug level 5 *sigh*

diff --git a/src/include/fr_log.h b/src/include/fr_log.h
index a26183363d3380319f639d69cd93a5c74eeed992..cce2510576a7fa766bf3fa213615eab87c20ae92 100644 (file)
--- a/src/include/fr_log.h
+++ b/src/include/fr_log.h
@@ -77,7 +77,8 @@ typedef enum fr_log_lvl {
        L_DBG_LVL_1,                    //!< Highest priority debug messages (-x).
        L_DBG_LVL_2,                    //!< 2nd highest priority debug messages (-xx | -X).
        L_DBG_LVL_3,                    //!< 3rd highest priority debug messages (-xxx | -Xx).
-       L_DBG_LVL_MAX                   //!< Lowest priority debug messages (-xxxx | -Xxx).
+       L_DBG_LVL_4,                    //!< 4th highest priority debug messages (-xxxx | -Xxx).
+       L_DBG_LVL_MAX                   //!< Lowest priority debug messages (-xxxxx | -Xxxx).
 } fr_log_lvl_t;
 
 typedef enum fr_log_dst {

diff --git a/src/include/log.h b/src/include/log.h
index d73f5db0114576d32dd067f75abbe7d8fc417294..05d86d4f83c9a056aa710cfa6bb12a04c6c6de78 100644 (file)
--- a/src/include/log.h
+++ b/src/include/log.h
@@ -152,19 +152,21 @@ void      radlog_fatal(char const *fmt, ...) CC_HINT(format (printf, 1, 2)) CC_HINT(n
  * DEBUG    | LOG_DEBUG               | Regular      | Normal debug output
  *
  * **Debug levels**
- * Level    | Debug arguments         | Macro(s) enabled              | When to use
- * -------- | ----------------------- | ----------------------------- | -----------
- * 1        | ``-x``                  | DEBUG                         | Never - Deprecated
- * 2        | ``-xx`` or ``-X``       | DEBUG, DEBUG2                 | Interactions with external entities. Connection management, control socket, triggers, etc...
- * 3        | ``-xxx`` or ``-Xx``     | DEBUG, DEBUG2, DEBUG3         | Lower priority events. Polling for detail files, cleanups, etc...
- * 4        | ``-xxxx`` or ``-Xxx``   | DEBUG, DEBUG2, DEBUG3, DEBUG4 | Internal server state debugging.
+ * Level    | Debug arguments         | Macro(s) enabled   | When to use
+ * -------- | ----------------------- | ------------------ | -----------
+ * 1        | ``-x``                  | DEBUG              | Never - Deprecated
+ * 2        | ``-xx`` or ``-X``       | DEBUG, DEBUG2      | Interactions with external entities. Connection management, control socket, triggers, etc...
+ * 3        | ``-xxx`` or ``-Xx``     | DEBUG, DEBUG[2-3]  | Lower priority events. Polling for detail files, cleanups, etc...
+ * 4        | ``-xxxx`` or ``-Xxx``   | DEBUG, DEBUG[2-4]  | Internal server state debugging.
+ * 5        | ``-xxxxx`` or ``-Xxxx`` | DEBUG, DEBUG[2-5]  | Low level internal server state debugging.
  *
  * @{
  */
 #define DEBUG_ENABLED          debug_enabled(L_DBG, L_DBG_LVL_1)                       //!< True if global debug level 1 messages are enabled
 #define DEBUG_ENABLED2         debug_enabled(L_DBG, L_DBG_LVL_2)                       //!< True if global debug level 1-2 messages are enabled
 #define DEBUG_ENABLED3         debug_enabled(L_DBG, L_DBG_LVL_3)                       //!< True if global debug level 1-3 messages are enabled
-#define DEBUG_ENABLED4         debug_enabled(L_DBG, L_DBG_LVL_MAX)                     //!< True if global debug level 1-4 messages are enabled
+#define DEBUG_ENABLED4         debug_enabled(L_DBG, L_DBG_LVL_4)                       //!< True if global debug level 1-3 messages are enabled
+#define DEBUG_ENABLED5         debug_enabled(L_DBG, L_DBG_LVL_MAX)                     //!< True if global debug level 1-5 messages are enabled
 
 #define _DEBUG_LOG(_l, _p, _f, ...)    if (rad_debug_lvl >= _p) _FR_LOG(_l, _f, ## __VA_ARGS__)
 #define DEBUG(fmt, ...)                _DEBUG_LOG(L_DBG, L_DBG_LVL_1, fmt, ## __VA_ARGS__)
@@ -222,19 +224,21 @@ void      radlog_fatal(char const *fmt, ...) CC_HINT(format (printf, 1, 2)) CC_HINT(n
  * REDEBUG* | LOG_DEBUG               | Red/Bold         | Errors. Reject messages, bad values etc...
  *
  * **Debug levels**
- * Level    | Debug arguments         | Macro(s) enabled                       | When to use
- * -------- | ----------------------- | -------------------------------------- | -----------
- * 1        | ``-x``                  | R*DEBUG                                | Never - Deprecated
- * 2        | ``-xx`` or ``-X``       | R*DEBUG, R*DEBUG2                      | Normal request flow. Operations, Results of queries, or execs, etc...
- * 3        | ``-xxx`` or ``-Xx``     | R*DEBUG, R*DEBUG2, R*DEBUG3            | Internal server state or packet input. State machine changes, extra attribute info, etc...
- * 4        | ``-xxxx`` or ``-Xxx``   | R*DEBUG, R*DEBUG2, R*DEBUG3, R*DEBUG4  | Verbose internal server state messages or packet input. Hex dumps, structure dumps, pointer values.
+ * Level    | Debug arguments         | Macro(s) enabled      | When to use
+ * -------- | ----------------------- | --------------------- | -----------
+ * 1        | ``-x``                  | R*DEBUG               | Never - Deprecated
+ * 2        | ``-xx`` or ``-X``       | R*DEBUG, R*DEBUG2     | Normal request flow. Operations, Results of queries, or execs, etc...
+ * 3        | ``-xxx`` or ``-Xx``     | R*DEBUG, R*DEBUG[2-3] | Internal server state or packet input. State machine changes, extra attribute info, etc...
+ * 4        | ``-xxxx`` or ``-Xxx``   | R*DEBUG, R*DEBUG[2-4] | Verbose internal server state messages or packet input. Hex dumps, structure dumps, pointer values.
+ * 5        | ``-xxxxx`` or ``-Xxxx`` | R*DEBUG, R*DEBUG[2-5] | Low level internal server state messages.
  *
  * @{
  */
 #define RDEBUG_ENABLED         radlog_debug_enabled(L_DBG, L_DBG_LVL_1, request)       //!< True if request debug level 1 messages are enabled
 #define RDEBUG_ENABLED2                radlog_debug_enabled(L_DBG, L_DBG_LVL_2, request)       //!< True if request debug level 1-2 messages are enabled
 #define RDEBUG_ENABLED3                radlog_debug_enabled(L_DBG, L_DBG_LVL_3, request)       //!< True if request debug level 1-3 messages are enabled
-#define RDEBUG_ENABLED4                radlog_debug_enabled(L_DBG, L_DBG_LVL_MAX, request)     //!< True if request debug level 1-4 messages are enabled
+#define RDEBUG_ENABLED4                radlog_debug_enabled(L_DBG, L_DBG_LVL_4, request)       //!< True if request debug level 1-4 messages are enabled
+#define RDEBUG_ENABLED5                radlog_debug_enabled(L_DBG, L_DBG_LVL_MAX, request)     //!< True if request debug level 1-5 messages are enabled
 
 #define RDEBUGX(_l, fmt, ...)  do { if (rad_debug_lvl || request->log.lvl) radlog_request(L_DBG, _l, request, fmt, ## __VA_ARGS__); } while(0)
 #define RDEBUG(fmt, ...)       do { if (rad_debug_lvl || request->log.lvl) radlog_request(L_DBG, L_DBG_LVL_1, request, fmt, ## __VA_ARGS__); } while(0)

diff --git a/src/main/unlang_interpret.c b/src/main/unlang_interpret.c
index 5479f499fa9120fe54b8448952b4d65157c14d47..649aa26e86bd3f2928acf3bded3ce7d3522847d7 100644 (file)
--- a/src/main/unlang_interpret.c
+++ b/src/main/unlang_interpret.c
@@ -101,7 +101,7 @@ static void unlang_dump_stack(REQUEST *request, unlang_stack_t *stack)
 
        RDEBUG("----- End stack debug [depth %i] -------", stack->depth);
 }
-#define DUMP_STACK if (fr_debug_lvl >= 5) unlang_dump_stack(request, stack)
+#define DUMP_STACK if (DEBUG_ENABLED5) unlang_dump_stack(request, stack)
 #else
 #define DUMP_STACK
 #endif
@@ -675,7 +675,7 @@ static unlang_action_t unlang_foreach(REQUEST *request, unlang_stack_t *stack,
        }
 
 #ifndef NDEBUG
-       if (fr_debug_lvl >= 2) {
+       if (DEBUG_ENABLED2) {
                char buffer[1024];
 
                        fr_pair_value_snprint(buffer, sizeof(buffer), vp, '"');
@@ -1293,9 +1293,7 @@ resume_subsection:
 
                rad_assert(instruction->debug_name != NULL); /* if this happens, all bets are off. */
 
-               if (fr_debug_lvl >= 3) {
-                       VERIFY_REQUEST(request);
-               }
+               VERIFY_REQUEST(request);
 
                /*
                 *      We've been asked to stop.  Do so.