diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-23 16:35:14 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-23 16:35:14 +0900 |
| commit | bb5b7eeedb3ce7396007818cbab4f5f5660997a5 (patch) | |
| tree | 41a99eb7c420b811b686f641220fc47d4cc03c0d /src/MultiUrlRequestInfo.cc | |
| parent | 28c84148e437dc073937629ac9c9905e1445f16c (diff) | |
Move RequestGroup vector from Context to RequestGroupMan
Diffstat (limited to 'src/MultiUrlRequestInfo.cc')
| -rw-r--r-- | src/MultiUrlRequestInfo.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/MultiUrlRequestInfo.cc b/src/MultiUrlRequestInfo.cc index e99d4f7d..bb054469 100644 --- a/src/MultiUrlRequestInfo.cc +++ b/src/MultiUrlRequestInfo.cc @@ -104,12 +104,13 @@ void handler(int signal) { } // namespace MultiUrlRequestInfo::MultiUrlRequestInfo -(std::vector<std::shared_ptr<RequestGroup> >& requestGroups, +(std::vector<std::shared_ptr<RequestGroup> > requestGroups, const std::shared_ptr<Option>& op, const std::shared_ptr<StatCalc>& statCalc, const std::shared_ptr<OutputFile>& summaryOut, const std::shared_ptr<UriListParser>& uriListParser) - : option_(op), + : requestGroups_(std::move(requestGroups)), + option_(op), statCalc_(statCalc), summaryOut_(summaryOut), uriListParser_(uriListParser), @@ -120,7 +121,6 @@ MultiUrlRequestInfo::MultiUrlRequestInfo #else // !HAVE_SIGACTION mask_ = 0; #endif // !HAVE_SIGACTION - requestGroups_.swap(requestGroups); } MultiUrlRequestInfo::~MultiUrlRequestInfo() {} @@ -160,10 +160,9 @@ int MultiUrlRequestInfo::prepare() } #endif // ENABLE_SSL + // RequestGroups will be transferred to DownloadEngine e_ = DownloadEngineFactory().newDownloadEngine(option_.get(), - requestGroups_); - // Avoid keeping RequestGroups alive longer than necessary - requestGroups_.clear(); + std::move(requestGroups_)); #ifdef ENABLE_WEBSOCKET if(option_->getAsBool(PREF_ENABLE_RPC)) { |