From: Francesco Chemolli Date: Mon, 10 Feb 2014 16:39:10 +0000 (+0100) Subject: More Vector to std::vector refactoring X-Git-Tag: SQUID_3_5_0_1~376^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8ea3cc0493f55a99a997c1ebf59c7d17cd84db8;p=thirdparty%2Fsquid.git More Vector to std::vector refactoring --- diff --git a/src/ClientDelayConfig.h b/src/ClientDelayConfig.h index d9e3c69707..cec7190e7e 100644 --- a/src/ClientDelayConfig.h +++ b/src/ClientDelayConfig.h @@ -2,7 +2,7 @@ #define SQUID_CLIENTDELAYCONFIG_H #include "acl/forward.h" -#include "base/Vector.h" +#include class StoreEntry; class ConfigParser; @@ -21,7 +21,7 @@ public: int64_t highwatermark; }; -typedef Vector ClientDelayPools; +typedef std::vector ClientDelayPools; /* represents configuration of client write limiting delay pools */ class ClientDelayConfig diff --git a/src/ConfigOption.cc b/src/ConfigOption.cc index 2b771479ee..93f691a4a0 100644 --- a/src/ConfigOption.cc +++ b/src/ConfigOption.cc @@ -44,7 +44,7 @@ ConfigOptionVector::~ConfigOptionVector() bool ConfigOptionVector::parse(char const *option, const char *value, int isaReconfig) { - Vector::iterator i = options.begin(); + std::vector::iterator i = options.begin(); while (i != options.end()) { if ((*i)->parse(option,value, isaReconfig)) @@ -59,7 +59,7 @@ ConfigOptionVector::parse(char const *option, const char *value, int isaReconfig void ConfigOptionVector::dump(StoreEntry * e) const { - for (Vector::const_iterator i = options.begin(); + for (std::vector::const_iterator i = options.begin(); i != options.end(); ++i) (*i)->dump(e); } diff --git a/src/ConfigOption.h b/src/ConfigOption.h index 2016eb6b7f..9ca1c00f7b 100644 --- a/src/ConfigOption.h +++ b/src/ConfigOption.h @@ -30,7 +30,7 @@ #ifndef SQUID_CONFIGOPTION_H #define SQUID_CONFIGOPTION_H -#include "base/Vector.h" +#include class StoreEntry; @@ -53,7 +53,7 @@ public: virtual ~ConfigOptionVector(); virtual bool parse(char const *option, const char *value, int reconfiguring); virtual void dump(StoreEntry * e) const; - Vectoroptions; + std::vectoroptions; }; template diff --git a/src/CpuAffinityMap.cc b/src/CpuAffinityMap.cc index 2d616263e8..d4132f0365 100644 --- a/src/CpuAffinityMap.cc +++ b/src/CpuAffinityMap.cc @@ -10,7 +10,7 @@ #include "Debug.h" bool -CpuAffinityMap::add(const Vector &aProcesses, const Vector &aCores) +CpuAffinityMap::add(const std::vector &aProcesses, const std::vector &aCores) { if (aProcesses.size() != aCores.size()) return false; diff --git a/src/CpuAffinityMap.h b/src/CpuAffinityMap.h index d322573f3d..e2038cfcb7 100644 --- a/src/CpuAffinityMap.h +++ b/src/CpuAffinityMap.h @@ -4,7 +4,7 @@ #ifndef SQUID_CPU_AFFINITY_MAP_H #define SQUID_CPU_AFFINITY_MAP_H -#include "base/Vector.h" +#include class CpuAffinitySet; @@ -13,20 +13,20 @@ class CpuAffinityMap { public: /// append cpu_affinity_map option - bool add(const Vector &aProcesses, const Vector &aCores); + bool add(const std::vector &aProcesses, const std::vector &aCores); /// calculate CPU set for this process CpuAffinitySet *calculateSet(const int targetProcess) const; /// returns list of process numbers - const Vector &processes() const { return theProcesses; } + const std::vector &processes() const { return theProcesses; } /// returns list of cores - const Vector &cores() const { return theCores; } + const std::vector &cores() const { return theCores; } private: - Vector theProcesses; ///< list of process numbers - Vector theCores; ///< list of cores + std::vector theProcesses; ///< list of process numbers + std::vector theCores; ///< list of cores }; #endif // SQUID_CPU_AFFINITY_MAP_H diff --git a/src/DelayPools.h b/src/DelayPools.h index f7748e262a..182df498a8 100644 --- a/src/DelayPools.h +++ b/src/DelayPools.h @@ -32,7 +32,7 @@ #ifndef SQUID_DELAYPOOLS_H #define SQUID_DELAYPOOLS_H -#include "base/Vector.h" +#include class DelayPool; class Updateable; @@ -75,7 +75,7 @@ private: static time_t LastUpdate; static unsigned short pools_; static void FreeDelayData (); - static Vector toUpdate; + static std::vector toUpdate; static void RegisterWithCacheManager(void); }; diff --git a/src/DelayVector.h b/src/DelayVector.h index f0cb9a72d6..33bc2c5834 100644 --- a/src/DelayVector.h +++ b/src/DelayVector.h @@ -72,16 +72,16 @@ private: private: RefCount theVector; - Vector ids; - typedef Vector::iterator iterator; - typedef Vector::const_iterator const_iterator; + std::vector ids; + typedef std::vector::iterator iterator; + typedef std::vector::const_iterator const_iterator; }; friend class Id; - Vector pools; - typedef Vector::iterator iterator; - typedef Vector::const_iterator const_iterator; + std::vector pools; + typedef std::vector::iterator iterator; + typedef std::vector::const_iterator const_iterator; }; #endif /* USE_DELAY_POOLS */ diff --git a/src/DiskIO/DiskIOModule.cc b/src/DiskIO/DiskIOModule.cc index 2992f2237d..8d151b20b7 100644 --- a/src/DiskIO/DiskIOModule.cc +++ b/src/DiskIO/DiskIOModule.cc @@ -35,7 +35,7 @@ #include "squid.h" #include "DiskIOModule.h" -Vector *DiskIOModule::_Modules = NULL; +std::vector *DiskIOModule::_Modules = NULL; //DiskIOModule() : initialised (false) {} @@ -70,17 +70,17 @@ DiskIOModule::ModuleAdd(DiskIOModule &instance) GetModules().push_back (&instance); } -Vector const & +std::vector const & DiskIOModule::Modules() { return GetModules(); } -Vector & +std::vector & DiskIOModule::GetModules() { if (!_Modules) - _Modules = new Vector; + _Modules = new std::vector; return *_Modules; } diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h index ad05153c94..a7696d5557 100644 --- a/src/DiskIO/DiskIOModule.h +++ b/src/DiskIO/DiskIOModule.h @@ -32,7 +32,7 @@ #ifndef SQUID_DISKIOMODULE_H #define SQUID_DISKIOMODULE_H -#include "base/Vector.h" +#include /* forward decls */ @@ -57,9 +57,9 @@ public: * available module for this system. */ static DiskIOModule *FindDefault(); - static Vector const &Modules(); - typedef Vector::iterator iterator; - typedef Vector::const_iterator const_iterator; + static std::vector const &Modules(); + typedef std::vector::iterator iterator; + typedef std::vector::const_iterator const_iterator; DiskIOModule(); virtual ~DiskIOModule() {} @@ -78,8 +78,8 @@ protected: static void RegisterAllModulesWithCacheManager(void); private: - static Vector &GetModules(); - static Vector *_Modules; + static std::vector &GetModules(); + static std::vector *_Modules; }; #endif /* SQUID_DISKIOMODULE_H */ diff --git a/src/EventLoop.h b/src/EventLoop.h index 3070051053..a2778f618e 100644 --- a/src/EventLoop.h +++ b/src/EventLoop.h @@ -31,7 +31,7 @@ #ifndef SQUID_EVENTLOOP_H #define SQUID_EVENTLOOP_H -#include "base/Vector.h" +#include #define EVENT_LOOP_TIMEOUT 1000 /* 1s timeout */ @@ -104,7 +104,7 @@ private: bool dispatchCalls(); bool last_loop; - typedef Vector engine_vector; + typedef std::vector engine_vector; engine_vector engines; TimeEngine * timeService; AsyncEngine * primaryEngine; diff --git a/src/FadingCounter.h b/src/FadingCounter.h index 9430ef14f6..ee65f92e4d 100644 --- a/src/FadingCounter.h +++ b/src/FadingCounter.h @@ -1,7 +1,7 @@ #ifndef SQUID_FADING_COUNTER_H #define SQUID_FADING_COUNTER_H -#include "base/Vector.h" +#include /// Counts events, forgetting old ones. Usefull for "3 errors/minute" limits. class FadingCounter @@ -25,7 +25,7 @@ private: double delta; ///< sub-interval duration = horizon/precision double lastTime; ///< time of the last update - Vector counters; ///< events per delta (possibly stale) + std::vector counters; ///< events per delta (possibly stale) int total; ///< number of remembered events (possibly stale) }; diff --git a/src/adaptation/AccessCheck.cc b/src/adaptation/AccessCheck.cc index 19ee86346b..deb36118f9 100644 --- a/src/adaptation/AccessCheck.cc +++ b/src/adaptation/AccessCheck.cc @@ -131,7 +131,7 @@ Adaptation::AccessCheck::checkCandidates() return; } - candidates.shift(); // the rule apparently went away (reconfigure) + candidates.erase(candidates.begin()); // the rule apparently went away (reconfigure) } debugs(93, 4, HERE << "NO candidates left"); @@ -176,7 +176,7 @@ Adaptation::AccessCheck::noteAnswer(allow_t answer) } // no match or the group disappeared during reconfiguration - candidates.shift(); + candidates.erase(candidates.begin()); checkCandidates(); } diff --git a/src/adaptation/AccessCheck.h b/src/adaptation/AccessCheck.h index 3a931a8324..ba3add39e4 100644 --- a/src/adaptation/AccessCheck.h +++ b/src/adaptation/AccessCheck.h @@ -39,7 +39,7 @@ private: ACLFilledChecklist *acl_checklist; typedef int Candidate; - typedef Vector Candidates; + typedef std::vector Candidates; Candidates candidates; Candidate topCandidate() const { return *candidates.begin(); } ServiceGroupPointer topGroup() const; // may return nil diff --git a/src/adaptation/AccessRule.h b/src/adaptation/AccessRule.h index 9fae4ded79..4b5fa2ee11 100644 --- a/src/adaptation/AccessRule.h +++ b/src/adaptation/AccessRule.h @@ -34,7 +34,7 @@ private: static Id LastId; }; -typedef Vector AccessRules; +typedef std::vector AccessRules; AccessRules &AllRules(); AccessRule *FindRule(const AccessRule::Id &id); AccessRule *FindRuleByGroupId(const String &groupId); diff --git a/src/adaptation/Config.cc b/src/adaptation/Config.cc index d133c493e6..e6b0a058b6 100644 --- a/src/adaptation/Config.cc +++ b/src/adaptation/Config.cc @@ -43,6 +43,8 @@ #include "HttpRequest.h" #include "Store.h" +#include + bool Adaptation::Config::Enabled = false; char *Adaptation::Config::masterx_shared_name = NULL; int Adaptation::Config::service_iteration_limit = 16; @@ -87,15 +89,15 @@ Adaptation::Config::removeService(const String& service) for (SGSI it = services.begin(); it != services.end(); ++it) { if (*it == service) { group->removedServices.push_back(service); - group->services.prune(service); - debugs(93, 5, HERE << "adaptation service " << service << + std::remove(group->services.begin(),group->services.end(),service); + debugs(93, 5, "adaptation service " << service << " removed from group " << group->id); break; } } if (services.empty()) { removeRule(group->id); - AllGroups().prune(group); + std::remove(AllGroups().begin(),AllGroups().end(),group); } else { ++i; } @@ -122,8 +124,8 @@ Adaptation::Config::removeRule(const String& id) for (ARI it = rules.begin(); it != rules.end(); ++it) { AccessRule* rule = *it; if (rule->groupId == id) { - debugs(93, 5, HERE << "removing access rules for:" << id); - AllRules().prune(rule); + debugs(93, 5, "removing access rules for:" << id); + std::remove(AllRules().begin(),AllRules().end(),rule); delete (rule); break; } diff --git a/src/adaptation/Config.h b/src/adaptation/Config.h index 5da85bebb7..f744ad27f6 100644 --- a/src/adaptation/Config.h +++ b/src/adaptation/Config.h @@ -51,7 +51,7 @@ public: static bool needHistory; ///< HttpRequest adaptation history should recorded - typedef Vector ServiceConfigs; + typedef std::vector ServiceConfigs; ServiceConfigs serviceConfigs; Config(); diff --git a/src/adaptation/DynamicGroupCfg.h b/src/adaptation/DynamicGroupCfg.h index 8f70ee4bf4..efd1523fa2 100644 --- a/src/adaptation/DynamicGroupCfg.h +++ b/src/adaptation/DynamicGroupCfg.h @@ -1,9 +1,10 @@ #ifndef SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H #define SQUID_ADAPTATION__DYNAMIC_GROUP_CFG_H -#include "base/Vector.h" #include "SquidString.h" +#include + namespace Adaptation { @@ -11,7 +12,7 @@ namespace Adaptation class DynamicGroupCfg { public: - typedef Vector Store; + typedef std::vector Store; typedef String Id; Id id; ///< group id diff --git a/src/adaptation/History.h b/src/adaptation/History.h index b502838b89..52120671ef 100644 --- a/src/adaptation/History.h +++ b/src/adaptation/History.h @@ -57,7 +57,7 @@ public: /// AccessLogEntry::notes when ALE becomes available NotePairs::Pointer metaHeaders; - typedef Vector AdaptationServices; + typedef std::vector AdaptationServices; AdaptationServices theAdaptationServices; ///< The service groups used /// sets future services for the Adaptation::AccessCheck to notice @@ -87,7 +87,7 @@ private: bool retried; ///< whether the xaction was replaced by another }; - typedef Vector Entries; + typedef std::vector Entries; Entries theEntries; ///< historical record, in the order of xact starts // theXx* will become a map, but we only support one record diff --git a/src/adaptation/Service.h b/src/adaptation/Service.h index f149ce1f2f..7a020ff4d9 100644 --- a/src/adaptation/Service.h +++ b/src/adaptation/Service.h @@ -61,7 +61,7 @@ private: typedef Service::Pointer ServicePointer; -typedef Vector Services; +typedef std::vector Services; Services &AllServices(); ServicePointer FindService(const Service::Id &key); diff --git a/src/adaptation/ServiceGroups.h b/src/adaptation/ServiceGroups.h index ab7bc6f711..33d56024e1 100644 --- a/src/adaptation/ServiceGroups.h +++ b/src/adaptation/ServiceGroups.h @@ -4,9 +4,10 @@ #include "adaptation/Elements.h" #include "adaptation/forward.h" #include "base/RefCount.h" -#include "base/Vector.h" #include "SquidString.h" +#include + namespace Adaptation { @@ -17,9 +18,9 @@ class ServiceGroup: public RefCountable public: typedef RefCount Pointer; - typedef Vector Store; + typedef std::vector Store; typedef String Id; - typedef unsigned int Pos; // Vector<>::poistion_type + typedef unsigned int Pos; // vector<>::position_type friend class ServicePlan; public: @@ -113,7 +114,7 @@ public: class ServicePlan { public: - typedef unsigned int Pos; // Vector<>::poistion_type + typedef unsigned int Pos; // vector<>::position_type public: ServicePlan(); @@ -141,7 +142,7 @@ std::ostream &operator <<(std::ostream &os, const ServicePlan &p) return p.print(os); } -typedef Vector Groups; +typedef std::vector Groups; Groups &AllGroups(); ServiceGroupPointer FindGroup(const ServiceGroup::Id &id); diff --git a/src/adaptation/icap/Config.cc b/src/adaptation/icap/Config.cc index d66c3f67c9..74506632e0 100644 --- a/src/adaptation/icap/Config.cc +++ b/src/adaptation/icap/Config.cc @@ -33,7 +33,6 @@ #include "squid.h" #include "adaptation/icap/Config.h" #include "adaptation/icap/ServiceRep.h" -#include "base/Vector.h" #include "ConfigParser.h" #include "HttpReply.h" #include "HttpRequest.h" diff --git a/src/adaptation/icap/ServiceRep.h b/src/adaptation/icap/ServiceRep.h index fad4d76eac..2843bff6bd 100644 --- a/src/adaptation/icap/ServiceRep.h +++ b/src/adaptation/icap/ServiceRep.h @@ -140,7 +140,7 @@ private: AsyncCall::Pointer callback; }; - typedef Vector Clients; + typedef std::vector Clients; // TODO: rename to theUpWaiters Clients theClients; // all clients waiting for a call back diff --git a/src/cache_cf.cc b/src/cache_cf.cc index 0d7e92b5e0..ef28936f65 100644 --- a/src/cache_cf.cc +++ b/src/cache_cf.cc @@ -250,7 +250,7 @@ static void free_sslproxy_ssl_bump(acl_access **ssl_bump); static void parse_b_size_t(size_t * var); static void parse_b_int64_t(int64_t * var); -static bool parseNamedIntList(const char *data, const String &name, Vector &list); +static bool parseNamedIntList(const char *data, const String &name, std::vector &list); static void parse_CpuAffinityMap(CpuAffinityMap **const cpuAffinityMap); static void dump_CpuAffinityMap(StoreEntry *const entry, const char *const name, const CpuAffinityMap *const cpuAffinityMap); @@ -490,7 +490,7 @@ parseOneConfigFile(const char *file_name, unsigned int depth) config_lineno = 0; - Vector if_states; + std::vector if_states; while (fgets(config_input_line, BUFSIZ, fp)) { ++config_lineno; @@ -4261,7 +4261,7 @@ free_access_log(CustomLog ** definitions) /// parses list of integers form name=N1,N2,N3,... static bool -parseNamedIntList(const char *data, const String &name, Vector &list) +parseNamedIntList(const char *data, const String &name, std::vector &list) { if (data && (strncmp(data, name.rawBuf(), name.size()) == 0)) { data += name.size(); @@ -4294,7 +4294,7 @@ parse_CpuAffinityMap(CpuAffinityMap **const cpuAffinityMap) const char *const pToken = ConfigParser::NextToken(); const char *const cToken = ConfigParser::NextToken(); - Vector processes, cores; + std::vector processes, cores; if (!parseNamedIntList(pToken, "process_numbers", processes)) { debugs(3, DBG_CRITICAL, "FATAL: bad 'process_numbers' parameter " << "in 'cpu_affinity_map'"); diff --git a/src/delay_pools.cc b/src/delay_pools.cc index 96489686eb..78b7628946 100644 --- a/src/delay_pools.cc +++ b/src/delay_pools.cc @@ -42,7 +42,6 @@ #include "squid.h" #if USE_DELAY_POOLS -#include "base/Vector.h" #include "client_side_request.h" #include "comm/Connection.h" #include "CommonPool.h" @@ -592,7 +591,7 @@ DelayPools::Update(void *unused) LastUpdate = squid_curtime; - Vector::iterator pos = toUpdate.begin(); + std::vector::iterator pos = toUpdate.begin(); while (pos != toUpdate.end()) { (*pos)->update(incr); @@ -610,7 +609,7 @@ DelayPools::registerForUpdates(Updateable *anObject) void DelayPools::deregisterForUpdates (Updateable *anObject) { - Vector::iterator pos = toUpdate.begin(); + std::vector::iterator pos = toUpdate.begin(); while (pos != toUpdate.end() && *pos != anObject) { ++pos; @@ -618,7 +617,7 @@ DelayPools::deregisterForUpdates (Updateable *anObject) if (pos != toUpdate.end()) { /* move all objects down one */ - Vector::iterator temp = pos; + std::vector::iterator temp = pos; ++pos; while (pos != toUpdate.end()) { @@ -631,7 +630,7 @@ DelayPools::deregisterForUpdates (Updateable *anObject) } } -Vector DelayPools::toUpdate; +std::vector DelayPools::toUpdate; void DelayPools::Stats(StoreEntry * sentry) diff --git a/src/errorpage.cc b/src/errorpage.cc index 942588e91c..c93ffd9d0d 100644 --- a/src/errorpage.cc +++ b/src/errorpage.cc @@ -119,7 +119,7 @@ error_hard_text[] = { }; /// \ingroup ErrorPageInternal -static Vector ErrorDynamicPages; +static std::vector ErrorDynamicPages; /* local prototypes */ diff --git a/src/esi/CustomParser.cc b/src/esi/CustomParser.cc index 986406240c..90143b6781 100644 --- a/src/esi/CustomParser.cc +++ b/src/esi/CustomParser.cc @@ -32,12 +32,14 @@ */ #include "squid.h" -#include "base/Vector.h" #include "Debug.h" #include "esi/CustomParser.h" +#include "fatal.h" #include "libTrie/Trie.h" #include "libTrie/TrieCharTransform.h" +#include + Trie *ESICustomParser::SearchTrie=NULL; EsiParserDefinition(ESICustomParser); @@ -147,7 +149,7 @@ ESICustomParser::parse(char const *dataToParse, size_t const lengthOfData, bool *tagEnd = '\0'; - Vectorattributes; + std::vectorattributes; char *attribute = const_cast(endofName + 1); diff --git a/src/fs/rock/RockSwapDir.h b/src/fs/rock/RockSwapDir.h index cad826e578..e58052c730 100644 --- a/src/fs/rock/RockSwapDir.h +++ b/src/fs/rock/RockSwapDir.h @@ -146,8 +146,8 @@ protected: virtual void create(const RunnerRegistry &); private: - Vector mapOwners; - Vector< Ipc::Mem::Owner *> freeSlotsOwners; + std::vector mapOwners; + std::vector< Ipc::Mem::Owner *> freeSlotsOwners; }; } // namespace Rock diff --git a/src/ipc/Kids.h b/src/ipc/Kids.h index 2263189b60..052ae64686 100644 --- a/src/ipc/Kids.h +++ b/src/ipc/Kids.h @@ -4,9 +4,10 @@ #ifndef SQUID_IPC_KIDS_H #define SQUID_IPC_KIDS_H -#include "base/Vector.h" #include "ipc/Kid.h" +#include + /// a collection of kids class Kids { @@ -46,7 +47,7 @@ public: size_t count() const; private: - Vector storage; + std::vector storage; }; extern Kids TheKids; ///< All kids being maintained