From 9d844da3bbb89aa22b9c480b75064fa623e6e339 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 23 Jan 2018 11:49:41 +0000
Subject: [PATCH] Performance: accessor lookup improvements with gperf -C (See
 ECC-525)

---
 src/grib_accessor_class.c        |   8 +-
 src/grib_accessor_classes_hash.c | 540 +++++++++++++++----------------
 src/make_accessor_class_hash.ksh |   3 +-
 3 files changed, 277 insertions(+), 274 deletions(-)

diff --git a/src/grib_accessor_class.c b/src/grib_accessor_class.c
index be41d42f2..d34b1e9ca 100644
--- a/src/grib_accessor_class.c
+++ b/src/grib_accessor_class.c
@@ -127,10 +127,12 @@ grib_accessor* grib_accessor_factory(grib_section* p, grib_action* creator,
     grib_accessor* a=NULL;
     size_t size=0;
 
-    c = get_class(p->h->context,creator->op);
-#ifdef USE_GPERF_HASHING
+    /* Using the TRIE:
+     *   c = get_class(p->h->context,creator->op);
+     */
+    /* Use the hash table from gperf */
     c=*((grib_accessor_classes_hash(creator->op,strlen(creator->op)))->cclass);
-#endif
+
     a = (grib_accessor*) grib_context_malloc_clear(p->h->context,c->size);
 
     a->name                = creator->name;
diff --git a/src/grib_accessor_classes_hash.c b/src/grib_accessor_classes_hash.c
index e81d7ad3c..51deed99a 100644
--- a/src/grib_accessor_classes_hash.c
+++ b/src/grib_accessor_classes_hash.c
@@ -1,5 +1,5 @@
 /* C code produced by gperf version 3.0.4 */
-/* Command-line: gperf -W classes -t -G -H grib_accessor_classes_get_id -N grib_accessor_classes_hash -m 1 -j 1 accessor_class_list.gperf  */
+/* Command-line: gperf -C -W classes -t -G -H grib_accessor_classes_get_id -N grib_accessor_classes_hash -m 1 -j 1 accessor_class_list.gperf  */
 /* Computed positions: -k'1-2,5,7,11' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -56,7 +56,7 @@ grib_accessor_classes_get_id (str, len)
      register const char *str;
      register unsigned int len;
 {
-  static unsigned short asso_values[] =
+  static const unsigned short asso_values[] =
     {
       873, 873, 873, 873, 873, 873, 873, 873, 873, 873,
       873, 873, 873, 873, 873, 873, 873, 873, 873, 873,
@@ -114,546 +114,546 @@ grib_accessor_classes_get_id (str, len)
   return hval;
 }
 
-static struct accessor_class_hash classes[] =
+static const struct accessor_class_hash classes[] =
   {
     {""},
-#line 8 "accessor_class_list.gperf"
+#line 9 "accessor_class_list.gperf"
     {" "},
     {""}, {""}, {""}, {""}, {""},
-#line 206 "accessor_class_list.gperf"
+#line 207 "accessor_class_list.gperf"
     {"time", &grib_accessor_class_time},
     {""},
-#line 195 "accessor_class_list.gperf"
+#line 196 "accessor_class_list.gperf"
     {"size", &grib_accessor_class_size},
-#line 13 "accessor_class_list.gperf"
+#line 14 "accessor_class_list.gperf"
     {"ascii", &grib_accessor_class_ascii},
-#line 192 "accessor_class_list.gperf"
+#line 193 "accessor_class_list.gperf"
     {"signed", &grib_accessor_class_signed},
-#line 207 "accessor_class_list.gperf"
+#line 208 "accessor_class_list.gperf"
     {"times", &grib_accessor_class_times},
     {""}, {""}, {""}, {""}, {""},
-#line 73 "accessor_class_list.gperf"
+#line 74 "accessor_class_list.gperf"
     {"data_raw_packing", &grib_accessor_class_data_raw_packing},
-#line 201 "accessor_class_list.gperf"
+#line 202 "accessor_class_list.gperf"
     {"statistics", &grib_accessor_class_statistics},
-#line 193 "accessor_class_list.gperf"
+#line 194 "accessor_class_list.gperf"
     {"signed_bits", &grib_accessor_class_signed_bits},
     {""},
-#line 78 "accessor_class_list.gperf"
+#line 79 "accessor_class_list.gperf"
     {"data_simple_packing", &grib_accessor_class_data_simple_packing},
-#line 139 "accessor_class_list.gperf"
-    {"int8", &grib_accessor_class_int8},
-#line 137 "accessor_class_list.gperf"
-    {"int64", &grib_accessor_class_int64},
-#line 74 "accessor_class_list.gperf"
-    {"data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap},
-#line 123 "accessor_class_list.gperf"
-    {"gen", &grib_accessor_class_gen},
-#line 161 "accessor_class_list.gperf"
-    {"nearest", &grib_accessor_class_nearest},
-#line 202 "accessor_class_list.gperf"
-    {"statistics_spectral", &grib_accessor_class_statistics_spectral},
-#line 173 "accessor_class_list.gperf"
-    {"pad", &grib_accessor_class_pad},
-#line 186 "accessor_class_list.gperf"
-    {"section", &grib_accessor_class_section},
 #line 140 "accessor_class_list.gperf"
-    {"iterator", &grib_accessor_class_iterator},
-#line 80 "accessor_class_list.gperf"
-    {"dictionary", &grib_accessor_class_dictionary},
-#line 198 "accessor_class_list.gperf"
-    {"spd", &grib_accessor_class_spd},
-#line 210 "accessor_class_list.gperf"
-    {"to_string", &grib_accessor_class_to_string},
-#line 204 "accessor_class_list.gperf"
-    {"sum", &grib_accessor_class_sum},
-#line 72 "accessor_class_list.gperf"
-    {"data_png_packing", &grib_accessor_class_data_png_packing},
-#line 215 "accessor_class_list.gperf"
-    {"uint32", &grib_accessor_class_uint32},
-#line 203 "accessor_class_list.gperf"
-    {"step_in_units", &grib_accessor_class_step_in_units},
-#line 189 "accessor_class_list.gperf"
-    {"section_pointer", &grib_accessor_class_section_pointer},
-#line 188 "accessor_class_list.gperf"
-    {"section_padding", &grib_accessor_class_section_padding},
-#line 55 "accessor_class_list.gperf"
-    {"data_constant_field", &grib_accessor_class_data_constant_field},
-#line 54 "accessor_class_list.gperf"
-    {"data_complex_packing", &grib_accessor_class_data_complex_packing},
-#line 229 "accessor_class_list.gperf"
-    {"when", &grib_accessor_class_when},
-#line 121 "accessor_class_list.gperf"
-    {"gds_is_present", &grib_accessor_class_gds_is_present},
-#line 49 "accessor_class_list.gperf"
-    {"data_apply_bitmap", &grib_accessor_class_data_apply_bitmap},
-#line 56 "accessor_class_list.gperf"
-    {"data_dummy_field", &grib_accessor_class_data_dummy_field},
+    {"int8", &grib_accessor_class_int8},
+#line 138 "accessor_class_list.gperf"
+    {"int64", &grib_accessor_class_int64},
+#line 75 "accessor_class_list.gperf"
+    {"data_secondary_bitmap", &grib_accessor_class_data_secondary_bitmap},
 #line 124 "accessor_class_list.gperf"
-    {"getenv", &grib_accessor_class_getenv},
-#line 86 "accessor_class_list.gperf"
-    {"expanded_descriptors", &grib_accessor_class_expanded_descriptors},
-#line 185 "accessor_class_list.gperf"
-    {"second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value},
-#line 209 "accessor_class_list.gperf"
-    {"to_integer", &grib_accessor_class_to_integer},
-#line 175 "accessor_class_list.gperf"
-    {"padto", &grib_accessor_class_padto},
-#line 52 "accessor_class_list.gperf"
-    {"data_apply_gdsnotpresent", &grib_accessor_class_data_apply_gdsnotpresent},
-#line 216 "accessor_class_list.gperf"
-    {"uint32_little_endian", &grib_accessor_class_uint32_little_endian},
-#line 50 "accessor_class_list.gperf"
-    {"data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic},
-#line 187 "accessor_class_list.gperf"
-    {"section_length", &grib_accessor_class_section_length},
-#line 127 "accessor_class_list.gperf"
-    {"gts_header", &grib_accessor_class_gts_header},
+    {"gen", &grib_accessor_class_gen},
+#line 162 "accessor_class_list.gperf"
+    {"nearest", &grib_accessor_class_nearest},
+#line 203 "accessor_class_list.gperf"
+    {"statistics_spectral", &grib_accessor_class_statistics_spectral},
 #line 174 "accessor_class_list.gperf"
-    {"padding", &grib_accessor_class_padding},
-#line 133 "accessor_class_list.gperf"
-    {"int16", &grib_accessor_class_int16},
-#line 142 "accessor_class_list.gperf"
-    {"julian_day", &grib_accessor_class_julian_day},
+    {"pad", &grib_accessor_class_pad},
+#line 187 "accessor_class_list.gperf"
+    {"section", &grib_accessor_class_section},
 #line 141 "accessor_class_list.gperf"
-    {"julian_date", &grib_accessor_class_julian_date},
-#line 51 "accessor_class_list.gperf"
-    {"data_apply_boustrophedonic_bitmap", &grib_accessor_class_data_apply_boustrophedonic_bitmap},
-#line 219 "accessor_class_list.gperf"
-    {"uint8", &grib_accessor_class_uint8},
-#line 15 "accessor_class_list.gperf"
-    {"bit", &grib_accessor_class_bit},
-#line 17 "accessor_class_list.gperf"
-    {"bits", &grib_accessor_class_bits},
-#line 76 "accessor_class_list.gperf"
-    {"data_sh_unpacked", &grib_accessor_class_data_sh_unpacked},
-#line 16 "accessor_class_list.gperf"
-    {"bitmap", &grib_accessor_class_bitmap},
+    {"iterator", &grib_accessor_class_iterator},
+#line 81 "accessor_class_list.gperf"
+    {"dictionary", &grib_accessor_class_dictionary},
+#line 199 "accessor_class_list.gperf"
+    {"spd", &grib_accessor_class_spd},
+#line 211 "accessor_class_list.gperf"
+    {"to_string", &grib_accessor_class_to_string},
+#line 205 "accessor_class_list.gperf"
+    {"sum", &grib_accessor_class_sum},
+#line 73 "accessor_class_list.gperf"
+    {"data_png_packing", &grib_accessor_class_data_png_packing},
+#line 216 "accessor_class_list.gperf"
+    {"uint32", &grib_accessor_class_uint32},
+#line 204 "accessor_class_list.gperf"
+    {"step_in_units", &grib_accessor_class_step_in_units},
+#line 190 "accessor_class_list.gperf"
+    {"section_pointer", &grib_accessor_class_section_pointer},
+#line 189 "accessor_class_list.gperf"
+    {"section_padding", &grib_accessor_class_section_padding},
+#line 56 "accessor_class_list.gperf"
+    {"data_constant_field", &grib_accessor_class_data_constant_field},
+#line 55 "accessor_class_list.gperf"
+    {"data_complex_packing", &grib_accessor_class_data_complex_packing},
+#line 230 "accessor_class_list.gperf"
+    {"when", &grib_accessor_class_when},
 #line 122 "accessor_class_list.gperf"
-    {"gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap},
-#line 71 "accessor_class_list.gperf"
-    {"data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing},
+    {"gds_is_present", &grib_accessor_class_gds_is_present},
+#line 50 "accessor_class_list.gperf"
+    {"data_apply_bitmap", &grib_accessor_class_data_apply_bitmap},
+#line 57 "accessor_class_list.gperf"
+    {"data_dummy_field", &grib_accessor_class_data_dummy_field},
+#line 125 "accessor_class_list.gperf"
+    {"getenv", &grib_accessor_class_getenv},
+#line 87 "accessor_class_list.gperf"
+    {"expanded_descriptors", &grib_accessor_class_expanded_descriptors},
+#line 186 "accessor_class_list.gperf"
+    {"second_order_bits_per_value", &grib_accessor_class_second_order_bits_per_value},
+#line 210 "accessor_class_list.gperf"
+    {"to_integer", &grib_accessor_class_to_integer},
+#line 176 "accessor_class_list.gperf"
+    {"padto", &grib_accessor_class_padto},
+#line 53 "accessor_class_list.gperf"
+    {"data_apply_gdsnotpresent", &grib_accessor_class_data_apply_gdsnotpresent},
 #line 217 "accessor_class_list.gperf"
-    {"uint64", &grib_accessor_class_uint64},
+    {"uint32_little_endian", &grib_accessor_class_uint32_little_endian},
+#line 51 "accessor_class_list.gperf"
+    {"data_apply_boustrophedonic", &grib_accessor_class_data_apply_boustrophedonic},
+#line 188 "accessor_class_list.gperf"
+    {"section_length", &grib_accessor_class_section_length},
+#line 128 "accessor_class_list.gperf"
+    {"gts_header", &grib_accessor_class_gts_header},
+#line 175 "accessor_class_list.gperf"
+    {"padding", &grib_accessor_class_padding},
+#line 134 "accessor_class_list.gperf"
+    {"int16", &grib_accessor_class_int16},
+#line 143 "accessor_class_list.gperf"
+    {"julian_day", &grib_accessor_class_julian_day},
+#line 142 "accessor_class_list.gperf"
+    {"julian_date", &grib_accessor_class_julian_date},
+#line 52 "accessor_class_list.gperf"
+    {"data_apply_boustrophedonic_bitmap", &grib_accessor_class_data_apply_boustrophedonic_bitmap},
+#line 220 "accessor_class_list.gperf"
+    {"uint8", &grib_accessor_class_uint8},
+#line 16 "accessor_class_list.gperf"
+    {"bit", &grib_accessor_class_bit},
+#line 18 "accessor_class_list.gperf"
+    {"bits", &grib_accessor_class_bits},
 #line 77 "accessor_class_list.gperf"
+    {"data_sh_unpacked", &grib_accessor_class_data_sh_unpacked},
+#line 17 "accessor_class_list.gperf"
+    {"bitmap", &grib_accessor_class_bitmap},
+#line 123 "accessor_class_list.gperf"
+    {"gds_not_present_bitmap", &grib_accessor_class_gds_not_present_bitmap},
+#line 72 "accessor_class_list.gperf"
+    {"data_jpeg2000_packing", &grib_accessor_class_data_jpeg2000_packing},
+#line 218 "accessor_class_list.gperf"
+    {"uint64", &grib_accessor_class_uint64},
+#line 78 "accessor_class_list.gperf"
     {"data_shsimple_packing", &grib_accessor_class_data_shsimple_packing},
     {""}, {""},
-#line 162 "accessor_class_list.gperf"
+#line 163 "accessor_class_list.gperf"
     {"non_alpha", &grib_accessor_class_non_alpha},
-#line 18 "accessor_class_list.gperf"
+#line 19 "accessor_class_list.gperf"
     {"bits_per_value", &grib_accessor_class_bits_per_value},
     {""},
-#line 178 "accessor_class_list.gperf"
+#line 179 "accessor_class_list.gperf"
     {"position", &grib_accessor_class_position},
-#line 222 "accessor_class_list.gperf"
+#line 223 "accessor_class_list.gperf"
     {"unsigned", &grib_accessor_class_unsigned},
     {""},
-#line 87 "accessor_class_list.gperf"
+#line 88 "accessor_class_list.gperf"
     {"forward", &grib_accessor_class_forward},
-#line 131 "accessor_class_list.gperf"
+#line 132 "accessor_class_list.gperf"
     {"ieeefloat", &grib_accessor_class_ieeefloat},
-#line 170 "accessor_class_list.gperf"
+#line 171 "accessor_class_list.gperf"
     {"offset_file", &grib_accessor_class_offset_file},
-#line 20 "accessor_class_list.gperf"
+#line 21 "accessor_class_list.gperf"
     {"box", &grib_accessor_class_box},
-#line 223 "accessor_class_list.gperf"
+#line 224 "accessor_class_list.gperf"
     {"unsigned_bits", &grib_accessor_class_unsigned_bits},
     {""},
-#line 218 "accessor_class_list.gperf"
+#line 219 "accessor_class_list.gperf"
     {"uint64_little_endian", &grib_accessor_class_uint64_little_endian},
     {""}, {""},
-#line 164 "accessor_class_list.gperf"
+#line 165 "accessor_class_list.gperf"
     {"number_of_points", &grib_accessor_class_number_of_points},
     {""}, {""},
-#line 82 "accessor_class_list.gperf"
+#line 83 "accessor_class_list.gperf"
     {"divdouble", &grib_accessor_class_divdouble},
-#line 81 "accessor_class_list.gperf"
+#line 82 "accessor_class_list.gperf"
     {"dirty", &grib_accessor_class_dirty},
     {""}, {""}, {""},
-#line 23 "accessor_class_list.gperf"
+#line 24 "accessor_class_list.gperf"
     {"bufr_data", &grib_accessor_class_bufr_data},
-#line 165 "accessor_class_list.gperf"
+#line 166 "accessor_class_list.gperf"
     {"number_of_points_gaussian", &grib_accessor_class_number_of_points_gaussian},
     {""},
-#line 21 "accessor_class_list.gperf"
+#line 22 "accessor_class_list.gperf"
     {"budgdate", &grib_accessor_class_budgdate},
     {""}, {""},
-#line 24 "accessor_class_list.gperf"
+#line 25 "accessor_class_list.gperf"
     {"bufr_data_array", &grib_accessor_class_bufr_data_array},
     {""},
-#line 25 "accessor_class_list.gperf"
+#line 26 "accessor_class_list.gperf"
     {"bufr_data_element", &grib_accessor_class_bufr_data_element},
-#line 200 "accessor_class_list.gperf"
+#line 201 "accessor_class_list.gperf"
     {"sprintf", &grib_accessor_class_sprintf},
     {""}, {""},
-#line 32 "accessor_class_list.gperf"
+#line 33 "accessor_class_list.gperf"
     {"bufr_simple_thinning", &grib_accessor_class_bufr_simple_thinning},
     {""},
-#line 208 "accessor_class_list.gperf"
+#line 209 "accessor_class_list.gperf"
     {"to_double", &grib_accessor_class_to_double},
-#line 171 "accessor_class_list.gperf"
+#line 172 "accessor_class_list.gperf"
     {"offset_values", &grib_accessor_class_offset_values},
-#line 220 "accessor_class_list.gperf"
+#line 221 "accessor_class_list.gperf"
     {"unexpanded_descriptors", &grib_accessor_class_unexpanded_descriptors},
-#line 177 "accessor_class_list.gperf"
+#line 178 "accessor_class_list.gperf"
     {"padtomultiple", &grib_accessor_class_padtomultiple},
     {""},
-#line 31 "accessor_class_list.gperf"
+#line 32 "accessor_class_list.gperf"
     {"bufr_has_delayed_replication", &grib_accessor_class_bufr_has_delayed_replication},
-#line 34 "accessor_class_list.gperf"
+#line 35 "accessor_class_list.gperf"
     {"bufrdc_expanded_descriptors", &grib_accessor_class_bufrdc_expanded_descriptors},
-#line 135 "accessor_class_list.gperf"
+#line 136 "accessor_class_list.gperf"
     {"int32", &grib_accessor_class_int32},
-#line 65 "accessor_class_list.gperf"
+#line 66 "accessor_class_list.gperf"
     {"data_g22order_packing", &grib_accessor_class_data_g22order_packing},
-#line 68 "accessor_class_list.gperf"
+#line 69 "accessor_class_list.gperf"
     {"data_g2shsimple_packing", &grib_accessor_class_data_g2shsimple_packing},
     {""}, {""},
-#line 118 "accessor_class_list.gperf"
+#line 119 "accessor_class_list.gperf"
     {"g2step", &grib_accessor_class_g2step},
-#line 114 "accessor_class_list.gperf"
+#line 115 "accessor_class_list.gperf"
     {"g2grid", &grib_accessor_class_g2grid},
-#line 112 "accessor_class_list.gperf"
+#line 113 "accessor_class_list.gperf"
     {"g2date", &grib_accessor_class_g2date},
     {""},
-#line 110 "accessor_class_list.gperf"
+#line 111 "accessor_class_list.gperf"
     {"g2bitmap", &grib_accessor_class_g2bitmap},
     {""}, {""}, {""},
-#line 33 "accessor_class_list.gperf"
+#line 34 "accessor_class_list.gperf"
     {"bufr_string_values", &grib_accessor_class_bufr_string_values},
     {""},
-#line 113 "accessor_class_list.gperf"
+#line 114 "accessor_class_list.gperf"
     {"g2end_step", &grib_accessor_class_g2end_step},
     {""}, {""}, {""}, {""}, {""},
-#line 67 "accessor_class_list.gperf"
+#line 68 "accessor_class_list.gperf"
     {"data_g2secondary_bitmap", &grib_accessor_class_data_g2secondary_bitmap},
-#line 117 "accessor_class_list.gperf"
+#line 118 "accessor_class_list.gperf"
     {"g2lon", &grib_accessor_class_g2lon},
-#line 84 "accessor_class_list.gperf"
+#line 85 "accessor_class_list.gperf"
     {"element", &grib_accessor_class_element},
-#line 145 "accessor_class_list.gperf"
-    {"laplacian", &grib_accessor_class_laplacian},
-#line 69 "accessor_class_list.gperf"
-    {"data_g2simple_packing", &grib_accessor_class_data_g2simple_packing},
-#line 66 "accessor_class_list.gperf"
-    {"data_g2complex_packing", &grib_accessor_class_data_g2complex_packing},
 #line 146 "accessor_class_list.gperf"
+    {"laplacian", &grib_accessor_class_laplacian},
+#line 70 "accessor_class_list.gperf"
+    {"data_g2simple_packing", &grib_accessor_class_data_g2simple_packing},
+#line 67 "accessor_class_list.gperf"
+    {"data_g2complex_packing", &grib_accessor_class_data_g2complex_packing},
+#line 147 "accessor_class_list.gperf"
     {"latitudes", &grib_accessor_class_latitudes},
-#line 11 "accessor_class_list.gperf"
+#line 12 "accessor_class_list.gperf"
     {"apply_operators", &grib_accessor_class_apply_operators},
-#line 115 "accessor_class_list.gperf"
+#line 116 "accessor_class_list.gperf"
     {"g2latlon", &grib_accessor_class_g2latlon},
     {""},
-#line 108 "accessor_class_list.gperf"
+#line 109 "accessor_class_list.gperf"
     {"g2_eps", &grib_accessor_class_g2_eps},
     {""}, {""},
-#line 119 "accessor_class_list.gperf"
+#line 120 "accessor_class_list.gperf"
     {"g2step_range", &grib_accessor_class_g2step_range},
-#line 35 "accessor_class_list.gperf"
+#line 36 "accessor_class_list.gperf"
     {"bytes", &grib_accessor_class_bytes},
     {""}, {""},
-#line 151 "accessor_class_list.gperf"
+#line 152 "accessor_class_list.gperf"
     {"long", &grib_accessor_class_long},
-#line 194 "accessor_class_list.gperf"
+#line 195 "accessor_class_list.gperf"
     {"simple_packing_error", &grib_accessor_class_simple_packing_error},
     {""}, {""},
-#line 83 "accessor_class_list.gperf"
+#line 84 "accessor_class_list.gperf"
     {"double", &grib_accessor_class_double},
     {""},
-#line 70 "accessor_class_list.gperf"
+#line 71 "accessor_class_list.gperf"
     {"data_g2simple_packing_with_preprocessing", &grib_accessor_class_data_g2simple_packing_with_preprocessing},
     {""}, {""}, {""}, {""}, {""}, {""},
-#line 129 "accessor_class_list.gperf"
+#line 130 "accessor_class_list.gperf"
     {"headers_only", &grib_accessor_class_headers_only},
     {""}, {""}, {""}, {""},
-#line 125 "accessor_class_list.gperf"
+#line 126 "accessor_class_list.gperf"
     {"global_gaussian", &grib_accessor_class_global_gaussian},
     {""}, {""}, {""}, {""}, {""},
-#line 63 "accessor_class_list.gperf"
+#line 64 "accessor_class_list.gperf"
     {"data_g1shsimple_packing", &grib_accessor_class_data_g1shsimple_packing},
     {""},
-#line 191 "accessor_class_list.gperf"
+#line 192 "accessor_class_list.gperf"
     {"sexagesimal2decimal", &grib_accessor_class_sexagesimal2decimal},
-#line 93 "accessor_class_list.gperf"
+#line 94 "accessor_class_list.gperf"
     {"g1area", &grib_accessor_class_g1area},
     {""},
-#line 95 "accessor_class_list.gperf"
+#line 96 "accessor_class_list.gperf"
     {"g1date", &grib_accessor_class_g1date},
-#line 154 "accessor_class_list.gperf"
+#line 155 "accessor_class_list.gperf"
     {"lookup", &grib_accessor_class_lookup},
-#line 94 "accessor_class_list.gperf"
+#line 95 "accessor_class_list.gperf"
     {"g1bitmap", &grib_accessor_class_g1bitmap},
     {""},
-#line 213 "accessor_class_list.gperf"
+#line 214 "accessor_class_list.gperf"
     {"uint16", &grib_accessor_class_uint16},
     {""},
-#line 153 "accessor_class_list.gperf"
+#line 154 "accessor_class_list.gperf"
     {"longitudes", &grib_accessor_class_longitudes},
     {""}, {""}, {""},
-#line 19 "accessor_class_list.gperf"
+#line 20 "accessor_class_list.gperf"
     {"blob", &grib_accessor_class_blob},
-#line 109 "accessor_class_list.gperf"
+#line 110 "accessor_class_list.gperf"
     {"g2_mars_labeling", &grib_accessor_class_g2_mars_labeling},
-#line 92 "accessor_class_list.gperf"
+#line 93 "accessor_class_list.gperf"
     {"g1_section4_length", &grib_accessor_class_g1_section4_length},
-#line 91 "accessor_class_list.gperf"
+#line 92 "accessor_class_list.gperf"
     {"g1_message_length", &grib_accessor_class_g1_message_length},
-#line 62 "accessor_class_list.gperf"
+#line 63 "accessor_class_list.gperf"
     {"data_g1secondary_bitmap", &grib_accessor_class_data_g1secondary_bitmap},
-#line 130 "accessor_class_list.gperf"
+#line 131 "accessor_class_list.gperf"
     {"ibmfloat", &grib_accessor_class_ibmfloat},
     {""}, {""},
-#line 64 "accessor_class_list.gperf"
+#line 65 "accessor_class_list.gperf"
     {"data_g1simple_packing", &grib_accessor_class_data_g1simple_packing},
-#line 57 "accessor_class_list.gperf"
+#line 58 "accessor_class_list.gperf"
     {"data_g1complex_packing", &grib_accessor_class_data_g1complex_packing},
-#line 214 "accessor_class_list.gperf"
+#line 215 "accessor_class_list.gperf"
     {"uint16_little_endian", &grib_accessor_class_uint16_little_endian},
     {""}, {""}, {""},
-#line 103 "accessor_class_list.gperf"
+#line 104 "accessor_class_list.gperf"
     {"g1p1p2", &grib_accessor_class_g1p1p2},
-#line 179 "accessor_class_list.gperf"
+#line 180 "accessor_class_list.gperf"
     {"raw", &grib_accessor_class_raw},
-#line 60 "accessor_class_list.gperf"
+#line 61 "accessor_class_list.gperf"
     {"data_g1second_order_general_packing", &grib_accessor_class_data_g1second_order_general_packing},
-#line 105 "accessor_class_list.gperf"
+#line 106 "accessor_class_list.gperf"
     {"g1step_range", &grib_accessor_class_g1step_range},
     {""},
-#line 61 "accessor_class_list.gperf"
+#line 62 "accessor_class_list.gperf"
     {"data_g1second_order_row_by_row_packing", &grib_accessor_class_data_g1second_order_row_by_row_packing},
-#line 226 "accessor_class_list.gperf"
+#line 227 "accessor_class_list.gperf"
     {"values", &grib_accessor_class_values},
     {""},
-#line 14 "accessor_class_list.gperf"
+#line 15 "accessor_class_list.gperf"
     {"assert", &grib_accessor_class_assert},
-#line 58 "accessor_class_list.gperf"
+#line 59 "accessor_class_list.gperf"
     {"data_g1second_order_constant_width_packing", &grib_accessor_class_data_g1second_order_constant_width_packing},
     {""},
-#line 59 "accessor_class_list.gperf"
+#line 60 "accessor_class_list.gperf"
     {"data_g1second_order_general_extended_packing", &grib_accessor_class_data_g1second_order_general_extended_packing},
-#line 183 "accessor_class_list.gperf"
+#line 184 "accessor_class_list.gperf"
     {"scale", &grib_accessor_class_scale},
-#line 211 "accessor_class_list.gperf"
+#line 212 "accessor_class_list.gperf"
     {"transient", &grib_accessor_class_transient},
     {""}, {""}, {""},
-#line 224 "accessor_class_list.gperf"
-    {"validity_date", &grib_accessor_class_validity_date},
 #line 225 "accessor_class_list.gperf"
+    {"validity_date", &grib_accessor_class_validity_date},
+#line 226 "accessor_class_list.gperf"
     {"validity_time", &grib_accessor_class_validity_time},
-#line 180 "accessor_class_list.gperf"
+#line 181 "accessor_class_list.gperf"
     {"rdbtime_guess_date", &grib_accessor_class_rdbtime_guess_date},
-#line 100 "accessor_class_list.gperf"
+#line 101 "accessor_class_list.gperf"
     {"g1monthlydate", &grib_accessor_class_g1monthlydate},
     {""},
-#line 212 "accessor_class_list.gperf"
+#line 213 "accessor_class_list.gperf"
     {"transient_darray", &grib_accessor_class_transient_darray},
-#line 53 "accessor_class_list.gperf"
+#line 54 "accessor_class_list.gperf"
     {"data_ccsds_packing", &grib_accessor_class_data_ccsds_packing},
     {""},
-#line 182 "accessor_class_list.gperf"
+#line 183 "accessor_class_list.gperf"
     {"round", &grib_accessor_class_round},
-#line 228 "accessor_class_list.gperf"
+#line 229 "accessor_class_list.gperf"
     {"vector", &grib_accessor_class_vector},
-#line 22 "accessor_class_list.gperf"
+#line 23 "accessor_class_list.gperf"
     {"bufr_clear_tables", &grib_accessor_class_bufr_clear_tables},
     {""},
-#line 128 "accessor_class_list.gperf"
+#line 129 "accessor_class_list.gperf"
     {"hash_array", &grib_accessor_class_hash_array},
     {""}, {""},
-#line 42 "accessor_class_list.gperf"
+#line 43 "accessor_class_list.gperf"
     {"concept", &grib_accessor_class_concept},
-#line 97 "accessor_class_list.gperf"
+#line 98 "accessor_class_list.gperf"
     {"g1end_of_interval_monthly", &grib_accessor_class_g1end_of_interval_monthly},
     {""}, {""}, {""}, {""},
-#line 85 "accessor_class_list.gperf"
+#line 86 "accessor_class_list.gperf"
     {"evaluate", &grib_accessor_class_evaluate},
-#line 47 "accessor_class_list.gperf"
+#line 48 "accessor_class_list.gperf"
     {"data_2order_packing", &grib_accessor_class_data_2order_packing},
-#line 75 "accessor_class_list.gperf"
+#line 76 "accessor_class_list.gperf"
     {"data_sh_packed", &grib_accessor_class_data_sh_packed},
-#line 89 "accessor_class_list.gperf"
+#line 90 "accessor_class_list.gperf"
     {"g1_half_byte_codeflag", &grib_accessor_class_g1_half_byte_codeflag},
     {""},
-#line 120 "accessor_class_list.gperf"
+#line 121 "accessor_class_list.gperf"
     {"gaussian_grid_name", &grib_accessor_class_gaussian_grid_name},
-#line 205 "accessor_class_list.gperf"
+#line 206 "accessor_class_list.gperf"
     {"suppressed", &grib_accessor_class_suppressed},
-#line 48 "accessor_class_list.gperf"
+#line 49 "accessor_class_list.gperf"
     {"data_2order_packing_count", &grib_accessor_class_data_2order_packing_count},
     {""},
-#line 26 "accessor_class_list.gperf"
+#line 27 "accessor_class_list.gperf"
     {"bufr_elements_table", &grib_accessor_class_bufr_elements_table},
     {""},
-#line 199 "accessor_class_list.gperf"
+#line 200 "accessor_class_list.gperf"
     {"spectral_truncation", &grib_accessor_class_spectral_truncation},
     {""},
-#line 43 "accessor_class_list.gperf"
+#line 44 "accessor_class_list.gperf"
     {"constant", &grib_accessor_class_constant},
-#line 126 "accessor_class_list.gperf"
+#line 127 "accessor_class_list.gperf"
     {"group", &grib_accessor_class_group},
-#line 190 "accessor_class_list.gperf"
+#line 191 "accessor_class_list.gperf"
     {"select_step_template", &grib_accessor_class_select_step_template},
     {""},
-#line 176 "accessor_class_list.gperf"
+#line 177 "accessor_class_list.gperf"
     {"padtoeven", &grib_accessor_class_padtoeven},
     {""}, {""}, {""},
-#line 144 "accessor_class_list.gperf"
+#line 145 "accessor_class_list.gperf"
     {"label", &grib_accessor_class_label},
     {""},
-#line 157 "accessor_class_list.gperf"
-    {"md5", &grib_accessor_class_md5},
-#line 166 "accessor_class_list.gperf"
-    {"number_of_values", &grib_accessor_class_number_of_values},
 #line 158 "accessor_class_list.gperf"
+    {"md5", &grib_accessor_class_md5},
+#line 167 "accessor_class_list.gperf"
+    {"number_of_values", &grib_accessor_class_number_of_values},
+#line 159 "accessor_class_list.gperf"
     {"message", &grib_accessor_class_message},
     {""},
-#line 168 "accessor_class_list.gperf"
+#line 169 "accessor_class_list.gperf"
     {"octahedral_gaussian", &grib_accessor_class_octahedral_gaussian},
-#line 155 "accessor_class_list.gperf"
-    {"mars_param", &grib_accessor_class_mars_param},
 #line 156 "accessor_class_list.gperf"
+    {"mars_param", &grib_accessor_class_mars_param},
+#line 157 "accessor_class_list.gperf"
     {"mars_step", &grib_accessor_class_mars_step},
     {""}, {""},
-#line 172 "accessor_class_list.gperf"
+#line 173 "accessor_class_list.gperf"
     {"pack_bufr_values", &grib_accessor_class_pack_bufr_values},
-#line 163 "accessor_class_list.gperf"
+#line 164 "accessor_class_list.gperf"
     {"number_of_coded_values", &grib_accessor_class_number_of_coded_values},
     {""}, {""}, {""},
-#line 196 "accessor_class_list.gperf"
+#line 197 "accessor_class_list.gperf"
     {"smart_table", &grib_accessor_class_smart_table},
     {""}, {""}, {""},
-#line 167 "accessor_class_list.gperf"
+#line 168 "accessor_class_list.gperf"
     {"number_of_values_data_raw_packing", &grib_accessor_class_number_of_values_data_raw_packing},
     {""},
-#line 38 "accessor_class_list.gperf"
+#line 39 "accessor_class_list.gperf"
     {"codeflag", &grib_accessor_class_codeflag},
-#line 197 "accessor_class_list.gperf"
+#line 198 "accessor_class_list.gperf"
     {"smart_table_column", &grib_accessor_class_smart_table_column},
     {""},
-#line 132 "accessor_class_list.gperf"
+#line 133 "accessor_class_list.gperf"
     {"ifs_param", &grib_accessor_class_ifs_param},
-#line 44 "accessor_class_list.gperf"
+#line 45 "accessor_class_list.gperf"
     {"count_file", &grib_accessor_class_count_file},
     {""},
-#line 12 "accessor_class_list.gperf"
+#line 13 "accessor_class_list.gperf"
     {"array", &grib_accessor_class_array},
-#line 160 "accessor_class_list.gperf"
+#line 161 "accessor_class_list.gperf"
     {"missing", &grib_accessor_class_missing},
     {""},
-#line 36 "accessor_class_list.gperf"
+#line 37 "accessor_class_list.gperf"
     {"change_scanning_direction", &grib_accessor_class_change_scanning_direction},
     {""},
-#line 138 "accessor_class_list.gperf"
+#line 139 "accessor_class_list.gperf"
     {"int64_little_endian", &grib_accessor_class_int64_little_endian},
-#line 39 "accessor_class_list.gperf"
+#line 40 "accessor_class_list.gperf"
     {"codetable", &grib_accessor_class_codetable},
-#line 159 "accessor_class_list.gperf"
+#line 160 "accessor_class_list.gperf"
     {"message_copy", &grib_accessor_class_message_copy},
-#line 30 "accessor_class_list.gperf"
+#line 31 "accessor_class_list.gperf"
     {"bufr_group", &grib_accessor_class_bufr_group},
     {""}, {""}, {""}, {""}, {""},
-#line 40 "accessor_class_list.gperf"
+#line 41 "accessor_class_list.gperf"
     {"codetable_title", &grib_accessor_class_codetable_title},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 150 "accessor_class_list.gperf"
+#line 151 "accessor_class_list.gperf"
     {"local_definition", &grib_accessor_class_local_definition},
     {""}, {""}, {""}, {""},
-#line 96 "accessor_class_list.gperf"
+#line 97 "accessor_class_list.gperf"
     {"g1day_of_the_year_date", &grib_accessor_class_g1day_of_the_year_date},
     {""}, {""}, {""}, {""},
-#line 29 "accessor_class_list.gperf"
+#line 30 "accessor_class_list.gperf"
     {"bufr_extract_subsets", &grib_accessor_class_bufr_extract_subsets},
     {""}, {""}, {""}, {""},
-#line 27 "accessor_class_list.gperf"
+#line 28 "accessor_class_list.gperf"
     {"bufr_extract_area_subsets", &grib_accessor_class_bufr_extract_area_subsets},
-#line 134 "accessor_class_list.gperf"
+#line 135 "accessor_class_list.gperf"
     {"int16_little_endian", &grib_accessor_class_int16_little_endian},
-#line 41 "accessor_class_list.gperf"
+#line 42 "accessor_class_list.gperf"
     {"codetable_units", &grib_accessor_class_codetable_units},
     {""},
-#line 28 "accessor_class_list.gperf"
+#line 29 "accessor_class_list.gperf"
     {"bufr_extract_datetime_subsets", &grib_accessor_class_bufr_extract_datetime_subsets},
     {""}, {""},
-#line 111 "accessor_class_list.gperf"
+#line 112 "accessor_class_list.gperf"
     {"g2bitmap_present", &grib_accessor_class_g2bitmap_present},
     {""}, {""}, {""}, {""}, {""}, {""},
-#line 227 "accessor_class_list.gperf"
+#line 228 "accessor_class_list.gperf"
     {"variable", &grib_accessor_class_variable},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""},
-#line 152 "accessor_class_list.gperf"
+#line 153 "accessor_class_list.gperf"
     {"long_vector", &grib_accessor_class_long_vector},
     {""}, {""},
-#line 148 "accessor_class_list.gperf"
+#line 149 "accessor_class_list.gperf"
     {"latlonvalues", &grib_accessor_class_latlonvalues},
     {""},
-#line 147 "accessor_class_list.gperf"
+#line 148 "accessor_class_list.gperf"
     {"latlon_increment", &grib_accessor_class_latlon_increment},
     {""}, {""}, {""},
-#line 46 "accessor_class_list.gperf"
+#line 47 "accessor_class_list.gperf"
     {"count_total", &grib_accessor_class_count_total},
     {""}, {""}, {""}, {""}, {""}, {""},
-#line 143 "accessor_class_list.gperf"
+#line 144 "accessor_class_list.gperf"
     {"ksec1expver", &grib_accessor_class_ksec1expver},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 136 "accessor_class_list.gperf"
+#line 137 "accessor_class_list.gperf"
     {"int32_little_endian", &grib_accessor_class_int32_little_endian},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""},
-#line 79 "accessor_class_list.gperf"
+#line 80 "accessor_class_list.gperf"
     {"decimal_precision", &grib_accessor_class_decimal_precision},
     {""}, {""}, {""},
-#line 98 "accessor_class_list.gperf"
+#line 99 "accessor_class_list.gperf"
     {"g1fcperiod", &grib_accessor_class_g1fcperiod},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""},
-#line 90 "accessor_class_list.gperf"
+#line 91 "accessor_class_list.gperf"
     {"g1_increment", &grib_accessor_class_g1_increment},
     {""}, {""}, {""}, {""},
-#line 184 "accessor_class_list.gperf"
+#line 185 "accessor_class_list.gperf"
     {"scale_values", &grib_accessor_class_scale_values},
     {""},
-#line 149 "accessor_class_list.gperf"
+#line 150 "accessor_class_list.gperf"
     {"library_version", &grib_accessor_class_library_version},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""},
-#line 106 "accessor_class_list.gperf"
+#line 107 "accessor_class_list.gperf"
     {"g1verificationdate", &grib_accessor_class_g1verificationdate},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 37 "accessor_class_list.gperf"
+#line 38 "accessor_class_list.gperf"
     {"check_internal_version", &grib_accessor_class_check_internal_version},
-#line 116 "accessor_class_list.gperf"
+#line 117 "accessor_class_list.gperf"
     {"g2level", &grib_accessor_class_g2level},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 221 "accessor_class_list.gperf"
+#line 222 "accessor_class_list.gperf"
     {"unpack_bufr_values", &grib_accessor_class_unpack_bufr_values},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 10 "accessor_class_list.gperf"
+#line 11 "accessor_class_list.gperf"
     {"abstract_vector", &grib_accessor_class_abstract_vector},
     {""}, {""}, {""}, {""}, {""},
-#line 88 "accessor_class_list.gperf"
+#line 89 "accessor_class_list.gperf"
     {"from_scale_factor_scaled_value", &grib_accessor_class_from_scale_factor_scaled_value},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""},
-#line 45 "accessor_class_list.gperf"
+#line 46 "accessor_class_list.gperf"
     {"count_missing", &grib_accessor_class_count_missing},
     {""}, {""},
-#line 169 "accessor_class_list.gperf"
+#line 170 "accessor_class_list.gperf"
     {"octect_number", &grib_accessor_class_octect_number},
     {""},
-#line 9 "accessor_class_list.gperf"
+#line 10 "accessor_class_list.gperf"
     {"abstract_long_vector", &grib_accessor_class_abstract_long_vector},
     {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 102 "accessor_class_list.gperf"
+#line 103 "accessor_class_list.gperf"
     {"g1number_of_coded_values_sh_simple", &grib_accessor_class_g1number_of_coded_values_sh_simple},
-#line 101 "accessor_class_list.gperf"
+#line 102 "accessor_class_list.gperf"
     {"g1number_of_coded_values_sh_complex", &grib_accessor_class_g1number_of_coded_values_sh_complex},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
-#line 107 "accessor_class_list.gperf"
+#line 108 "accessor_class_list.gperf"
     {"g2_chemical", &grib_accessor_class_g2_chemical},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -668,10 +668,10 @@ static struct accessor_class_hash classes[] =
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""},
-#line 104 "accessor_class_list.gperf"
+#line 105 "accessor_class_list.gperf"
     {"g1param", &grib_accessor_class_g1param},
     {""}, {""}, {""}, {""}, {""},
-#line 181 "accessor_class_list.gperf"
+#line 182 "accessor_class_list.gperf"
     {"reference_value_error", &grib_accessor_class_reference_value_error},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
@@ -697,14 +697,14 @@ static struct accessor_class_hash classes[] =
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""}, {""},
     {""}, {""}, {""}, {""}, {""},
-#line 99 "accessor_class_list.gperf"
+#line 100 "accessor_class_list.gperf"
     {"g1forecastmonth", &grib_accessor_class_g1forecastmonth}
   };
 
-struct accessor_class_hash *
+const struct accessor_class_hash *
 grib_accessor_classes_hash (const char *str, unsigned int len)
 {
-    const int key = grib_accessor_classes_get_id (str, len);
+    register const int key = grib_accessor_classes_get_id (str, len);
 
 #ifdef DEBUG
     {
diff --git a/src/make_accessor_class_hash.ksh b/src/make_accessor_class_hash.ksh
index 49ccd2cf1..91be79748 100755
--- a/src/make_accessor_class_hash.ksh
+++ b/src/make_accessor_class_hash.ksh
@@ -14,5 +14,6 @@ cat grib_accessor_factory_hash_list | sed 's/\/\*/#/g' >> accessor_class_list.gp
 
 # editing grib_accessor_classes_hash.c
 
-gperf -W classes -t -G -H grib_accessor_classes_get_id -N grib_accessor_classes_hash -m 1 -j 1 accessor_class_list.gperf | sed s/__inline//g | sed s/inline//g > grib_accessor_classes_hash.c
+gperf -C -W classes -t -G -H grib_accessor_classes_get_id -N grib_accessor_classes_hash -m 1 -j 1 accessor_class_list.gperf |\
+    sed s/__inline//g | sed s/inline//g > grib_accessor_classes_hash.c