You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/03/22 00:59:42 UTC
svn commit: r1084031 - in /trafficserver/traffic/trunk/proxy/http/remap:
UrlMapping.h UrlMappingPathIndex.cc UrlMappingPathIndex.h UrlRewrite.cc
UrlRewrite.h
Author: zwoop
Date: Mon Mar 21 23:59:41 2011
New Revision: 1084031
URL: http://svn.apache.org/viewvc?rev=1084031&view=rev
Log:
TS-550 Use our standard Queue instead of List for url_mapping
Modified:
trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h
trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.cc
trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.h
trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.h
Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h?rev=1084031&r1=1084030&r2=1084031&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlMapping.h Mon Mar 21 23:59:41 2011
@@ -111,6 +111,7 @@ public:
redirect_tag_str *redir_chunk_list;
acl_filter_rule *filter; // acl filtering (list of rules)
unsigned int _plugin_count;
+ LINK(url_mapping, link);
int getRank() const { return _rank; };
Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.cc?rev=1084031&r1=1084030&r2=1084031&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.cc Mon Mar 21 23:59:41 2011
@@ -81,12 +81,13 @@ lFail:
void
UrlMappingPathIndex::GetMappings(MappingList &mapping_list) const
{
- for (UrlMappingGroup::const_iterator group_iter = m_tries.begin();
- group_iter != m_tries.end(); ++group_iter) {
+ UrlMappingGroup::const_iterator group_iter;
+ UrlMappingTrie::ValuePointerList::const_iterator list_iter;
+
+ for (group_iter = m_tries.begin(); group_iter != m_tries.end(); ++group_iter) {
const UrlMappingTrie::ValuePointerList &value_pointers = group_iter->second->GetValues();
- for (UrlMappingTrie::ValuePointerList::const_iterator list_iter = value_pointers.begin();
- list_iter != value_pointers.end(); ++list_iter) {
- mapping_list.push_back(*(*list_iter));
+ for (list_iter = value_pointers.begin(); list_iter != value_pointers.end(); ++list_iter) {
+ mapping_list.enqueue(*(*list_iter));
}
}
}
Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.h?rev=1084031&r1=1084030&r2=1084031&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.h (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlMappingPathIndex.h Mon Mar 21 23:59:41 2011
@@ -24,7 +24,6 @@
#define _URL_MAPPING_PATH_INDEX_H
-#include <list>
#include <map>
#include "URL.h"
@@ -35,13 +34,13 @@ class UrlMappingPathIndex
{
public:
UrlMappingPathIndex()
- { }
+ { }
bool Insert(url_mapping *mapping);
url_mapping *Search(URL *request_url, int request_port, bool normal_search = true) const;
- typedef std::list<url_mapping *> MappingList;
+ typedef Queue<url_mapping> MappingList;
void GetMappings(MappingList &mapping_list) const;
Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc?rev=1084031&r1=1084030&r2=1084031&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.cc Mon Mar 21 23:59:41 2011
@@ -629,9 +629,9 @@ UrlRewrite::_destroyTable(InkHashTable *
for (ht_entry = ink_hash_table_iterator_first(h_table, &ht_iter); ht_entry != NULL;) {
item = (UrlMappingPathIndex *) ink_hash_table_entry_value(h_table, ht_entry);
item->GetMappings(mappings);
- for (UrlMappingPathIndex::MappingList::iterator mapping_iter = mappings.begin();
- mapping_iter != mappings.end(); ++mapping_iter) {
- delete *mapping_iter;
+
+ forl_LL(url_mapping, mapping_iter, mappings) {
+ delete mapping_iter;
}
mappings.clear();
delete item;
@@ -679,14 +679,11 @@ UrlRewrite::PrintTable(InkHashTable *h_t
UrlMappingPathIndex *value;
char from_url_buf[2048], to_url_buf[2048];
UrlMappingPathIndex::MappingList mappings;
- url_mapping *um;
for (ht_entry = ink_hash_table_iterator_first(h_table, &ht_iter); ht_entry != NULL;) {
value = (UrlMappingPathIndex *) ink_hash_table_entry_value(h_table, ht_entry);
value->GetMappings(mappings);
- for (UrlMappingPathIndex::MappingList::iterator mapping_iter = mappings.begin();
- mapping_iter != mappings.end(); ++mapping_iter) {
- um = *mapping_iter;
+ forl_LL(url_mapping, um, mappings) {
um->fromURL.string_get_buf(from_url_buf, (int) sizeof(from_url_buf));
um->_default_to_url.string_get_buf(to_url_buf, (int) sizeof(to_url_buf));
printf("\t %s %s=> %s %s <%s> [plugins %s enabled; running with %u plugins]\n", from_url_buf,
Modified: trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.h?rev=1084031&r1=1084030&r2=1084031&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.h (original)
+++ trafficserver/traffic/trunk/proxy/http/remap/UrlRewrite.h Mon Mar 21 23:59:41 2011
@@ -33,7 +33,6 @@
#else
#include <pcre.h>
#endif
-#include <list>
#define URL_REMAP_FILTER_NONE 0x00000000
#define URL_REMAP_FILTER_REFERER 0x00000001 /* enable "referer" header validation */