constify Print() methods and other low hanging fruit

include/tscore/HostLookup.h

@@ -129,8 +129,9 @@ class HostLookup
   bool Match(std::string_view host, void **opaque_ptr);
   bool MatchFirst(std::string_view host, HostLookupState *s, void **opaque_ptr);
   bool MatchNext(HostLookupState *s, void **opaque_ptr);
-  void Print(PrintFunc const &f);
-  void Print();
+
+  void Print(PrintFunc const &f) const;
+  void Print() const;
 
   LeafArray *
   get_leaf_array()
@@ -147,7 +148,9 @@ class HostLookup
   HostBranch *InsertBranch(HostBranch *insert_in, std::string_view level_data);
   HostBranch *FindNextLevel(HostBranch *from, std::string_view level_data, bool bNotProcess = false);
   bool MatchArray(HostLookupState *s, void **opaque_ptr, LeafIndices &array, bool host_done);
-  void PrintHostBranch(HostBranch *hb, PrintFunc const &f);
+
+  void PrintHostBranch(const HostBranch *hb, PrintFunc const &f) const;
+
   HostBranch root;          // The top of the search tree
   LeafArray leaf_array;     // array of all leaves in tree
   std::string matcher_name; // Used for Debug/Warning/Error messages

include/tscore/Tokenizer.h

@@ -143,7 +143,7 @@ class Tokenizer
   };
 
   unsigned count() const;
-  void Print(); // Debugging print out
+  void Print() const;
 
   inkcoreapi const char *iterFirst(tok_iter_state *state);
   inkcoreapi const char *iterNext(tok_iter_state *state);

include/tscore/Trie.h

@@ -20,6 +20,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
+
 #pragma once
 
 #include <cstdio>
@@ -42,7 +43,7 @@ template <typename T> class Trie
   // will return false if not found; else value_ptr will point to found value
   T *Search(const char *key, int key_len = -1) const;
   void Clear();
-  void Print();
+  void Print() const;
 
   bool
   Empty() const
@@ -229,7 +230,7 @@ Trie<T>::Clear()
 
 template <typename T>
 void
-Trie<T>::Print()
+Trie<T>::Print() const
 {
   // The class we contain must provide a ::Print() method.
   forl_LL(T, iter, m_value_list) iter->Print();

iocore/cache/CacheHosting.cc

@@ -53,7 +53,7 @@ CacheHostMatcher::~CacheHostMatcher()
 //  Debugging Method
 //
 void
-CacheHostMatcher::Print()
+CacheHostMatcher::Print() const
 {
   printf("\tHost/Domain Matcher with %d elements\n", num_el);
   host_lookup->Print(PrintFunc);
@@ -96,7 +96,7 @@ CacheHostMatcher::AllocateSpace(int num_entries)
 //    arg hostname
 //
 void
-CacheHostMatcher::Match(const char *rdata, int rlen, CacheHostResult *result)
+CacheHostMatcher::Match(const char *rdata, int rlen, CacheHostResult *result) const
 {
   void *opaque_ptr;
   CacheHostRecord *data_ptr;
@@ -111,6 +111,7 @@ CacheHostMatcher::Match(const char *rdata, int rlen, CacheHostResult *result)
   if (rlen == 0) {
     return;
   }
+
   char *data = static_cast<char *>(ats_malloc(rlen + 1));
   memcpy(data, rdata, rlen);
   *(data + rlen) = '\0';
@@ -208,7 +209,7 @@ CacheHostTable::~CacheHostTable()
 //   Debugging method
 //
 void
-CacheHostTable::Print()
+CacheHostTable::Print() const
 {
   printf("Control Matcher Table: %s\n", matcher_name);
   if (hostMatch != nullptr) {
@@ -222,7 +223,7 @@ CacheHostTable::Print()
 //   Queries each table for the Result*
 //
 void
-CacheHostTable::Match(const char *rdata, int rlen, CacheHostResult *result)
+CacheHostTable::Match(const char *rdata, int rlen, CacheHostResult *result) const
 {
   hostMatch->Match(rdata, rlen, result);
 }
@@ -272,6 +273,7 @@ CacheHostTable::BuildTableFromString(const char *config_file_path, char *file_bu
     }
     return 0;
   }
+
   // First get the number of entries
   tmp = bufTok.iterFirst(&i_state);
   while (tmp != nullptr) {
@@ -587,7 +589,7 @@ CacheHostRecord::UpdateMatch(CacheHostResult *r, char * /* rd ATS_UNUSED */)
 }
 
 void
-CacheHostRecord::Print()
+CacheHostRecord::Print() const
 {
 }
 

iocore/cache/P_CacheHosting.h

@@ -37,8 +37,10 @@ struct Cache;
 struct CacheHostRecord {
   int Init(CacheType typ);
   int Init(matcher_line *line_info, CacheType typ);
+
   void UpdateMatch(CacheHostResult *r, char *rd);
-  void Print();
+  void Print() const;
+
   ~CacheHostRecord()
   {
     ats_free(vols);
@@ -72,10 +74,11 @@ class CacheHostMatcher
   CacheHostMatcher(const char *name, CacheType typ);
   ~CacheHostMatcher();
 
-  void Match(const char *rdata, int rlen, CacheHostResult *result);
   void AllocateSpace(int num_entries);
   void NewEntry(matcher_line *line_info);
-  void Print();
+
+  void Match(const char *rdata, int rlen, CacheHostResult *result) const;
+  void Print() const;
 
   int
   getNumElements() const
@@ -109,10 +112,12 @@ class CacheHostTable
   //  object is
   CacheHostTable(Cache *c, CacheType typ);
   ~CacheHostTable();
+
   int BuildTable(const char *config_file_path);
   int BuildTableFromString(const char *config_file_path, char *str);
-  void Match(const char *rdata, int rlen, CacheHostResult *result);
-  void Print();
+
+  void Match(const char *rdata, int rlen, CacheHostResult *result) const;
+  void Print() const;
 
   int
   getEntryCount() const

iocore/dns/P_SplitDNSProcessor.h

@@ -200,7 +200,7 @@ class SplitDNSRecord : public ControlBase
   const char *ProcessDefDomain(char *val);
 
   void UpdateMatch(SplitDNSResult *result, RequestData *rdata);
-  void Print();
+  void Print() const;
 
   DNSServer m_servers;
   int m_dnsSrvr_cnt      = 0;

iocore/dns/SplitDNS.cc

@@ -531,7 +531,7 @@ SplitDNSRecord::UpdateMatch(SplitDNSResult *result, RequestData * /* rdata ATS_U
     SplitDNSRecord::Print()
    -------------------------------------------------------------- */
 void
-SplitDNSRecord::Print()
+SplitDNSRecord::Print() const
 {
   for (int i = 0; i < m_dnsSrvr_cnt; i++) {
     char ab[INET6_ADDRPORTSTRLEN];

proxy/CacheControl.cc

@@ -184,7 +184,7 @@ getCacheControl(CacheControlResult *result, HttpRequestData *rdata, const Overri
 //  Debugging Method
 //
 void
-CacheControlResult::Print()
+CacheControlResult::Print() const
 {
   printf("\t reval: %d, never-cache: %d, pin: %d, ignore-c: %d ignore-s: %d\n", revalidate_after, never_cache, pin_in_cache_for,
          ignore_client_no_cache, ignore_server_no_cache);
@@ -195,7 +195,7 @@ CacheControlResult::Print()
 //  Debugging Method
 //
 void
-CacheControlRecord::Print()
+CacheControlRecord::Print() const
 {
   switch (this->directive) {
   case CC_REVALIDATE_AFTER:

proxy/CacheControl.h

@@ -63,7 +63,7 @@ class CacheControlResult
 {
 public:
   inkcoreapi CacheControlResult();
-  void Print();
+  void Print() const;
 
   // Data for external use
   //
@@ -109,7 +109,7 @@ class CacheControlRecord : public ControlBase
   int cache_responses_to_cookies = -1;
   Result Init(matcher_line *line_info);
   inkcoreapi void UpdateMatch(CacheControlResult *result, RequestData *rdata);
-  void Print();
+  void Print() const;
 };
 
 inline CacheControlRecord::CacheControlRecord() : ControlBase() {}

proxy/ControlBase.cc

@@ -694,10 +694,8 @@ ControlBase::clear()
   _mods.clear();
 }
 
-// static const modifier_el default_el = { MOD_INVALID, NULL };
-
 void
-ControlBase::Print()
+ControlBase::Print() const
 {
   int n = _mods.size();
 

proxy/ControlBase.h

@@ -73,10 +73,13 @@ class ControlBase
 
   ControlBase();
   ~ControlBase();
+
   const char *ProcessModifiers(matcher_line *line_info);
   bool CheckModifiers(HttpRequestData *request_data);
   bool CheckForMatch(HttpRequestData *request_data, int last_number);
-  void Print();
+
+  void Print() const;
+
   int line_num = 0;
   Modifier *findModOfType(Modifier::Type t) const;
 

proxy/ControlMatcher.cc

@@ -105,7 +105,7 @@ template <class Data, class MatchResult> HostMatcher<Data, MatchResult>::~HostMa
 //
 template <class Data, class MatchResult>
 void
-HostMatcher<Data, MatchResult>::Print()
+HostMatcher<Data, MatchResult>::Print() const
 {
   printf("\tHost/Domain Matcher with %d elements\n", num_el);
   host_lookup->Print(PrintFunc);
@@ -150,7 +150,7 @@ HostMatcher<Data, MatchResult>::AllocateSpace(int num_entries)
 //
 template <class Data, class MatchResult>
 void
-HostMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
+HostMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result) const
 {
   void *opaque_ptr;
   Data *data_ptr;
@@ -256,7 +256,7 @@ template <class Data, class MatchResult> UrlMatcher<Data, MatchResult>::~UrlMatc
 //
 template <class Data, class MatchResult>
 void
-UrlMatcher<Data, MatchResult>::Print()
+UrlMatcher<Data, MatchResult>::Print() const
 {
   printf("\tUrl Matcher with %d elements\n", num_el);
   for (int i = 0; i < num_el; i++) {
@@ -335,7 +335,7 @@ UrlMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 //
 template <class Data, class MatchResult>
 void
-UrlMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
+UrlMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result) const
 {
   char *url_str;
 
@@ -383,13 +383,13 @@ template <class Data, class MatchResult> RegexMatcher<Data, MatchResult>::~Regex
 }
 
 //
-// void RegexMatcher<Data,MatchResult>::Print()
+// void RegexMatcher<Data,MatchResult>::Print() const
 //
 //   Debugging function
 //
 template <class Data, class MatchResult>
 void
-RegexMatcher<Data, MatchResult>::Print()
+RegexMatcher<Data, MatchResult>::Print() const
 {
   printf("\tRegex Matcher with %d elements\n", num_el);
   for (int i = 0; i < num_el; i++) {
@@ -482,7 +482,7 @@ RegexMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 //
 template <class Data, class MatchResult>
 void
-RegexMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
+RegexMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result) const
 {
   char *url_str;
   int r;
@@ -535,7 +535,7 @@ HostRegexMatcher<Data, MatchResult>::HostRegexMatcher(const char *name, const ch
 //
 template <class Data, class MatchResult>
 void
-HostRegexMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
+HostRegexMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result) const
 {
   const char *url_str;
   int r;
@@ -649,7 +649,7 @@ IpMatcher<Data, MatchResult>::NewEntry(matcher_line *line_info)
 //
 template <class Data, class MatchResult>
 void
-IpMatcher<Data, MatchResult>::Match(sockaddr const *addr, RequestData *rdata, MatchResult *result)
+IpMatcher<Data, MatchResult>::Match(sockaddr const *addr, RequestData *rdata, MatchResult *result) const
 {
   void *raw;
   if (ip_map.contains(addr, &raw)) {
@@ -661,7 +661,7 @@ IpMatcher<Data, MatchResult>::Match(sockaddr const *addr, RequestData *rdata, Ma
 
 template <class Data, class MatchResult>
 void
-IpMatcher<Data, MatchResult>::Print()
+IpMatcher<Data, MatchResult>::Print() const
 {
   printf("\tIp Matcher with %d elements, %zu ranges.\n", num_el, ip_map.count());
   for (IpMap::iterator spot(ip_map.begin()), limit(ip_map.end()); spot != limit; ++spot) {
@@ -718,7 +718,7 @@ template <class Data, class MatchResult> ControlMatcher<Data, MatchResult>::~Con
 //
 template <class Data, class MatchResult>
 void
-ControlMatcher<Data, MatchResult>::Print()
+ControlMatcher<Data, MatchResult>::Print() const
 {
   printf("Control Matcher Table: %s\n", matcher_name);
   if (hostMatch != nullptr) {
@@ -739,13 +739,13 @@ ControlMatcher<Data, MatchResult>::Print()
 }
 
 // void ControlMatcher<Data, MatchResult>::Match(RequestData* rdata
-//                                          MatchResult* result)
+//                                          MatchResult* result) const
 //
 //   Queries each table for the MatchResult*
 //
 template <class Data, class MatchResult>
 void
-ControlMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result)
+ControlMatcher<Data, MatchResult>::Match(RequestData *rdata, MatchResult *result) const
 {
   if (hostMatch != nullptr) {
     hostMatch->Match(rdata, result);