Don't undef <unit>_TRACE, instead add comment how to enable it

In units that support detailed reference tracing via ISC_REFCOUNT
macros, we were doing:

    /* Define to 1 for detailed reference tracing */
    #undef <unit>_TRACE

This would prevent using -D<unit>_TRACE=1 in the CFLAGS.

Convert the above mentioned snippet with just a comment how to enable
the detailed reference tracing:

    /* Add -D<unit>_TRACE=1 to CFLAGS for detailed reference tracing */

diff --git a/bin/named/controlconf.c b/bin/named/controlconf.c
index eff48e0af75afb4a2653d57ee28359637b50f762..9044d4dce4f887145bea7940d7dec388a9bf74d4 100644 (file)
--- a/bin/named/controlconf.c
+++ b/bin/named/controlconf.c
@@ -49,7 +49,7 @@
 #include <named/main.h>
 #include <named/server.h>
 
-#undef NAMED_CONTROLCONF_TRACE
+/* Add -DNAMED_CONTROLCONF_TRACE=1 to CFLAGS for detailed reference tracing */
 
 typedef struct controlkey controlkey_t;
 typedef ISC_LIST(controlkey_t) controlkeylist_t;

diff --git a/lib/dns/include/dns/adb.h b/lib/dns/include/dns/adb.h
index e1b94ed369d0094752bd0fe44a97adea103f5310..15977b16381dfff03a21fc112b62851617a557c8 100644 (file)
--- a/lib/dns/include/dns/adb.h
+++ b/lib/dns/include/dns/adb.h
@@ -61,8 +61,7 @@
  *** Imports
  ***/
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_ADB_TRACE
+/* Add -DDNS_ADB_TRACE=1 to CFLAGS for detailed reference tracing */
 
 #include <inttypes.h>
 #include <stdbool.h>

diff --git a/lib/dns/include/dns/catz.h b/lib/dns/include/dns/catz.h
index 2d7f3e44fc18a0cccc3c9dd2002e580f2b29d9e9..826e8df093dbcc916e2b252a283e237a374b846c 100644 (file)
--- a/lib/dns/include/dns/catz.h
+++ b/lib/dns/include/dns/catz.h
@@ -13,10 +13,7 @@
 
 #pragma once
 
-/*
- * Define this for reference count tracing in the unit
- */
-#undef DNS_CATZ_TRACE
+/* Add -DDNS_CATZ_TRACE=1 to CFLAGS for detailed reference tracing */
 
 #include <inttypes.h>
 #include <stdbool.h>

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 373fa30384f24aaf29060c654e363e993e44fd95..b3657be2e880d3c46ba9675ceb56a76e5d6f840d 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -47,8 +47,7 @@
 ***** Imports
 *****/
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_DB_TRACE
+/* Add -DDNS_DB_TRACE=1 to CFLAGS for detailed reference tracing */
 
 #include <inttypes.h>
 #include <stdbool.h>

diff --git a/lib/dns/include/dns/dispatch.h b/lib/dns/include/dns/dispatch.h
index 0e302f288e727f5d0abb5c61a07ceac99843f6ef..80ef3c9d775c17753ccb8a92829de318b159927f 100644 (file)
--- a/lib/dns/include/dns/dispatch.h
+++ b/lib/dns/include/dns/dispatch.h
@@ -58,7 +58,7 @@
 
 #include <dns/types.h>
 
-#undef DNS_DISPATCH_TRACE
+/* Add -DDNS_DISPATCH_TRACE=1 to CFLAGS for detailed reference tracing */
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index 8ce9f6abc7ddc84738917a32b7a33db4b9b2fa6e..e300a9555cfb0c1dac8feb55ab11884d4d443ca7 100644 (file)
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -25,8 +25,7 @@
 #include <dns/qp.h>
 #include <dns/types.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_FORWARD_TRACE
+/* Add -DDNS_FORWARD_TRACE=1 to CFLAGS for detailed reference tracing */
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index ea35307da40ba49b52f66b61d62962a9e9190445..acf06a9218222b04ca29379de5a43a27742192cf 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -30,8 +30,7 @@
 
 #include <dst/dst.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_MESSAGE_TRACE
+/* Add -DDNS_MESSAGE_TRACE=1 to CFLAGS for detailed reference tracing */
 
 /*! \file dns/message.h
  * \brief Message Handling Module

diff --git a/lib/dns/include/dns/nametree.h b/lib/dns/include/dns/nametree.h
index 228a62b9c5acfe6c1228c8d5ba58049fdfad6720..9fec23041b14fd1a73405f597c11c4fd3291f881 100644 (file)
--- a/lib/dns/include/dns/nametree.h
+++ b/lib/dns/include/dns/nametree.h
@@ -37,8 +37,7 @@
 
 #include <dst/dst.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_NAMETREE_TRACE
+/* Add -DDNS_NAMETREE_TRACE=1 to CFLAGS for detailed reference tracing */
 
 typedef enum {
        DNS_NAMETREE_BOOL,

diff --git a/lib/dns/include/dns/nta.h b/lib/dns/include/dns/nta.h
index 308f3f5b687b33471ae5d7bda95511584bd9c7f1..777a0fd3a42bf2e52ca886f858b796f012d9f555 100644 (file)
--- a/lib/dns/include/dns/nta.h
+++ b/lib/dns/include/dns/nta.h
@@ -40,8 +40,7 @@
 #include <dns/types.h>
 #include <dns/view.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_NTA_TRACE
+/* Add -DDNS_NTA_TRACE=1 to CFLAGS for detailed reference tracing */
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/dns/include/dns/request.h b/lib/dns/include/dns/request.h
index 5e112cb437a5d29edefca17a041ebc61283f89fd..ccbc9e2b20a908e19ec72a0d908582e3bc9af377 100644 (file)
--- a/lib/dns/include/dns/request.h
+++ b/lib/dns/include/dns/request.h
@@ -42,7 +42,7 @@
 
 #include <dns/types.h>
 
-#undef DNS_REQUEST_TRACE
+/* Add -DDNS_REQUEST_TRACE=1 to CFLAGS for detailed reference tracing */
 
 #define DNS_REQUESTOPT_TCP     0x00000001U
 #define DNS_REQUESTOPT_CASE    0x00000002U

diff --git a/lib/dns/include/dns/resolver.h b/lib/dns/include/dns/resolver.h
index 01725a13ec2e29f462ffe9e0cb8a5a09d220081b..66ab0888ec510343c22476b77370713a3091d339 100644 (file)
--- a/lib/dns/include/dns/resolver.h
+++ b/lib/dns/include/dns/resolver.h
@@ -59,7 +59,7 @@
 #include <dns/fixedname.h>
 #include <dns/types.h>
 
-#undef DNS_RESOLVER_TRACE
+/* Add -DDNS_RESOLVER_TRACE=1 to CFLAGS for detailed reference tracing */
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index 79d0e228a8aa3bb44c7d9bf9a054674ef02e3830..eaf6fe982fb1217a1fa0f8d2fce87639d1102f6a 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -13,10 +13,7 @@
 
 #pragma once
 
-/*
- * Define this for reference count tracing in the unit
- */
-#undef DNS_RPZ_TRACE
+/* Add -DDNS_RPZ_TRACE=1 to CFLAGS for detailed reference tracing */
 
 #include <inttypes.h>
 #include <stdbool.h>

diff --git a/lib/dns/include/dns/tsig.h b/lib/dns/include/dns/tsig.h
index c4bf46a6225573d3c7d355f9c94bb3cd0eced407..edd0694df049238a0a3d3aa2bd5981de53cc86df 100644 (file)
--- a/lib/dns/include/dns/tsig.h
+++ b/lib/dns/include/dns/tsig.h
@@ -30,8 +30,7 @@
 
 #include <dst/dst.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_TSIG_TRACE
+/* Add -DDNS_TSIG_TRACE=1 to CFLAGS for detailed reference tracing */
 
 /*
  * Algorithms.

diff --git a/lib/dns/include/dns/xfrin.h b/lib/dns/include/dns/xfrin.h
index 40c38d961cfed43b38c5bbf20d9f712f2ec7f543..d44b44014377f5ddfb3a740e2bc4ff3a00d0982e 100644 (file)
--- a/lib/dns/include/dns/xfrin.h
+++ b/lib/dns/include/dns/xfrin.h
@@ -34,8 +34,7 @@
 #include <dns/transport.h>
 #include <dns/types.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_XFRIN_TRACE
+/* Add -DDNS_XFRIN_TRACE=1 to CFLAGS for detailed reference tracing */
 
 /***
  *** Types

diff --git a/lib/dns/include/dns/zone.h b/lib/dns/include/dns/zone.h
index 2e3b10ebfaeaafee5ac4cdc5352ec9d0e4d1a8c8..de48246d1d740c2ac1036644af248abf32d596a6 100644 (file)
--- a/lib/dns/include/dns/zone.h
+++ b/lib/dns/include/dns/zone.h
@@ -38,8 +38,7 @@
 #include <dns/xfrin.h>
 #include <dns/zt.h>
 
-/* Define to 1 for detailed reference tracing */
-#undef DNS_ZONE_TRACE
+/* Add -DDNS_ZONE_TRACE=1 to CFLAGS for detailed reference tracing */
 
 typedef enum {
        dns_zone_none,

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 2c91606b16ae6d5a0376f1be4c25edd46ede3fd7..c9847e3b09c203858b1e5bd4fd7fc330914c6b6a 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -74,11 +74,6 @@
 #include <dns/validator.h>
 #include <dns/zone.h>
 
-/* Detailed logging of fctx attach/detach */
-#ifndef FCTX_TRACE
-#undef FCTX_TRACE
-#endif
-
 #ifdef WANT_QUERYTRACE
 #define RTRACE(m)                                                             \
        isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,                     \

diff --git a/lib/isc/include/isc/loop.h b/lib/isc/include/isc/loop.h
index ba049ae1e348e07a20c3a048b4aed0af6dbff289..a434190cc402db6ac7ab125c43fd66a27e0af886 100644 (file)
--- a/lib/isc/include/isc/loop.h
+++ b/lib/isc/include/isc/loop.h
@@ -23,7 +23,7 @@
 
 typedef void (*isc_job_cb)(void *);
 
-#undef ISC_LOOP_TRACE
+/* Add -DISC_LOOP_TRACE=1 to CFLAGS for detailed reference tracing */
 
 ISC_LANG_BEGINDECLS
 

diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h
index 19250b528302fa9dd7f8dfa5ad33b85894934e6c..8bcbb1da7f20d7af0d19443667cc344877fc5fd6 100644 (file)
--- a/lib/isc/include/isc/netmgr.h
+++ b/lib/isc/include/isc/netmgr.h
@@ -24,7 +24,7 @@
 #include <isc/tls.h>
 #include <isc/types.h>
 
-#undef ISC_NETMGR_TRACE
+/* Add -DISC_NETMGR_TRACE=1 to CFLAGS for detailed reference tracing */
 
 #if defined(SO_REUSEPORT_LB) || (defined(SO_REUSEPORT) && defined(__linux__))
 #define HAVE_SO_REUSEPORT_LB 1

diff --git a/lib/isc/include/isc/quota.h b/lib/isc/include/isc/quota.h
index 85654dd66fd022f876700ee18f1e6d76a02d03fb..571cd5b09b772c4abb4e0a4921fe191b132c50f2 100644 (file)
--- a/lib/isc/include/isc/quota.h
+++ b/lib/isc/include/isc/quota.h
@@ -45,7 +45,7 @@
 ***** Types.
 *****/
 
-#undef ISC_QUOTA_TRACE
+/* Add -DISC_QUOTA_TRACE=1 to CFLAGS for detailed reference tracing */
 
 ISC_LANG_BEGINDECLS