trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From z..@apache.org
Subject [2/3] git commit: TS-977 RecCore: remove unnecessary IOCORE_* wrapper on RecCore API
Date Tue, 15 Jan 2013 06:01:34 GMT
TS-977 RecCore: remove unnecessary IOCORE_* wrapper on RecCore API

Call RecCore API directly is mush better and clear than IOCORE_* wrapper.

Signed-off-by: Yunkai Zhang <qiushu.zyk@taobao.com>
Signed-off-by: Zhao Yongming <ming.zym@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fc739109
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fc739109
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fc739109

Branch: refs/heads/master
Commit: fc7391096d5b9ea68ea9392e7cd1cea5455f0ba1
Parents: 3321de5
Author: Yunkai Zhang <qiushu.zyk@taobao.com>
Authored: Thu Jan 10 22:43:43 2013 +0800
Committer: Zhao Yongming <ming.zym@gmail.com>
Committed: Tue Jan 15 13:42:18 2013 +0800

----------------------------------------------------------------------
 iocore/aio/AIO.cc                  |    2 +-
 iocore/cache/Cache.cc              |   68 +++++++++++++++---------------
 iocore/cache/CacheHosting.cc       |   34 ++++++++--------
 iocore/cache/P_CacheHosting.h      |    2 +-
 iocore/cache/Store.cc              |    6 +-
 iocore/cluster/ClusterConfig.cc    |    2 +-
 iocore/cluster/ClusterMachine.cc   |    2 +-
 iocore/cluster/ClusterProcessor.cc |   46 ++++++++++----------
 iocore/dns/DNS.cc                  |   28 ++++++------
 iocore/dns/SplitDNS.cc             |    2 +-
 iocore/eventsystem/EventSystem.cc  |    2 +-
 iocore/eventsystem/P_EventSystem.h |   28 -------------
 iocore/hostdb/HostDB.cc            |   46 ++++++++++----------
 iocore/hostdb/MultiCache.cc        |    2 +-
 iocore/net/Connection.cc           |    2 +-
 iocore/net/Net.cc                  |    6 +-
 iocore/net/P_UnixNet.h             |    6 +-
 iocore/net/SSLConfig.cc            |   44 ++++++++++----------
 iocore/net/SSLUtils.cc             |    4 +-
 iocore/net/Socks.cc                |   22 +++++-----
 iocore/net/UnixNetProcessor.cc     |    6 +-
 lib/records/I_RecCore.h            |    8 +++-
 22 files changed, 173 insertions(+), 195 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/aio/AIO.cc
----------------------------------------------------------------------
diff --git a/iocore/aio/AIO.cc b/iocore/aio/AIO.cc
index e9202e4..3086f0c 100644
--- a/iocore/aio/AIO.cc
+++ b/iocore/aio/AIO.cc
@@ -159,7 +159,7 @@ ink_aio_init(ModuleVersion v)
   memset(&aio_reqs, 0, MAX_DISKS_POSSIBLE * sizeof(AIO_Reqs *));
   ink_mutex_init(&insert_mutex, NULL);
 
-  IOCORE_ReadConfigInteger(cache_config_threads_per_disk, "proxy.config.cache.threads_per_disk");
+  REC_ReadConfigInteger(cache_config_threads_per_disk, "proxy.config.cache.threads_per_disk");
 }
 
 int

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cache/Cache.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Cache.cc b/iocore/cache/Cache.cc
index da3c7e1..d3f4f23 100644
--- a/iocore/cache/Cache.cc
+++ b/iocore/cache/Cache.cc
@@ -176,7 +176,7 @@ cache_bytes_used(int volume)
     start = volume - 1;
     end = volume;
   }
-  
+
   for (int i = start; i < end; i++) {
     if (!DISK_BAD(gvol[i]->disk)) {
       if (!gvol[i]->header->cycle)
@@ -214,7 +214,7 @@ validate_rww(int new_value)
   if (new_value) {
     float http_bg_fill;
 
-    IOCORE_ReadConfigFloat(http_bg_fill, "proxy.config.http.background_fill_completed_threshold");
+    REC_ReadConfigFloat(http_bg_fill, "proxy.config.http.background_fill_completed_threshold");
     if (http_bg_fill > 0.0) {
       Note("to enable reading while writing a document, %s should be 0.0: read while writing disabled",
            "proxy.config.http.background_fill_completed_threshold");
@@ -877,7 +877,7 @@ CacheProcessor::cacheInitialized()
       switch (cache_config_ram_cache_compress) {
         default:
           Fatal("unknown RAM cache compression type: %d", cache_config_ram_cache_compress);
-        case CACHE_COMPRESSION_NONE: 
+        case CACHE_COMPRESSION_NONE:
         case CACHE_COMPRESSION_FASTLZ:
           break;
         case CACHE_COMPRESSION_LIBZ:
@@ -1693,13 +1693,13 @@ AIO_Callback_handler::handle_disk_failure(int event, void *data) {
         char message[128];
         snprintf(message, sizeof(message), "Error accessing Disk %s", d->path);
         Warning("%s", message);
-        IOCORE_SignalManager(REC_SIGNAL_CACHE_WARNING, message);
+        REC_SignalManager(REC_SIGNAL_CACHE_WARNING, message);
       } else if (!DISK_BAD_SIGNALLED(d)) {
 
         char message[128];
         snprintf(message, sizeof(message), "too many errors accessing disk %s: declaring disk bad", d->path);
         Warning("%s", message);
-        IOCORE_SignalManager(REC_SIGNAL_CACHE_ERROR, message);
+        REC_SignalManager(REC_SIGNAL_CACHE_ERROR, message);
         /* subtract the disk space that was being used from  the cache size stat */
         // dir entries stat
         int p;
@@ -1794,7 +1794,7 @@ Cache::open(bool clear, bool fix) {
   total_nvol = 0;
   total_good_nvol = 0;
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_min_average_object_size, "proxy.config.cache.min_average_object_size");
+  REC_EstablishStaticConfigInt32(cache_config_min_average_object_size, "proxy.config.cache.min_average_object_size");
   Debug("cache_init", "Cache::open - proxy.config.cache.min_average_object_size = %d",
         (int)cache_config_min_average_object_size);
 
@@ -2525,7 +2525,7 @@ create_volume(int volume_number, off_t size_in_blocks, int scheme, CacheVol *cp)
       full_disks += 1;
       if (full_disks == gndisks) {
         char config_file[PATH_NAME_MAX];
-        IOCORE_ReadConfigString(config_file, "proxy.config.cache.volume_filename", PATH_NAME_MAX);
+        REC_ReadConfigString(config_file, "proxy.config.cache.volume_filename", PATH_NAME_MAX);
         if (cp->size)
           Warning("not enough space to increase volume: [%d] to size: [%" PRId64 "]",
                   volume_number, (int64_t)((to_create + cp->size) >> (20 - STORE_BLOCK_SHIFT)));
@@ -2677,44 +2677,44 @@ ink_cache_init(ModuleVersion v)
 
   cache_rsb = RecAllocateRawStatBlock((int) cache_stat_count);
 
-  IOCORE_EstablishStaticConfigInteger(cache_config_ram_cache_size, "proxy.config.cache.ram_cache.size");
+  REC_EstablishStaticConfigInteger(cache_config_ram_cache_size, "proxy.config.cache.ram_cache.size");
   Debug("cache_init", "proxy.config.cache.ram_cache.size = %" PRId64 " = %" PRId64 "Mb",
         cache_config_ram_cache_size, cache_config_ram_cache_size / (1024 * 1024));
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_ram_cache_algorithm, "proxy.config.cache.ram_cache.algorithm");
-  IOCORE_EstablishStaticConfigInt32(cache_config_ram_cache_compress, "proxy.config.cache.ram_cache.compress");
-  IOCORE_EstablishStaticConfigInt32(cache_config_ram_cache_compress_percent, "proxy.config.cache.ram_cache.compress_percent");
-  IOCORE_EstablishStaticConfigInt32(cache_config_ram_cache_use_seen_filter, "proxy.config.cache.ram_cache.use_seen_filter");
+  REC_EstablishStaticConfigInt32(cache_config_ram_cache_algorithm, "proxy.config.cache.ram_cache.algorithm");
+  REC_EstablishStaticConfigInt32(cache_config_ram_cache_compress, "proxy.config.cache.ram_cache.compress");
+  REC_EstablishStaticConfigInt32(cache_config_ram_cache_compress_percent, "proxy.config.cache.ram_cache.compress_percent");
+  REC_EstablishStaticConfigInt32(cache_config_ram_cache_use_seen_filter, "proxy.config.cache.ram_cache.use_seen_filter");
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_http_max_alts, "proxy.config.cache.limits.http.max_alts");
+  REC_EstablishStaticConfigInt32(cache_config_http_max_alts, "proxy.config.cache.limits.http.max_alts");
   Debug("cache_init", "proxy.config.cache.limits.http.max_alts = %d", cache_config_http_max_alts);
 
-  IOCORE_EstablishStaticConfigInteger(cache_config_ram_cache_cutoff, "proxy.config.cache.ram_cache_cutoff");
+  REC_EstablishStaticConfigInteger(cache_config_ram_cache_cutoff, "proxy.config.cache.ram_cache_cutoff");
   Debug("cache_init", "cache_config_ram_cache_cutoff = %" PRId64 " = %" PRId64 "Mb",
         cache_config_ram_cache_cutoff, cache_config_ram_cache_cutoff / (1024 * 1024));
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_permit_pinning, "proxy.config.cache.permit.pinning");
+  REC_EstablishStaticConfigInt32(cache_config_permit_pinning, "proxy.config.cache.permit.pinning");
   Debug("cache_init", "proxy.config.cache.permit.pinning = %d", cache_config_permit_pinning);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_dir_sync_frequency, "proxy.config.cache.dir.sync_frequency");
+  REC_EstablishStaticConfigInt32(cache_config_dir_sync_frequency, "proxy.config.cache.dir.sync_frequency");
   Debug("cache_init", "proxy.config.cache.dir.sync_frequency = %d", cache_config_dir_sync_frequency);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_vary_on_user_agent, "proxy.config.cache.vary_on_user_agent");
+  REC_EstablishStaticConfigInt32(cache_config_vary_on_user_agent, "proxy.config.cache.vary_on_user_agent");
   Debug("cache_init", "proxy.config.cache.vary_on_user_agent = %d", cache_config_vary_on_user_agent);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_select_alternate, "proxy.config.cache.select_alternate");
+  REC_EstablishStaticConfigInt32(cache_config_select_alternate, "proxy.config.cache.select_alternate");
   Debug("cache_init", "proxy.config.cache.select_alternate = %d", cache_config_select_alternate);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_max_doc_size, "proxy.config.cache.max_doc_size");
+  REC_EstablishStaticConfigInt32(cache_config_max_doc_size, "proxy.config.cache.max_doc_size");
   Debug("cache_init", "proxy.config.cache.max_doc_size = %d = %dMb",
         cache_config_max_doc_size, cache_config_max_doc_size / (1024 * 1024));
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_mutex_retry_delay, "proxy.config.cache.mutex_retry_delay");
+  REC_EstablishStaticConfigInt32(cache_config_mutex_retry_delay, "proxy.config.cache.mutex_retry_delay");
   Debug("cache_init", "proxy.config.cache.mutex_retry_delay = %dms", cache_config_mutex_retry_delay);
 
   // This is just here to make sure IOCORE "standalone" works, it's usually configured in RecordsConfig.cc
-  IOCORE_RegisterConfigString(RECT_CONFIG, "proxy.config.config_dir", TS_BUILD_SYSCONFDIR, RECU_DYNAMIC, RECC_NULL, NULL);
-  IOCORE_ReadConfigString(cache_system_config_directory, "proxy.config.config_dir", PATH_NAME_MAX);
+  RecRegisterConfigString(RECT_CONFIG, "proxy.config.config_dir", TS_BUILD_SYSCONFDIR, RECU_DYNAMIC, RECC_NULL, NULL);
+  REC_ReadConfigString(cache_system_config_directory, "proxy.config.config_dir", PATH_NAME_MAX);
   if (cache_system_config_directory[0] != '/') {
     // Not an absolute path so use system one
     Layout::get()->relative(cache_system_config_directory, sizeof(cache_system_config_directory), cache_system_config_directory);
@@ -2733,15 +2733,15 @@ ink_cache_init(ModuleVersion v)
   }
   // TODO: These are left here, since they are only registered if HIT_EVACUATE is enabled.
 #ifdef HIT_EVACUATE
-  IOCORE_EstablishStaticConfigInt32(cache_config_hit_evacuate_percent, "proxy.config.cache.hit_evacuate_percent");
+  REC_EstablishStaticConfigInt32(cache_config_hit_evacuate_percent, "proxy.config.cache.hit_evacuate_percent");
   Debug("cache_init", "proxy.config.cache.hit_evacuate_percent = %d", cache_config_hit_evacuate_percent);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_hit_evacuate_size_limit, "proxy.config.cache.hit_evacuate_size_limit");
+  REC_EstablishStaticConfigInt32(cache_config_hit_evacuate_size_limit, "proxy.config.cache.hit_evacuate_size_limit");
   Debug("cache_init", "proxy.config.cache.hit_evacuate_size_limit = %d", cache_config_hit_evacuate_size_limit);
 #endif
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_force_sector_size, "proxy.config.cache.force_sector_size");
-  IOCORE_EstablishStaticConfigInt32(cache_config_target_fragment_size, "proxy.config.cache.target_fragment_size");
+  REC_EstablishStaticConfigInt32(cache_config_force_sector_size, "proxy.config.cache.force_sector_size");
+  REC_EstablishStaticConfigInt32(cache_config_target_fragment_size, "proxy.config.cache.target_fragment_size");
 
   if (cache_config_target_fragment_size == 0)
     cache_config_target_fragment_size = DEFAULT_TARGET_FRAGMENT_SIZE;
@@ -2751,25 +2751,25 @@ ink_cache_init(ModuleVersion v)
 
   //  # 0 - MD5 hash
   //  # 1 - MMH hash
-  IOCORE_EstablishStaticConfigInt32(url_hash_method, "proxy.config.cache.url_hash_method");
+  REC_EstablishStaticConfigInt32(url_hash_method, "proxy.config.cache.url_hash_method");
   Debug("cache_init", "proxy.config.cache.url_hash_method = %d", url_hash_method);
 #endif
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_max_disk_errors, "proxy.config.cache.max_disk_errors");
+  REC_EstablishStaticConfigInt32(cache_config_max_disk_errors, "proxy.config.cache.max_disk_errors");
   Debug("cache_init", "proxy.config.cache.max_disk_errors = %d", cache_config_max_disk_errors);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_agg_write_backlog, "proxy.config.cache.agg_write_backlog");
+  REC_EstablishStaticConfigInt32(cache_config_agg_write_backlog, "proxy.config.cache.agg_write_backlog");
   Debug("cache_init", "proxy.config.cache.agg_write_backlog = %d", cache_config_agg_write_backlog);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_enable_checksum, "proxy.config.cache.enable_checksum");
+  REC_EstablishStaticConfigInt32(cache_config_enable_checksum, "proxy.config.cache.enable_checksum");
   Debug("cache_init", "proxy.config.cache.enable_checksum = %d", cache_config_enable_checksum);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_alt_rewrite_max_size, "proxy.config.cache.alt_rewrite_max_size");
+  REC_EstablishStaticConfigInt32(cache_config_alt_rewrite_max_size, "proxy.config.cache.alt_rewrite_max_size");
   Debug("cache_init", "proxy.config.cache.alt_rewrite_max_size = %d", cache_config_alt_rewrite_max_size);
 
-  IOCORE_EstablishStaticConfigInt32(cache_config_read_while_writer, "proxy.config.cache.enable_read_while_writer");
+  REC_EstablishStaticConfigInt32(cache_config_read_while_writer, "proxy.config.cache.enable_read_while_writer");
   cache_config_read_while_writer = validate_rww(cache_config_read_while_writer);
-  IOCORE_RegisterConfigUpdateFunc("proxy.config.cache.enable_read_while_writer", update_cache_config, NULL);
+  REC_RegisterConfigUpdateFunc("proxy.config.cache.enable_read_while_writer", update_cache_config, NULL);
   Debug("cache_init", "proxy.config.cache.enable_read_while_writer = %d", cache_config_read_while_writer);
 
   register_cache_stats(cache_rsb, "proxy.process.cache");
@@ -2784,7 +2784,7 @@ ink_cache_init(ModuleVersion v)
   if (theCacheStore.n_disks == 0) {
     char p[PATH_NAME_MAX + 1];
     snprintf(p, sizeof(p), "%s/", cache_system_config_directory);
-    IOCORE_ReadConfigString(p + strlen(p), "proxy.config.cache.storage_filename", PATH_NAME_MAX - strlen(p) - 1);
+    REC_ReadConfigString(p + strlen(p), "proxy.config.cache.storage_filename", PATH_NAME_MAX - strlen(p) - 1);
     if (p[strlen(p) - 1] == '/' || p[strlen(p) - 1] == '\\') {
       ink_strlcat(p, "storage.config", sizeof(p));
     }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cache/CacheHosting.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/CacheHosting.cc b/iocore/cache/CacheHosting.cc
index c3966b4..bcaa49d 100644
--- a/iocore/cache/CacheHosting.cc
+++ b/iocore/cache/CacheHosting.cc
@@ -202,7 +202,7 @@ CacheHostTable::CacheHostTable(Cache * c, CacheType typ)
   matcher_name = "[CacheHosting]";;
   config_file_path[0] = '\0';
   char *config_file = NULL;
-  IOCORE_ReadConfigStringAlloc(config_file, "proxy.config.cache.hosting_filename");
+  REC_ReadConfigStringAlloc(config_file, "proxy.config.cache.hosting_filename");
   ink_release_assert(config_file != NULL);
   Layout::relative_to(config_file_path, sizeof(config_file_path),
                       cache_system_config_directory, config_file);
@@ -310,7 +310,7 @@ CacheHostTable::BuildTableFromString(char *file_buf)
       if (errPtr != NULL) {
         snprintf(errBuf, sizeof(errBuf), "%s discarding %s entry at line %d : %s",
                  matcher_name, config_file_path, line_num, errPtr);
-        IOCORE_SignalError(errBuf, alarmAlready);
+        REC_SignalError(errBuf, alarmAlready);
         ats_free(current);
       } else {
 
@@ -393,7 +393,7 @@ CacheHostTable::BuildTableFromString(char *file_buf)
     } else {
       snprintf(errBuf, sizeof(errBuf), "%s discarding %s entry with unknown type at line %d",
                matcher_name, config_file_path, current->line_num);
-      IOCORE_SignalError(errBuf, alarmAlready);
+      REC_SignalError(errBuf, alarmAlready);
     }
 
     // Deallocate the parsing structure
@@ -407,7 +407,7 @@ CacheHostTable::BuildTableFromString(char *file_buf)
     snprintf(errBuf, sizeof(errBuf),
              "No Volumes specified for Generic Hostnames for %s documents: %s cache will be disabled", cache_type,
              cache_type);
-    IOCORE_SignalError(errBuf, alarmAlready);
+    REC_SignalError(errBuf, alarmAlready);
   }
 
   ink_assert(second_pass == numEntries);
@@ -465,7 +465,7 @@ CacheHostRecord::Init(CacheType typ)
   }
   if (!num_cachevols) {
     snprintf(err, 1024, "error: No volumes found for Cache Type %d\n", type);
-    IOCORE_SignalError(err, alarmAlready);
+    REC_SignalError(err, alarmAlready);
     return -1;
   }
   vols = (Vol **)ats_malloc(num_vols * sizeof(Vol *));
@@ -492,7 +492,7 @@ CacheHostRecord::Init(matcher_line * line_info, CacheType typ)
   int is_vol_present = 0;
   char config_file[PATH_NAME_MAX];
 
-  IOCORE_ReadConfigString(config_file, "proxy.config.cache.hosting_filename", PATH_NAME_MAX);
+  REC_ReadConfigString(config_file, "proxy.config.cache.hosting_filename", PATH_NAME_MAX);
   type = typ;
   for (i = 0; i < MATCHER_MAX_TOKENS; i++) {
     char *label = line_info->line[0][i];
@@ -518,7 +518,7 @@ CacheHostRecord::Init(matcher_line * line_info, CacheType typ)
             snprintf(err, 1024,
                          "%s discarding %s entry at line %d :%s",
                          "[CacheHosting]", config_file, line_info->line_num, errptr);
-            IOCORE_SignalError(err, alarmAlready);
+            REC_SignalError(err, alarmAlready);
             if (val != NULL) {
               ats_free(val);
             }
@@ -529,7 +529,7 @@ CacheHostRecord::Init(matcher_line * line_info, CacheType typ)
           snprintf(err, 1024,
                        "%s discarding %s entry at line %d : bad token [%c]",
                        "[CacheHosting]", config_file, line_info->line_num, *s);
-          IOCORE_SignalError(err, alarmAlready);
+          REC_SignalError(err, alarmAlready);
           if (val != NULL) {
             ats_free(val);
           }
@@ -567,7 +567,7 @@ CacheHostRecord::Init(matcher_line * line_info, CacheType typ)
             snprintf(err, 1024,
                          "%s discarding %s entry at line %d : bad volume number [%d]",
                          "[CacheHosting]", config_file, line_info->line_num, volume_number);
-            IOCORE_SignalError(err, alarmAlready);
+            REC_SignalError(err, alarmAlready);
             if (val != NULL) {
               ats_free(val);
             }
@@ -588,7 +588,7 @@ CacheHostRecord::Init(matcher_line * line_info, CacheType typ)
     snprintf(err, 1024,
                  "%s discarding %s entry at line %d : bad token [%s]",
                  "[CacheHosting]", config_file, line_info->line_num, label);
-    IOCORE_SignalError(err, alarmAlready);
+    REC_SignalError(err, alarmAlready);
     return -1;
   }
 
@@ -596,7 +596,7 @@ CacheHostRecord::Init(matcher_line * line_info, CacheType typ)
     snprintf(err, 1024,
                  "%s discarding %s entry at line %d : No volumes specified",
                  "[CacheHosting]", config_file, line_info->line_num);
-    IOCORE_SignalError(err, alarmAlready);
+    REC_SignalError(err, alarmAlready);
     return -1;
   }
 
@@ -641,7 +641,7 @@ ConfigVolumes::read_config_file()
   char *config_file = NULL;
   config_file_path[0] = '\0';
 
-  IOCORE_ReadConfigStringAlloc(config_file, "proxy.config.cache.volume_filename");
+  REC_ReadConfigStringAlloc(config_file, "proxy.config.cache.volume_filename");
   ink_release_assert(config_file != NULL);
   Layout::relative_to(config_file_path, sizeof(config_file_path),
                       cache_system_config_directory, config_file);
@@ -743,7 +743,7 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
         if (!(*tmp)) {
           snprintf(errBuf, sizeof(errBuf), "%s discarding %s entry at line %d : Unexpected end of line",
                    matcher_name, config_file_path, line_num);
-          IOCORE_SignalError(errBuf, manager_alarmed);
+          REC_SignalError(errBuf, manager_alarmed);
 
           break;
         }
@@ -787,7 +787,7 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
 
           snprintf(errBuf, sizeof(errBuf), "%s discarding %s entry at line %d : %s [%d]",
                    matcher_name, config_file_path, line_num, err, volume_number);
-          IOCORE_SignalError(errBuf, manager_alarmed);
+          REC_SignalError(errBuf, manager_alarmed);
           state = INK_ERROR;
           break;
         }
@@ -839,7 +839,7 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
             if (state == INK_ERROR_VOLUME || *tmp) {
               snprintf(errBuf, sizeof(errBuf),
                        "Total volume size added upto more than 100 percent,No volumes created");
-              IOCORE_SignalError(errBuf, manager_alarmed);
+              REC_SignalError(errBuf, manager_alarmed);
               break;
             }
           }
@@ -856,14 +856,14 @@ ConfigVolumes::BuildListFromString(char *config_file_path, char *file_buf)
       if (state == INK_ERROR || *tmp) {
         snprintf(errBuf, sizeof(errBuf), "%s discarding %s entry at line %d : Invalid token [%s]",
                  matcher_name, config_file_path, line_num, tmp);
-        IOCORE_SignalError(errBuf, manager_alarmed);
+        REC_SignalError(errBuf, manager_alarmed);
 
         break;
       }
       //added by YTS Team, yamsat for bug id 59632
       if (state == INK_ERROR_VOLUME || *tmp) {
         snprintf(errBuf, sizeof(errBuf), "Total volume size added upto more than 100 percent,No volumes created");
-        IOCORE_SignalError(errBuf, manager_alarmed);
+        REC_SignalError(errBuf, manager_alarmed);
         break;
       }
       // ends here

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cache/P_CacheHosting.h
----------------------------------------------------------------------
diff --git a/iocore/cache/P_CacheHosting.h b/iocore/cache/P_CacheHosting.h
index 55d3994..cd3ca2b 100644
--- a/iocore/cache/P_CacheHosting.h
+++ b/iocore/cache/P_CacheHosting.h
@@ -117,7 +117,7 @@ public:
 
   void register_config_callback(CacheHostTable ** p)
   {
-    IOCORE_RegisterConfigUpdateFunc("proxy.config.cache.hosting_filename", CacheHostTable::config_callback, (void *) p);
+    REC_RegisterConfigUpdateFunc("proxy.config.cache.hosting_filename", CacheHostTable::config_callback, (void *) p);
   }
 
   CacheType type;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cache/Store.cc
----------------------------------------------------------------------
diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc
index 2935f53..e5b9044 100644
--- a/iocore/cache/Store.cc
+++ b/iocore/cache/Store.cc
@@ -261,7 +261,7 @@ Store::read_config(int fd)
     //      initialize_store().
     //
     // ink_strlcpy(p, cache_system_config_directory, sizeof(p));
-    IOCORE_ReadConfigString(storage_file, "proxy.config.cache.storage_filename", PATH_NAME_MAX);
+    REC_ReadConfigString(storage_file, "proxy.config.cache.storage_filename", PATH_NAME_MAX);
     Layout::relative_to(storage_path, PATH_NAME_MAX, Layout::get()->sysconfdir, storage_file);
     Debug("cache_init", "Store::read_config, fd = -1, \"%s\"", storage_path);
 
@@ -312,7 +312,7 @@ Store::read_config(int fd)
     if ((err = ns->init(pp, size))) {
       char buf[4096];
       snprintf(buf, sizeof(buf), "could not initialize storage \"%s\" [%s]", pp, err);
-      IOCORE_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, buf);
+      REC_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, buf);
       Debug("cache_init", "Store::read_config - %s", buf);
       delete ns;
       ats_free(pp);
@@ -716,7 +716,7 @@ Span::init(char *filename, int64_t size)
      * possibly something other than the actual number of blocks, but the
      * code for other arches seems to.  Revisit this, perhaps. */
     blocks = size / STORE_BLOCK_SIZE;
-    
+
     Debug("cache_init", "Span::init physical sectors %" PRId64 " total size %" PRId64 " geometry size %" PRId64 " store blocks %" PRId64 "",
           physsectors, hw_sector_size * physsectors, size, blocks);
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cluster/ClusterConfig.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterConfig.cc b/iocore/cluster/ClusterConfig.cc
index 06e02e9..c3538de 100644
--- a/iocore/cluster/ClusterConfig.cc
+++ b/iocore/cluster/ClusterConfig.cc
@@ -222,7 +222,7 @@ void
 do_machine_config_change(void *d, const char *s)
 {
   char cluster_config_filename[PATH_NAME_MAX] = "";
-  IOCORE_ReadConfigString(cluster_config_filename, s, sizeof(cluster_config_filename) - 1);
+  REC_ReadConfigString(cluster_config_filename, s, sizeof(cluster_config_filename) - 1);
   RecData data;
   data.rec_string = cluster_config_filename;
   machine_config_change(s, RECD_STRING, data, d);

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cluster/ClusterMachine.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterMachine.cc b/iocore/cluster/ClusterMachine.cc
index 056d3a0..81a693b 100644
--- a/iocore/cluster/ClusterMachine.cc
+++ b/iocore/cluster/ClusterMachine.cc
@@ -146,7 +146,7 @@ clusterHandlers(0)
   else
     hostname_len = 0;
 
-  IOCORE_ReadConfigInteger(num_connections, "proxy.config.cluster.num_of_cluster_connections");
+  REC_ReadConfigInteger(num_connections, "proxy.config.cluster.num_of_cluster_connections");
   clusterHandlers = (ClusterHandler **)ats_calloc(num_connections, sizeof(ClusterHandler *));
 }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/cluster/ClusterProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/cluster/ClusterProcessor.cc b/iocore/cluster/ClusterProcessor.cc
index aa2b188..6bc72e8 100644
--- a/iocore/cluster/ClusterProcessor.cc
+++ b/iocore/cluster/ClusterProcessor.cc
@@ -652,16 +652,16 @@ ClusterProcessor::init()
   // Used to call CLUSTER_INCREMENT_DYN_STAT here; switch to SUM_GLOBAL_DYN_STAT
   CLUSTER_SUM_GLOBAL_DYN_STAT(CLUSTER_NODES_STAT, 1);   // one node in cluster, ME
 
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_monitor_enabled, "proxy.config.cluster.load_monitor_enabled");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_ping_message_send_msec_interval, "proxy.config.cluster.ping_send_interval_msecs");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_num_ping_response_buckets, "proxy.config.cluster.ping_response_buckets");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_msecs_per_ping_response_bucket, "proxy.config.cluster.msecs_per_ping_response_bucket");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_ping_latency_threshold_msecs, "proxy.config.cluster.ping_latency_threshold_msecs");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_load_compute_msec_interval, "proxy.config.cluster.load_compute_interval_msecs");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_periodic_msec_interval, "proxy.config.cluster.periodic_timer_interval_msecs");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_ping_history_buf_length, "proxy.config.cluster.ping_history_buf_length");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_load_clear_duration, "proxy.config.cluster.cluster_load_clear_duration");
-  IOCORE_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_load_exceed_duration, "proxy.config.cluster.cluster_load_exceed_duration");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_monitor_enabled, "proxy.config.cluster.load_monitor_enabled");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_ping_message_send_msec_interval, "proxy.config.cluster.ping_send_interval_msecs");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_num_ping_response_buckets, "proxy.config.cluster.ping_response_buckets");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_msecs_per_ping_response_bucket, "proxy.config.cluster.msecs_per_ping_response_bucket");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_ping_latency_threshold_msecs, "proxy.config.cluster.ping_latency_threshold_msecs");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_load_compute_msec_interval, "proxy.config.cluster.load_compute_interval_msecs");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_periodic_msec_interval, "proxy.config.cluster.periodic_timer_interval_msecs");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_ping_history_buf_length, "proxy.config.cluster.ping_history_buf_length");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_load_clear_duration, "proxy.config.cluster.cluster_load_clear_duration");
+  REC_ReadConfigInteger(ClusterLoadMonitor::cf_cluster_load_exceed_duration, "proxy.config.cluster.cluster_load_exceed_duration");
 
   //
   // Configuration callbacks
@@ -669,22 +669,22 @@ ClusterProcessor::init()
   if (cluster_port_number != DEFAULT_CLUSTER_PORT_NUMBER)
     cluster_port = cluster_port_number;
   else {
-    IOCORE_ReadConfigInteger(cluster_port, "proxy.config.cluster.cluster_port");
+    REC_ReadConfigInteger(cluster_port, "proxy.config.cluster.cluster_port");
   }
   if (num_of_cluster_threads == DEFAULT_NUMBER_OF_CLUSTER_THREADS)
-    IOCORE_ReadConfigInteger(num_of_cluster_threads, "proxy.config.cluster.threads");
+    REC_ReadConfigInteger(num_of_cluster_threads, "proxy.config.cluster.threads");
 
-  IOCORE_EstablishStaticConfigInt32(CacheClusterMonitorEnabled, "proxy.config.cluster.enable_monitor");
-  IOCORE_EstablishStaticConfigInt32(CacheClusterMonitorIntervalSecs, "proxy.config.cluster.monitor_interval_secs");
-  IOCORE_ReadConfigInteger(cluster_receive_buffer_size, "proxy.config.cluster.receive_buffer_size");
-  IOCORE_ReadConfigInteger(cluster_send_buffer_size, "proxy.config.cluster.send_buffer_size");
-  IOCORE_ReadConfigInteger(cluster_sockopt_flags, "proxy.config.cluster.sock_option_flag");
-  IOCORE_ReadConfigInteger(cluster_packet_mark, "proxy.config.cluster.sock_packet_mark");
-  IOCORE_ReadConfigInteger(cluster_packet_tos, "proxy.config.cluster.sock_packet_tos");
-  IOCORE_EstablishStaticConfigInt32(RPC_only_CacheCluster, "proxy.config.cluster.rpc_cache_cluster");
+  REC_EstablishStaticConfigInt32(CacheClusterMonitorEnabled, "proxy.config.cluster.enable_monitor");
+  REC_EstablishStaticConfigInt32(CacheClusterMonitorIntervalSecs, "proxy.config.cluster.monitor_interval_secs");
+  REC_ReadConfigInteger(cluster_receive_buffer_size, "proxy.config.cluster.receive_buffer_size");
+  REC_ReadConfigInteger(cluster_send_buffer_size, "proxy.config.cluster.send_buffer_size");
+  REC_ReadConfigInteger(cluster_sockopt_flags, "proxy.config.cluster.sock_option_flag");
+  REC_ReadConfigInteger(cluster_packet_mark, "proxy.config.cluster.sock_packet_mark");
+  REC_ReadConfigInteger(cluster_packet_tos, "proxy.config.cluster.sock_packet_tos");
+  REC_EstablishStaticConfigInt32(RPC_only_CacheCluster, "proxy.config.cluster.rpc_cache_cluster");
 
   int cluster_type = 0;
-  IOCORE_ReadConfigInteger(cluster_type, "proxy.local.cluster.type");
+  REC_ReadConfigInteger(cluster_type, "proxy.local.cluster.type");
 
   create_this_cluster_machine();
 #ifdef NON_MODULAR
@@ -735,11 +735,11 @@ ClusterProcessor::start()
     for (int i = 0; i < eventProcessor.n_threads_for_type[ET_CLUSTER]; i++) {
       initialize_thread_for_net(eventProcessor.eventthread[ET_CLUSTER][i], i);
     }
-    IOCORE_RegisterConfigUpdateFunc("proxy.config.cluster.cluster_configuration", machine_config_change, (void *) CLUSTER_CONFIG);
+    REC_RegisterConfigUpdateFunc("proxy.config.cluster.cluster_configuration", machine_config_change, (void *) CLUSTER_CONFIG);
     do_machine_config_change((void *) CLUSTER_CONFIG, "proxy.config.cluster.cluster_configuration");
     // TODO: Remove this?
 #ifdef USE_SEPARATE_MACHINE_CONFIG
-    IOCORE_RegisterConfigUpdateFunc("proxy.config.cluster.machine_configuration", machine_config_change, (void *) MACHINE_CONFIG);
+    REC_RegisterConfigUpdateFunc("proxy.config.cluster.machine_configuration", machine_config_change, (void *) MACHINE_CONFIG);
     do_machine_config_change((void *) MACHINE_CONFIG, "proxy.config.cluster.machine_configuration");
 #endif
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/dns/DNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/DNS.cc b/iocore/dns/DNS.cc
index 31dda7a..021490d 100644
--- a/iocore/dns/DNS.cc
+++ b/iocore/dns/DNS.cc
@@ -168,19 +168,19 @@ DNSProcessor::start(int) {
   //
   // Read configuration
   //
-  IOCORE_EstablishStaticConfigInt32(dns_retries, "proxy.config.dns.retries");
-  IOCORE_EstablishStaticConfigInt32(dns_timeout, "proxy.config.dns.lookup_timeout");
-  IOCORE_EstablishStaticConfigInt32(dns_search, "proxy.config.dns.search_default_domains");
-  IOCORE_EstablishStaticConfigInt32(dns_failover_number, "proxy.config.dns.failover_number");
-  IOCORE_EstablishStaticConfigInt32(dns_failover_period, "proxy.config.dns.failover_period");
-  IOCORE_EstablishStaticConfigInt32(dns_max_dns_in_flight, "proxy.config.dns.max_dns_in_flight");
-  IOCORE_EstablishStaticConfigInt32(dns_validate_qname, "proxy.config.dns.validate_query_name");
-  IOCORE_EstablishStaticConfigInt32(dns_ns_rr, "proxy.config.dns.round_robin_nameservers");
-  IOCORE_ReadConfigStringAlloc(dns_ns_list, "proxy.config.dns.nameservers");
-  IOCORE_ReadConfigStringAlloc(dns_local_ipv4, "proxy.config.dns.local_ipv4");
-  IOCORE_ReadConfigStringAlloc(dns_local_ipv6, "proxy.config.dns.local_ipv6");
-  IOCORE_ReadConfigStringAlloc(dns_resolv_conf, "proxy.config.dns.resolv_conf");
-  IOCORE_EstablishStaticConfigInt32(dns_thread, "proxy.config.dns.dedicated_thread");
+  REC_EstablishStaticConfigInt32(dns_retries, "proxy.config.dns.retries");
+  REC_EstablishStaticConfigInt32(dns_timeout, "proxy.config.dns.lookup_timeout");
+  REC_EstablishStaticConfigInt32(dns_search, "proxy.config.dns.search_default_domains");
+  REC_EstablishStaticConfigInt32(dns_failover_number, "proxy.config.dns.failover_number");
+  REC_EstablishStaticConfigInt32(dns_failover_period, "proxy.config.dns.failover_period");
+  REC_EstablishStaticConfigInt32(dns_max_dns_in_flight, "proxy.config.dns.max_dns_in_flight");
+  REC_EstablishStaticConfigInt32(dns_validate_qname, "proxy.config.dns.validate_query_name");
+  REC_EstablishStaticConfigInt32(dns_ns_rr, "proxy.config.dns.round_robin_nameservers");
+  REC_ReadConfigStringAlloc(dns_ns_list, "proxy.config.dns.nameservers");
+  REC_ReadConfigStringAlloc(dns_local_ipv4, "proxy.config.dns.local_ipv4");
+  REC_ReadConfigStringAlloc(dns_local_ipv6, "proxy.config.dns.local_ipv6");
+  REC_ReadConfigStringAlloc(dns_resolv_conf, "proxy.config.dns.resolv_conf");
+  REC_EstablishStaticConfigInt32(dns_thread, "proxy.config.dns.dedicated_thread");
 
   if (dns_thread > 0) {
     ET_DNS = eventProcessor.spawn_event_threads(1, "ET_DNS"); // TODO: Hmmm, should we just get a single thread some other way?
@@ -1413,7 +1413,7 @@ dns_process(DNSHandler *handler, HostEnt *buf, int len)
     // Once it's full, a new entry get inputted into try_server_names round-
     // robin style every 50 success dns response.
 
-    // TODO: Why do we do strlen(e->qname) ? That should be available in 
+    // TODO: Why do we do strlen(e->qname) ? That should be available in
     // e->qname_len, no ?
     if (local_num_entries >= DEFAULT_NUM_TRY_SERVER) {
       if ((attempt_num_entries % 50) == 0) {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/dns/SplitDNS.cc
----------------------------------------------------------------------
diff --git a/iocore/dns/SplitDNS.cc b/iocore/dns/SplitDNS.cc
index 34356e3..ea281bf 100644
--- a/iocore/dns/SplitDNS.cc
+++ b/iocore/dns/SplitDNS.cc
@@ -138,7 +138,7 @@ SplitDNSConfig::startup()
   dnsHandler_mutex = new_ProxyMutex();
 
   //startup just check gsplit_dns_enabled
-  IOCORE_ReadConfigInt32(gsplit_dns_enabled, "proxy.config.dns.splitDNS.enabled");
+  REC_ReadConfigInt32(gsplit_dns_enabled, "proxy.config.dns.splitDNS.enabled");
   splitDNSUpdate = NEW(new ConfigUpdateHandler<SplitDNSConfig>());
   splitDNSUpdate->attach("proxy.config.cache.splitdns.filename");
 }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/eventsystem/EventSystem.cc
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/EventSystem.cc b/iocore/eventsystem/EventSystem.cc
index 70e5136..b8e1bdc 100644
--- a/iocore/eventsystem/EventSystem.cc
+++ b/iocore/eventsystem/EventSystem.cc
@@ -36,7 +36,7 @@ ink_event_system_init(ModuleVersion v)
   ink_release_assert(!checkModuleVersion(v, EVENT_SYSTEM_MODULE_VERSION));
   int config_max_iobuffer_size = DEFAULT_MAX_BUFFER_SIZE;
 
-  IOCORE_ReadConfigInteger(config_max_iobuffer_size, "proxy.config.io.max_buffer_size");
+  REC_ReadConfigInteger(config_max_iobuffer_size, "proxy.config.io.max_buffer_size");
 
   max_iobuffer_size = buffer_size_to_index(config_max_iobuffer_size, DEFAULT_BUFFER_SIZES - 1);
   if (default_small_iobuffer_size > max_iobuffer_size)

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/eventsystem/P_EventSystem.h
----------------------------------------------------------------------
diff --git a/iocore/eventsystem/P_EventSystem.h b/iocore/eventsystem/P_EventSystem.h
index 44b1aa8..b2b5ed5 100644
--- a/iocore/eventsystem/P_EventSystem.h
+++ b/iocore/eventsystem/P_EventSystem.h
@@ -56,32 +56,4 @@
                                        EVENT_SYSTEM_MODULE_MINOR_VERSION, \
                                        PRIVATE_MODULE_HEADER)
 
-
-// Macro definitions
-
-// error signalling macros
-#define IOCORE_SignalWarning               REC_SignalWarning
-#define IOCORE_SignalError(_buf, _already)  {                                 \
-  if(_already == false)                                                       \
-	IOCORE_SignalManager(REC_SIGNAL_CONFIG_ERROR, _buf);                  \
-  _already = true;                                                            \
-  Warning("%s", _buf);                                                        \
-}
-#define IOCORE_SignalManager               REC_SignalManager
-
-// configuration macros
-#define IOCORE_RegisterConfigInteger        RecRegisterConfigInt
-#define IOCORE_RegisterConfigString         RecRegisterConfigString
-#define IOCORE_ReadConfigInt32              REC_ReadConfigInt32
-#define IOCORE_ReadConfigInteger            REC_ReadConfigInteger
-#define IOCORE_ReadConfigFloat              REC_ReadConfigFloat
-#define IOCORE_ReadConfigStringAlloc        REC_ReadConfigStringAlloc
-#define IOCORE_ReadConfigString             REC_ReadConfigString
-#define IOCORE_RegisterConfigUpdateFunc     REC_RegisterConfigUpdateFunc
-#define IOCORE_EstablishStaticConfigInteger REC_EstablishStaticConfigInteger
-#define IOCORE_EstablishStaticConfigInt32   REC_EstablishStaticConfigInt32
-#define IOCORE_EstablishStaticConfigInt32U  REC_EstablishStaticConfigInt32U
-#define IOCORE_ConfigReadInteger            REC_ConfigReadInteger
-#define IOCORE_ConfigReadString             REC_ConfigReadString
-
 #endif

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/hostdb/HostDB.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/HostDB.cc b/iocore/hostdb/HostDB.cc
index 418a2ff..db3c6e3 100644
--- a/iocore/hostdb/HostDB.cc
+++ b/iocore/hostdb/HostDB.cc
@@ -91,7 +91,7 @@ is_addr_valid(
   uint8_t af, ///< Address family (format of data)
   void* ptr ///< Raw address data (not a sockaddr variant!)
 ) {
-  return 
+  return
     (AF_INET == af && INADDR_ANY != *(reinterpret_cast<in_addr_t*>(ptr)))
     || (AF_INET6 == af && !IN6_IS_ADDR_UNSPECIFIED(reinterpret_cast<in6_addr*>(ptr)))
     ;
@@ -188,7 +188,7 @@ HostDBMD5::HostDBMD5()
   : host_name(0), host_len(0), port(0),
     dns_server(0), db_mark(HOSTDB_MARK_GENERIC)
 {
-} 
+}
 
 HostDBCache::HostDBCache()
 {
@@ -338,7 +338,7 @@ HostDBSyncer::HostDBSyncer():
 Continuation(new_ProxyMutex()), frequency(0), start_time(0)
 {
   SET_HANDLER(&HostDBSyncer::sync_event);
-  IOCORE_EstablishStaticConfigInt32(hostdb_sync_frequency, "proxy.config.cache.hostdb.sync_frequency");
+  REC_EstablishStaticConfigInt32(hostdb_sync_frequency, "proxy.config.cache.hostdb.sync_frequency");
 }
 
 
@@ -375,11 +375,11 @@ HostDBCache::start(int flags)
   // Read configuration
   // Command line overrides manager configuration.
   //
-  IOCORE_ReadConfigInt32(hostdb_enable, "proxy.config.hostdb");
-  IOCORE_ReadConfigString(hostdb_filename, "proxy.config.hostdb.filename", PATH_NAME_MAX);
-  IOCORE_ReadConfigInt32(hostdb_size, "proxy.config.hostdb.size");
-  IOCORE_ReadConfigString(storage_path, "proxy.config.hostdb.storage_path", PATH_NAME_MAX);
-  IOCORE_ReadConfigInt32(storage_size, "proxy.config.hostdb.storage_size");
+  REC_ReadConfigInt32(hostdb_enable, "proxy.config.hostdb");
+  REC_ReadConfigString(hostdb_filename, "proxy.config.hostdb.filename", PATH_NAME_MAX);
+  REC_ReadConfigInt32(hostdb_size, "proxy.config.hostdb.size");
+  REC_ReadConfigString(storage_path, "proxy.config.hostdb.storage_path", PATH_NAME_MAX);
+  REC_ReadConfigInt32(storage_size, "proxy.config.hostdb.storage_size");
 
   if (storage_path[0] != '/') {
     Layout::relative_to(storage_path, PATH_NAME_MAX,
@@ -458,19 +458,19 @@ HostDBProcessor::start(int)
   //
   // Register configuration callback, and establish configuation links
   //
-  IOCORE_EstablishStaticConfigInt32(hostdb_ttl_mode, "proxy.config.hostdb.ttl_mode");
-  IOCORE_EstablishStaticConfigInt32(hostdb_disable_reverse_lookup, "proxy.config.cache.hostdb.disable_reverse_lookup");
-  IOCORE_EstablishStaticConfigInt32(hostdb_re_dns_on_reload, "proxy.config.hostdb.re_dns_on_reload");
-  IOCORE_EstablishStaticConfigInt32(hostdb_migrate_on_demand, "proxy.config.hostdb.migrate_on_demand");
-  IOCORE_EstablishStaticConfigInt32(hostdb_strict_round_robin, "proxy.config.hostdb.strict_round_robin");
-  IOCORE_EstablishStaticConfigInt32(hostdb_timed_round_robin, "proxy.config.hostdb.timed_round_robin");
-  IOCORE_EstablishStaticConfigInt32(hostdb_cluster, "proxy.config.hostdb.cluster");
-  IOCORE_EstablishStaticConfigInt32(hostdb_cluster_round_robin, "proxy.config.hostdb.cluster.round_robin");
-  IOCORE_EstablishStaticConfigInt32(hostdb_lookup_timeout, "proxy.config.hostdb.lookup_timeout");
-  IOCORE_EstablishStaticConfigInt32U(hostdb_ip_timeout_interval, "proxy.config.hostdb.timeout");
-  IOCORE_EstablishStaticConfigInt32U(hostdb_ip_stale_interval, "proxy.config.hostdb.verify_after");
-  IOCORE_EstablishStaticConfigInt32U(hostdb_ip_fail_timeout_interval, "proxy.config.hostdb.fail.timeout");
-  IOCORE_EstablishStaticConfigInt32U(hostdb_serve_stale_but_revalidate, "proxy.config.hostdb.serve_stale_for");
+  REC_EstablishStaticConfigInt32(hostdb_ttl_mode, "proxy.config.hostdb.ttl_mode");
+  REC_EstablishStaticConfigInt32(hostdb_disable_reverse_lookup, "proxy.config.cache.hostdb.disable_reverse_lookup");
+  REC_EstablishStaticConfigInt32(hostdb_re_dns_on_reload, "proxy.config.hostdb.re_dns_on_reload");
+  REC_EstablishStaticConfigInt32(hostdb_migrate_on_demand, "proxy.config.hostdb.migrate_on_demand");
+  REC_EstablishStaticConfigInt32(hostdb_strict_round_robin, "proxy.config.hostdb.strict_round_robin");
+  REC_EstablishStaticConfigInt32(hostdb_timed_round_robin, "proxy.config.hostdb.timed_round_robin");
+  REC_EstablishStaticConfigInt32(hostdb_cluster, "proxy.config.hostdb.cluster");
+  REC_EstablishStaticConfigInt32(hostdb_cluster_round_robin, "proxy.config.hostdb.cluster.round_robin");
+  REC_EstablishStaticConfigInt32(hostdb_lookup_timeout, "proxy.config.hostdb.lookup_timeout");
+  REC_EstablishStaticConfigInt32U(hostdb_ip_timeout_interval, "proxy.config.hostdb.timeout");
+  REC_EstablishStaticConfigInt32U(hostdb_ip_stale_interval, "proxy.config.hostdb.verify_after");
+  REC_EstablishStaticConfigInt32U(hostdb_ip_fail_timeout_interval, "proxy.config.hostdb.fail.timeout");
+  REC_EstablishStaticConfigInt32U(hostdb_serve_stale_but_revalidate, "proxy.config.hostdb.serve_stale_for");
 
   //
   // Set up hostdb_current_interval
@@ -811,7 +811,7 @@ HostDBProcessor::getby(Continuation * cont,
           if (!loop) {
             // No retry -> final result. Return it.
             Debug("hostdb", "immediate answer for %s",
-                  hostname ? hostname 
+                  hostname ? hostname
                   : ats_is_ip(ip) ? ats_ip_ntop(ip, ipb, sizeof ipb)
                   : "<null>"
               );
@@ -825,7 +825,7 @@ HostDBProcessor::getby(Continuation * cont,
     } while (loop);
   }
   Debug("hostdb", "delaying force %d answer for %s", aforce_dns,
-    hostname ? hostname 
+    hostname ? hostname
     : ats_is_ip(ip) ? ats_ip_ntop(ip, ipb, sizeof ipb)
     : "<null>"
   );

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/hostdb/MultiCache.cc
----------------------------------------------------------------------
diff --git a/iocore/hostdb/MultiCache.cc b/iocore/hostdb/MultiCache.cc
index f8de1dd..00ba198 100644
--- a/iocore/hostdb/MultiCache.cc
+++ b/iocore/hostdb/MultiCache.cc
@@ -801,7 +801,7 @@ Lfail:
         snprintf(msg, PATH_NAME_MAX + 1024, "%s: [%s] %s: reinitializing database", err, config_filename,
                      serr ? serr : "");
       }
-      IOCORE_SignalWarning(REC_SIGNAL_CONFIG_ERROR, msg);
+      REC_SignalWarning(REC_SIGNAL_CONFIG_ERROR, msg);
     }
   }
   ret = -1;

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/Connection.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Connection.cc b/iocore/net/Connection.cc
index 47e0728..6a8cc68 100644
--- a/iocore/net/Connection.cc
+++ b/iocore/net/Connection.cc
@@ -48,7 +48,7 @@ get_listen_backlog(void)
 {
   int listen_backlog = 1024;
 
-  IOCORE_ReadConfigInteger(listen_backlog, "proxy.config.net.listen_backlog");
+  REC_ReadConfigInteger(listen_backlog, "proxy.config.net.listen_backlog");
   return listen_backlog;
 }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/Net.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Net.cc b/iocore/net/Net.cc
index 30124e3..4daa9f3 100644
--- a/iocore/net/Net.cc
+++ b/iocore/net/Net.cc
@@ -37,9 +37,9 @@ int net_config_poll_timeout = DEFAULT_POLL_TIMEOUT;
 static inline void
 configure_net(void)
 {
-  IOCORE_RegisterConfigUpdateFunc("proxy.config.net.connections_throttle", change_net_connections_throttle, NULL);
-  IOCORE_ReadConfigInteger(fds_throttle, "proxy.config.net.connections_throttle");
-  IOCORE_ReadConfigInteger(throttle_enabled,"proxy.config.net.throttle_enabled");
+  REC_RegisterConfigUpdateFunc("proxy.config.net.connections_throttle", change_net_connections_throttle, NULL);
+  REC_ReadConfigInteger(fds_throttle, "proxy.config.net.connections_throttle");
+  REC_ReadConfigInteger(throttle_enabled,"proxy.config.net.throttle_enabled");
 }
 
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/P_UnixNet.h
----------------------------------------------------------------------
diff --git a/iocore/net/P_UnixNet.h b/iocore/net/P_UnixNet.h
index 547e1d8..824f46f 100644
--- a/iocore/net/P_UnixNet.h
+++ b/iocore/net/P_UnixNet.h
@@ -249,7 +249,7 @@ check_shedding_warning()
   ink_hrtime t = ink_get_hrtime();
   if (t - last_shedding_warning > NET_THROTTLE_MESSAGE_EVERY) {
     last_shedding_warning = t;
-    IOCORE_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, "number of connections reaching shedding limit");
+    REC_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, "number of connections reaching shedding limit");
   }
 }
 
@@ -283,7 +283,7 @@ check_throttle_warning()
   ink_hrtime t = ink_get_hrtime();
   if (t - last_throttle_warning > NET_THROTTLE_MESSAGE_EVERY) {
     last_throttle_warning = t;
-    IOCORE_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, "too many connections, throttling");
+    REC_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, "too many connections, throttling");
 
   }
 }
@@ -307,7 +307,7 @@ check_emergency_throttle(Connection & con)
   if (fd > emergency) {
     int over = fd - emergency;
     emergency_throttle_time = ink_get_hrtime() + (over * over) * HRTIME_SECOND;
-    IOCORE_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, "too many open file descriptors, emergency throttling");
+    REC_SignalWarning(REC_SIGNAL_SYSTEM_ERROR, "too many open file descriptors, emergency throttling");
     int hyper_emergency = fds_limit - HYPER_EMERGENCY_THROTTLE;
     if (fd > hyper_emergency)
       con.close();

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/SSLConfig.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLConfig.cc b/iocore/net/SSLConfig.cc
index 4549e73..679b0f1 100644
--- a/iocore/net/SSLConfig.cc
+++ b/iocore/net/SSLConfig.cc
@@ -133,26 +133,26 @@ SSLConfigParams::initialize()
   //+++++++++++++++++++++++++ Server part +++++++++++++++++++++++++++++++++
   verify_depth = 7;
 
-  IOCORE_ReadConfigInt32(clientCertLevel, "proxy.config.ssl.client.certification_level");
-  IOCORE_ReadConfigStringAlloc(cipherSuite, "proxy.config.ssl.server.cipher_suite");
+  REC_ReadConfigInt32(clientCertLevel, "proxy.config.ssl.client.certification_level");
+  REC_ReadConfigStringAlloc(cipherSuite, "proxy.config.ssl.server.cipher_suite");
 
   int options;
-  IOCORE_ReadConfigInteger(options, "proxy.config.ssl.SSLv2");
+  REC_ReadConfigInteger(options, "proxy.config.ssl.SSLv2");
   if (!options)
     ssl_ctx_options |= SSL_OP_NO_SSLv2;
-  IOCORE_ReadConfigInteger(options, "proxy.config.ssl.SSLv3");
+  REC_ReadConfigInteger(options, "proxy.config.ssl.SSLv3");
   if (!options)
     ssl_ctx_options |= SSL_OP_NO_SSLv3;
-  IOCORE_ReadConfigInteger(options, "proxy.config.ssl.TLSv1");
+  REC_ReadConfigInteger(options, "proxy.config.ssl.TLSv1");
   if (!options)
     ssl_ctx_options |= SSL_OP_NO_TLSv1;
 #ifdef SSL_OP_CIPHER_SERVER_PREFERENCE
-  IOCORE_ReadConfigInteger(options, "proxy.config.ssl.server.honor_cipher_order");
+  REC_ReadConfigInteger(options, "proxy.config.ssl.server.honor_cipher_order");
   if (!options)
     ssl_ctx_options |= SSL_OP_CIPHER_SERVER_PREFERENCE;
 #endif
 
-  IOCORE_ReadConfigInteger(options, "proxy.config.ssl.compression");
+  REC_ReadConfigInteger(options, "proxy.config.ssl.compression");
   if (!options) {
 #ifdef SSL_OP_NO_COMPRESSION
     /* OpenSSL >= 1.0 only */
@@ -162,52 +162,52 @@ SSLConfigParams::initialize()
 #endif
   }
 
-  IOCORE_ReadConfigString(serverCertRelativePath, "proxy.config.ssl.server.cert.path", PATH_NAME_MAX);
+  REC_ReadConfigString(serverCertRelativePath, "proxy.config.ssl.server.cert.path", PATH_NAME_MAX);
   set_paths_helper(serverCertRelativePath, NULL, &serverCertPathOnly, NULL);
 
   char *cert_chain = NULL;
-  IOCORE_ReadConfigStringAlloc(cert_chain, "proxy.config.ssl.server.cert_chain.filename");
+  REC_ReadConfigStringAlloc(cert_chain, "proxy.config.ssl.server.cert_chain.filename");
   set_paths_helper(serverCertRelativePath, cert_chain, NULL, &serverCertChainPath);
   ats_free(cert_chain);
 
-  IOCORE_ReadConfigStringAlloc(multicert_config_file, "proxy.config.ssl.server.multicert.filename");
+  REC_ReadConfigStringAlloc(multicert_config_file, "proxy.config.ssl.server.multicert.filename");
   set_paths_helper(Layout::get()->sysconfdir, multicert_config_file, NULL, &configFilePath);
   ats_free(multicert_config_file);
 
-  IOCORE_ReadConfigStringAlloc(ssl_server_private_key_path, "proxy.config.ssl.server.private_key.path");
+  REC_ReadConfigStringAlloc(ssl_server_private_key_path, "proxy.config.ssl.server.private_key.path");
   set_paths_helper(ssl_server_private_key_path, NULL, &serverKeyPathOnly, NULL);
   ats_free(ssl_server_private_key_path);
 
-  IOCORE_ReadConfigStringAlloc(serverCACertFilename, "proxy.config.ssl.CA.cert.filename");
-  IOCORE_ReadConfigStringAlloc(CACertRelativePath, "proxy.config.ssl.CA.cert.path");
+  REC_ReadConfigStringAlloc(serverCACertFilename, "proxy.config.ssl.CA.cert.filename");
+  REC_ReadConfigStringAlloc(CACertRelativePath, "proxy.config.ssl.CA.cert.path");
   set_paths_helper(CACertRelativePath, serverCACertFilename, &serverCACertPath, &serverCACertFilename);
   ats_free(CACertRelativePath);
 
   // SSL session cache configurations
-  IOCORE_ReadConfigInteger(ssl_session_cache, "proxy.config.ssl.session_cache");
-  IOCORE_ReadConfigInteger(ssl_session_cache_size, "proxy.config.ssl.session_cache.size");
+  REC_ReadConfigInteger(ssl_session_cache, "proxy.config.ssl.session_cache");
+  REC_ReadConfigInteger(ssl_session_cache_size, "proxy.config.ssl.session_cache.size");
 
   // ++++++++++++++++++++++++ Client part ++++++++++++++++++++
   client_verify_depth = 7;
-  IOCORE_ReadConfigInt32(clientVerify, "proxy.config.ssl.client.verify.server");
+  REC_ReadConfigInt32(clientVerify, "proxy.config.ssl.client.verify.server");
 
   ssl_client_cert_filename = NULL;
   ssl_client_cert_path = NULL;
-  IOCORE_ReadConfigStringAlloc(ssl_client_cert_filename, "proxy.config.ssl.client.cert.filename");
-  IOCORE_ReadConfigStringAlloc(ssl_client_cert_path, "proxy.config.ssl.client.cert.path");
+  REC_ReadConfigStringAlloc(ssl_client_cert_filename, "proxy.config.ssl.client.cert.filename");
+  REC_ReadConfigStringAlloc(ssl_client_cert_path, "proxy.config.ssl.client.cert.path");
   set_paths_helper(ssl_client_cert_path, ssl_client_cert_filename, NULL, &clientCertPath);
   ats_free_null(ssl_client_cert_filename);
   ats_free_null(ssl_client_cert_path);
 
-  IOCORE_ReadConfigStringAlloc(ssl_client_private_key_filename, "proxy.config.ssl.client.private_key.filename");
-  IOCORE_ReadConfigStringAlloc(ssl_client_private_key_path, "proxy.config.ssl.client.private_key.path");
+  REC_ReadConfigStringAlloc(ssl_client_private_key_filename, "proxy.config.ssl.client.private_key.filename");
+  REC_ReadConfigStringAlloc(ssl_client_private_key_path, "proxy.config.ssl.client.private_key.path");
   set_paths_helper(ssl_client_private_key_path, ssl_client_private_key_filename, NULL, &clientKeyPath);
   ats_free_null(ssl_client_private_key_filename);
   ats_free_null(ssl_client_private_key_path);
 
 
-  IOCORE_ReadConfigStringAlloc(clientCACertFilename, "proxy.config.ssl.client.CA.cert.filename");
-  IOCORE_ReadConfigStringAlloc(clientCACertRelativePath, "proxy.config.ssl.client.CA.cert.path");
+  REC_ReadConfigStringAlloc(clientCACertFilename, "proxy.config.ssl.client.CA.cert.filename");
+  REC_ReadConfigStringAlloc(clientCACertRelativePath, "proxy.config.ssl.client.CA.cert.path");
   set_paths_helper(clientCACertRelativePath, clientCACertFilename, &clientCACertPath, &clientCACertFilename);
   ats_free(clientCACertRelativePath);
 }

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index e87cec7..f9bc3af 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -683,14 +683,14 @@ SSLParseCertificateConfiguration(
       if (errPtr != NULL) {
         snprintf(errBuf, sizeof(errBuf), "%s: discarding %s entry at line %d: %s",
                      __func__, params->configFilePath, line_num, errPtr);
-        IOCORE_SignalError(errBuf, alarmAlready);
+        REC_SignalError(errBuf, alarmAlready);
       } else {
         if (ssl_extract_certificate(&line_info, addr, cert, ca, key)) {
           ssl_store_ssl_context(params, lookup, addr, cert, ca, key);
         } else {
           snprintf(errBuf, sizeof(errBuf), "%s: discarding invalid %s entry at line %u",
                        __func__, params->configFilePath, line_num);
-          IOCORE_SignalError(errBuf, alarmAlready);
+          REC_SignalError(errBuf, alarmAlready);
         }
       }
 

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/Socks.cc
----------------------------------------------------------------------
diff --git a/iocore/net/Socks.cc b/iocore/net/Socks.cc
index 4a42e52..44b7710 100644
--- a/iocore/net/Socks.cc
+++ b/iocore/net/Socks.cc
@@ -465,18 +465,18 @@ loadSocksConfiguration(socks_conf_struct * socks_conf_stuff)
   int socks_config_fd = -1;
   char config_pathname[PATH_NAME_MAX + 1];
   char *socks_config_file = NULL;
-#ifdef SOCKS_WITH_TS 
+#ifdef SOCKS_WITH_TS
   char *tmp;
 #endif
 
   socks_conf_stuff->accept_enabled = 0; //initialize it INKqa08593
-  socks_conf_stuff->socks_needed = IOCORE_ConfigReadInteger("proxy.config.socks.socks_needed");
+  socks_conf_stuff->socks_needed = REC_ConfigReadInteger("proxy.config.socks.socks_needed");
   if (!socks_conf_stuff->socks_needed) {
     Debug("Socks", "Socks Turned Off");
     return;
   }
 
-  socks_conf_stuff->default_version = IOCORE_ConfigReadInteger("proxy.config.socks.socks_version");
+  socks_conf_stuff->default_version = REC_ConfigReadInteger("proxy.config.socks.socks_version");
   Debug("Socks", "Socks Version %d", socks_conf_stuff->default_version);
 
   if (socks_conf_stuff->default_version != 4 && socks_conf_stuff->default_version != 5) {
@@ -484,18 +484,18 @@ loadSocksConfiguration(socks_conf_struct * socks_conf_stuff)
     goto error;
   }
 
-  socks_conf_stuff->server_connect_timeout = IOCORE_ConfigReadInteger("proxy.config.socks.server_connect_timeout");
-  socks_conf_stuff->socks_timeout = IOCORE_ConfigReadInteger("proxy.config.socks.socks_timeout");
+  socks_conf_stuff->server_connect_timeout = REC_ConfigReadInteger("proxy.config.socks.server_connect_timeout");
+  socks_conf_stuff->socks_timeout = REC_ConfigReadInteger("proxy.config.socks.socks_timeout");
   Debug("Socks", "server connect timeout: %d socks respnonse timeout %d",
         socks_conf_stuff->server_connect_timeout, socks_conf_stuff->socks_timeout);
 
   socks_conf_stuff->per_server_connection_attempts =
-    IOCORE_ConfigReadInteger("proxy.config.socks.per_server_connection_attempts");
-  socks_conf_stuff->connection_attempts = IOCORE_ConfigReadInteger("proxy.config.socks.connection_attempts");
+    REC_ConfigReadInteger("proxy.config.socks.per_server_connection_attempts");
+  socks_conf_stuff->connection_attempts = REC_ConfigReadInteger("proxy.config.socks.connection_attempts");
 
-  socks_conf_stuff->accept_enabled = IOCORE_ConfigReadInteger("proxy.config.socks.accept_enabled");
-  socks_conf_stuff->accept_port = IOCORE_ConfigReadInteger("proxy.config.socks.accept_port");
-  socks_conf_stuff->http_port = IOCORE_ConfigReadInteger("proxy.config.socks.http_port");
+  socks_conf_stuff->accept_enabled = REC_ConfigReadInteger("proxy.config.socks.accept_enabled");
+  socks_conf_stuff->accept_port = REC_ConfigReadInteger("proxy.config.socks.accept_port");
+  socks_conf_stuff->http_port = REC_ConfigReadInteger("proxy.config.socks.http_port");
   Debug("SocksProxy", "Read SocksProxy info: accept_enabled = %d "
         "accept_port = %d http_port = %d", socks_conf_stuff->accept_enabled,
         socks_conf_stuff->accept_port, socks_conf_stuff->http_port);
@@ -504,7 +504,7 @@ loadSocksConfiguration(socks_conf_struct * socks_conf_stuff)
   SocksServerConfig::startup();
 #endif
 
-  socks_config_file = IOCORE_ConfigReadString("proxy.config.socks.socks_config_file");
+  socks_config_file = REC_ConfigReadString("proxy.config.socks.socks_config_file");
 
   if (!socks_config_file) {
     Error("SOCKS Config: could not read config file name. SOCKS Turned off");

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/iocore/net/UnixNetProcessor.cc
----------------------------------------------------------------------
diff --git a/iocore/net/UnixNetProcessor.cc b/iocore/net/UnixNetProcessor.cc
index c3cdea6..975167d 100644
--- a/iocore/net/UnixNetProcessor.cc
+++ b/iocore/net/UnixNetProcessor.cc
@@ -103,7 +103,7 @@ UnixNetProcessor::accept_internal(
 
   // Fill in accept thread from configuration if necessary.
   if (opt.accept_threads < 0)
-    IOCORE_ReadConfigInteger(accept_threads, "proxy.config.accept_threads");
+    REC_ReadConfigInteger(accept_threads, "proxy.config.accept_threads");
 
   NET_INCREMENT_DYN_STAT(net_accepts_currently_open_stat);
 
@@ -132,7 +132,7 @@ UnixNetProcessor::accept_internal(
 
   int should_filter_int = 0;
   na->server.http_accept_filter = false;
-  IOCORE_ReadConfigInteger(should_filter_int, "proxy.config.net.defer_accept");
+  REC_ReadConfigInteger(should_filter_int, "proxy.config.net.defer_accept");
   if (should_filter_int > 0 && opt.etype == ET_NET)
     na->server.http_accept_filter = true;
 
@@ -178,7 +178,7 @@ UnixNetProcessor::accept_internal(
 #endif
 #ifdef TCP_INIT_CWND
  int tcp_init_cwnd = 0;
- IOCORE_ReadConfigInteger(tcp_init_cwnd, "proxy.config.http.server_tcp_init_cwnd");
+ REC_ReadConfigInteger(tcp_init_cwnd, "proxy.config.http.server_tcp_init_cwnd");
  if(tcp_init_cwnd > 0) {
     Debug("net", "Setting initial congestion window to %d", tcp_init_cwnd);
     if(setsockopt(na->server.fd, IPPROTO_TCP, TCP_INIT_CWND, &tcp_init_cwnd, sizeof(int)) != 0) {

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fc739109/lib/records/I_RecCore.h
----------------------------------------------------------------------
diff --git a/lib/records/I_RecCore.h b/lib/records/I_RecCore.h
index b769f02..94deede 100644
--- a/lib/records/I_RecCore.h
+++ b/lib/records/I_RecCore.h
@@ -231,10 +231,16 @@ int RecSetSyncRequired(char *name, bool lock = true);
 
 
 //------------------------------------------------------------------------
-// Signal Alarm/Warning
+// Signal Alarm/Warning/Error
 //------------------------------------------------------------------------
 #define REC_SignalManager        RecSignalManager
 #define REC_SignalWarning(_n,_d) { Warning("%s", _d); RecSignalManager(_n,_d); }
+#define REC_SignalError(_buf, _already)  {                                \
+  if(_already == false)                                                   \
+	REC_SignalManager(REC_SIGNAL_CONFIG_ERROR, _buf);                 \
+  _already = true;                                                        \
+  Warning("%s", _buf);                                                    \
+}
 
 
 //------------------------------------------------------------------------


Mime
View raw message