Repository: trafficserver Updated Branches: refs/heads/master 269b89f72 -> 6a1bab81a
Remove unused open_read_buffer and open_write_buffer Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6a1bab81 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6a1bab81 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6a1bab81 Branch: refs/heads/master Commit: 6a1bab81a1f6d97289efb1ffa4ebc95a1038b419 Parents: 269b89f Author: James Peach <jpe...@apache.org> Authored: Fri Mar 13 22:09:26 2015 -0700 Committer: James Peach <jpe...@apache.org> Committed: Fri Mar 13 22:15:54 2015 -0700 ---------------------------------------------------------------------- iocore/cache/I_Cache.h | 15 ---------- iocore/cache/P_CacheInternal.h | 60 ------------------------------------- 2 files changed, 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6a1bab81/iocore/cache/I_Cache.h ---------------------------------------------------------------------- diff --git a/iocore/cache/I_Cache.h b/iocore/cache/I_Cache.h index 1606a23..69fa156 100644 --- a/iocore/cache/I_Cache.h +++ b/iocore/cache/I_Cache.h @@ -84,9 +84,6 @@ struct CacheProcessor:public Processor CacheFragType frag_type = CACHE_FRAG_TYPE_NONE, char *hostname = 0, int host_len = 0); inkcoreapi Action *open_read(Continuation *cont, CacheKey *key, bool cluster_cache_local, CacheFragType frag_type = CACHE_FRAG_TYPE_NONE, char *hostname = 0, int host_len = 0); - Action *open_read_buffer(Continuation *cont, MIOBuffer *buf, CacheKey *key, - CacheFragType frag_type = CACHE_FRAG_TYPE_NONE, char *hostname = 0, int host_len = 0); - inkcoreapi Action *open_write(Continuation *cont, CacheKey *key, bool cluster_cache_local, @@ -95,12 +92,6 @@ struct CacheProcessor:public Processor int options = 0, time_t pin_in_cache = (time_t) 0, char *hostname = 0, int host_len = 0); - Action *open_write_buffer(Continuation *cont, MIOBuffer *buf, - CacheKey *key, - CacheFragType frag_type = CACHE_FRAG_TYPE_NONE, - int options = 0, - time_t pin_in_cache = (time_t) 0, - char *hostname = 0, int host_len = 0); inkcoreapi Action *remove(Continuation *cont, CacheKey *key, bool cluster_cache_local, CacheFragType frag_type = CACHE_FRAG_TYPE_NONE, @@ -115,15 +106,9 @@ struct CacheProcessor:public Processor CacheHTTPHdr *request, CacheLookupHttpConfig *params, time_t pin_in_cache = (time_t) 0, CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP); - Action *open_read_buffer(Continuation *cont, MIOBuffer *buf, URL *url, - CacheHTTPHdr *request, - CacheLookupHttpConfig *params, CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP); Action *open_write(Continuation *cont, int expected_size, URL *url, bool cluster_cache_local, CacheHTTPHdr *request, CacheHTTPInfo *old_info, time_t pin_in_cache = (time_t) 0, CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP); - Action *open_write_buffer(Continuation *cont, MIOBuffer *buf, URL *url, - CacheHTTPHdr *request, CacheHTTPHdr *response, - CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP); Action *remove(Continuation *cont, URL *url, bool cluster_cache_local, CacheFragType frag_type = CACHE_FRAG_TYPE_HTTP); Action *open_read_internal(int, Continuation *, MIOBuffer *, CacheURL *, http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6a1bab81/iocore/cache/P_CacheInternal.h ---------------------------------------------------------------------- diff --git a/iocore/cache/P_CacheInternal.h b/iocore/cache/P_CacheInternal.h index 385ac22..438c66a 100644 --- a/iocore/cache/P_CacheInternal.h +++ b/iocore/cache/P_CacheInternal.h @@ -1155,21 +1155,6 @@ CacheProcessor::open_read(Continuation *cont, CacheKey *key, bool cluster_cache_ return caches[frag_type]->open_read(cont, key, frag_type, hostname, host_len); } -TS_INLINE Action * -CacheProcessor::open_read_buffer(Continuation *cont, MIOBuffer *buf ATS_UNUSED, CacheKey *key, CacheFragType frag_type, - char *hostname, int host_len) -{ -#ifdef CLUSTER_CACHE - if (cache_clustering_enabled > 0) { - return open_read_internal(CACHE_OPEN_READ_BUFFER, cont, buf, - (CacheURL *) 0, (CacheHTTPHdr *) 0, - (CacheLookupHttpConfig *) 0, key, 0, frag_type, hostname, host_len); - } -#endif - return caches[frag_type]->open_read(cont, key, frag_type, hostname, host_len); -} - - TS_INLINE inkcoreapi Action * CacheProcessor::open_write(Continuation *cont, CacheKey *key, bool cluster_cache_local ATS_UNUSED, CacheFragType frag_type, int expected_size ATS_UNUSED, int options, @@ -1189,23 +1174,6 @@ CacheProcessor::open_write(Continuation *cont, CacheKey *key, bool cluster_cache } TS_INLINE Action * -CacheProcessor::open_write_buffer(Continuation *cont, MIOBuffer *buf, CacheKey *key, - CacheFragType frag_type, int options, time_t pin_in_cache, - char *hostname, int host_len) -{ - (void)pin_in_cache; - (void)cont; - (void)buf; - (void)key; - (void)frag_type; - (void)options; - (void)hostname; - (void)host_len; - ink_assert(!"implemented"); - return NULL; -} - -TS_INLINE Action * CacheProcessor::remove(Continuation *cont, CacheKey *key, bool cluster_cache_local ATS_UNUSED, CacheFragType frag_type, bool rm_user_agents, bool rm_link, char *hostname, int host_len) { @@ -1243,34 +1211,6 @@ CacheProcessor::lookup(Continuation *cont, URL *url, bool cluster_cache_local, b return lookup(cont, &md5, cluster_cache_local, local_only, frag_type, (char *) hostname, host_len); } -TS_INLINE Action * -CacheProcessor::open_read_buffer(Continuation *cont, MIOBuffer *buf, - URL *url, CacheHTTPHdr *request, CacheLookupHttpConfig *params, CacheFragType type) -{ - (void) buf; -#ifdef CLUSTER_CACHE - if (cache_clustering_enabled > 0) { - return open_read_internal(CACHE_OPEN_READ_BUFFER_LONG, cont, buf, url, - request, params, (CacheKey *) 0, 0, type, (char *) 0, 0); - } -#endif - return caches[type]->open_read(cont, url, request, params, type); -} - -TS_INLINE Action * -CacheProcessor::open_write_buffer(Continuation * cont, MIOBuffer * buf, URL * url, - CacheHTTPHdr * request, CacheHTTPHdr * response, CacheFragType type) -{ - (void) cont; - (void) buf; - (void) url; - (void) request; - (void) response; - (void) type; - ink_assert(!"implemented"); - return NULL; -} - #endif