Debug options variables converted to a structure DebugOptions

Author: gsnw-sebast

src/flags.c

@@ -18,4 +18,12 @@ Options options_init(void)
     return o;
 }
 
-Options opt;
+DebugOptions debug_options_init(void)
+{
+  DebugOptions o = { 0 };
+  
+  return o;
+}
+
+Options opt;
+DebugOptions dbg_opt;

src/flags.h

@@ -56,8 +56,19 @@ typedef struct {
     int icmp_request_typ;
 } Options;
 
+typedef struct {
+    /* debug switches */
+    int trace_on;
+    int randomly_lose_on;
+    int print_per_system_on;
+    int lose_factor;
+} DebugOptions;
+
+
 Options options_init(void);
+DebugOptions debug_options_init(void);
 
 extern Options opt;
+extern DebugOptions dbg_opt;
 
 #endif

src/fping.c

@@ -333,12 +333,6 @@ int64_t end_time;
 int64_t last_send_time; /* time last ping was sent */
 int64_t next_report_time; /* time next -Q report is expected */
 
-
-#if defined(DEBUG) || defined(_DEBUG)
-int opt_debug_randomly_lose_on, opt_debug_trace_on, opt_debug_print_per_system_on;
-int lose_factor;
-#endif /* DEBUG || _DEBUG */
-
 unsigned int fwmark = 0;
 
 char *filename = NULL; /* file containing hosts to ping */
@@ -427,11 +421,13 @@ double strtod_strict(const char *arg)
 
 int main(int argc, char **argv)
 {
-/* Debug: CPU Performance */
+/* Debug: debug_options_init() and CPU Performance */
 #if defined(DEBUG) || defined(_DEBUG)
     clock_t perf_cpu_start, perf_cpu_end;
     double perf_cpu_time_used;
     perf_cpu_start = clock();
+
+    dbg_opt = debug_options_init();
 #endif /* DEBUG || _DEBUG */
 
     int c;
@@ -1032,25 +1028,25 @@ int main(int argc, char **argv)
 
 #if defined(DEBUG) || defined(_DEBUG)
     if (debugging & DBG_TRACE)
-        opt_debug_trace_on = 1;
+        dbg_opt.trace_on = 1;
 
     if (debugging & DBG_RANDOM_LOSE_FEW) {
-        opt_debug_randomly_lose_on = 1;
-        lose_factor = 1; /* ie, 1/4 */
+        dbg_opt.randomly_lose_on = 1;
+        dbg_opt.lose_factor = 1; /* ie, 1/4 */
     }
 
     if (debugging & DBG_RANDOM_LOSE_MANY) {
-        opt_debug_randomly_lose_on = 1;
-        lose_factor = 5; /* ie, 3/4 */
+        dbg_opt.randomly_lose_on = 1;
+        dbg_opt.lose_factor = 5; /* ie, 3/4 */
     }
 
     if (debugging & DBG_PRINT_PER_SYSTEM)
-        opt_debug_print_per_system_on = 1;
+        dbg_opt.print_per_system_on = 1;
 
     if ((debugging & DBG_REPORT_ALL_RTTS) && !opt.loop_on)
         opt.report_all_rtts_on = 1;
 
-    if (opt_debug_trace_on) {
+    if (dbg_opt.trace_on) {
         fprintf(stderr, "%s:\n  opt.count: %u, opt.retry: %u, opt.interval: %.0f ms\n",
             prog, opt.count, opt.retry, opt.interval / 1e6);
         fprintf(stderr, "  opt.perhost_interval: %.0f ms, opt.timeout: %.0f\n",
@@ -1087,10 +1083,10 @@ int main(int argc, char **argv)
             fprintf(stderr, "  opt.per_recv_on set\n");
         if (opt.report_all_rtts_on)
             fprintf(stderr, "  opt.report_all_rtts_on set\n");
-        if (opt_debug_randomly_lose_on)
-            fprintf(stderr, "  opt_debug_randomly_lose_on set\n");
-        if (opt_debug_print_per_system_on)
-            fprintf(stderr, "  opt_debug_print_per_system_on set\n");
+        if (dbg_opt.randomly_lose_on)
+            fprintf(stderr, "  dbg_opt.randomly_lose_on set\n");
+        if (dbg_opt.print_per_system_on)
+            fprintf(stderr, "  dbg_opt.print_per_system_on set\n");
         if (opt.outage_on)
             fprintf(stderr, "  opt.outage_on set\n");
         if (opt.print_netdata_on)
@@ -1895,7 +1891,7 @@ void finish()
             print_per_system_stats();
     }
 #if defined(DEBUG) || defined(_DEBUG)
-    else if (opt_debug_print_per_system_on) {
+    else if (dbg_opt.print_per_system_on) {
         if (opt.print_json_on)
             print_per_system_stats_json();
         else
@@ -2157,8 +2153,8 @@ int receive_packet(int64_t wait_time,
     }
 
 #if defined(DEBUG) || defined(_DEBUG)
-    if (opt_debug_randomly_lose_on) {
-        if ((random() & 0x07) <= lose_factor)
+    if (dbg_opt.randomly_lose_on) {
+        if ((random() & 0x07) <= dbg_opt.lose_factor)
             return 0;
     }
 #endif

src/fping.h

@@ -80,8 +80,7 @@ extern int64_t max_reply, min_reply, total_replies, sum_replies;
 
 /* this requires variadic macros, part of C99 */
 #if (defined(DEBUG) || defined(_DEBUG))
-extern int opt_debug_trace_on;
-#define dbg_printf(fmt, ...) do { if (opt_debug_trace_on) { fprintf(stderr, "[%10.5f] ", (double)(current_time_ns / 1000)/1000000); fprintf(stderr, fmt, __VA_ARGS__); } } while (0)
+#define dbg_printf(fmt, ...) do { if (dbg_opt.trace_on) { fprintf(stderr, "[%10.5f] ", (double)(current_time_ns / 1000)/1000000); fprintf(stderr, fmt, __VA_ARGS__); } } while (0)
 
 #else
 #define dbg_printf(fmt, ...)

src/seqmap.c

@@ -39,6 +39,7 @@
 #include "seqmap.h"
 #include "limits.h"
 #include "options.h"
+#include "flags.h"
 #include "fping.h"
 
 #include <inttypes.h>