[2157] renamed CounterTypeTree to CounterSpec

src/bin/auth/gen-statistics_items.py.pre.in

@@ -263,7 +263,7 @@ def generate_cxx(itemsfile, ccfile, utfile, def_mtime):
                                           '", NULL, ' + item['index'] + ' },\n'
                                           )
             else:
-                item_names_current_ = ['const struct CounterTypeTree ' +
+                item_names_current_ = ['const struct CounterSpec ' +
                                        item['index'] + '[] = {\n']
                 msg_counter_types, item_names_current_, item_names = \
                         convert_list(item['child'], msg_counter_types,
@@ -277,7 +277,7 @@ def generate_cxx(itemsfile, ccfile, utfile, def_mtime):
 
     msg_counter_types, item_names_current, item_names = \
             convert_list(item_list, msg_counter_types, [], item_names)
-    item_names.append('const struct CounterTypeTree msg_counter_tree[] = {\n')
+    item_names.append('const struct CounterSpec msg_counter_tree[] = {\n')
     item_names.extend(item_names_current)
     item_names.append('    { NULL, NULL, NOT_ITEM }\n' +
                   '};\n')

src/bin/auth/statistics.cc.pre

@@ -44,17 +44,17 @@ namespace {
 
 void
 fillNodes(const Counter& counter,
-          const struct isc::auth::statistics::CounterTypeTree type_tree[],
+          const struct isc::auth::statistics::CounterSpec type_tree[],
           isc::auth::statistics::Counters::ItemTreePtr& trees)
 {
     using namespace isc::data;
 
     for (int i = 0; type_tree[i].name != NULL; ++i) {
-        if (type_tree[i].sub_tree != NULL) {
-            isc::auth::statistics::Counters::ItemTreePtr sub_tree =
+        if (type_tree[i].sub_counters != NULL) {
+            isc::auth::statistics::Counters::ItemTreePtr sub_counters =
                 Element::createMap();
-            trees->set(type_tree[i].name, sub_tree);
-            fillNodes(counter, type_tree[i].sub_tree, sub_tree);
+            trees->set(type_tree[i].name, sub_counters);
+            fillNodes(counter, type_tree[i].sub_counters, sub_counters);
         } else {
             trees->set(type_tree[i].name,
                        Element::create(static_cast<long int>(

src/bin/auth/statistics_items.h.pre

@@ -22,9 +22,9 @@ namespace isc {
 namespace auth {
 namespace statistics {
 
-struct CounterTypeTree {
+struct CounterSpec {
     const char* const name;
-    const struct CounterTypeTree* const sub_tree;
+    const struct CounterSpec* const sub_counters;
     const int counter_id;
 };
 

src/bin/auth/tests/statistics_unittest.cc.pre

@@ -135,13 +135,13 @@ TEST_F(CountersTest, incrementNormalQuery) {
 }
 
 int
-countTreeElements(const struct CounterTypeTree* tree) {
+countTreeElements(const struct CounterSpec* tree) {
     int count = 0;
     for (int i = 0; tree[i].name != NULL; ++i) {
-        if (tree[i].sub_tree == NULL) {
+        if (tree[i].sub_counters == NULL) {
             ++count;
         } else {
-            count += countTreeElements(tree[i].sub_tree);
+            count += countTreeElements(tree[i].sub_counters);
         }
     }
     return (count);