diff options
Diffstat (limited to 'src/components/application_manager/src/request_info.cc')
| -rw-r--r-- | src/components/application_manager/src/request_info.cc | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/components/application_manager/src/request_info.cc b/src/components/application_manager/src/request_info.cc index 9a5828d939..bbcda06b43 100644 --- a/src/components/application_manager/src/request_info.cc +++ b/src/components/application_manager/src/request_info.cc @@ -51,7 +51,7 @@ HMIRequestInfo::HMIRequestInfo(RequestPtr request, const uint64_t timeout_msec) } HMIRequestInfo::HMIRequestInfo(RequestPtr request, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) : RequestInfo(request, HMIRequest, start_time, timeout_msec) { correlation_id_ = request_->correlation_id(); @@ -66,7 +66,7 @@ MobileRequestInfo::MobileRequestInfo(RequestPtr request, } MobileRequestInfo::MobileRequestInfo(RequestPtr request, - const TimevalStruct& start_time, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) : RequestInfo(request, MobileRequest, start_time, timeout_msec) { correlation_id_ = request_.get()->correlation_id(); @@ -74,19 +74,19 @@ MobileRequestInfo::MobileRequestInfo(RequestPtr request, } RequestInfo::RequestInfo(RequestPtr request, - const RequestInfo::RequestType requst_type, - const TimevalStruct& start_time, + const RequestInfo::RequestType request_type, + const date_time::TimeDuration& start_time, const uint64_t timeout_msec) : request_(request), start_time_(start_time), timeout_msec_(timeout_msec) { updateEndTime(); - requst_type_ = requst_type; + request_type_ = request_type; correlation_id_ = request_->correlation_id(); app_id_ = request_->connection_key(); } void application_manager::request_controller::RequestInfo::updateEndTime() { - end_time_ = date_time::DateTime::getCurrentTime(); - date_time::DateTime::AddMilliseconds(end_time_, timeout_msec_); + end_time_ = date_time::getCurrentTime(); + date_time::AddMilliseconds(end_time_, timeout_msec_); } void RequestInfo::updateTimeOut(const uint64_t& timeout_msec) { @@ -95,9 +95,8 @@ void RequestInfo::updateTimeOut(const uint64_t& timeout_msec) { } bool RequestInfo::isExpired() { - TimevalStruct curr_time = date_time::DateTime::getCurrentTime(); - return date_time::DateTime::getmSecs(end_time_) <= - date_time::DateTime::getmSecs(curr_time); + date_time::TimeDuration curr_time = date_time::getCurrentTime(); + return date_time::getmSecs(end_time_) <= date_time::getmSecs(curr_time); } uint64_t RequestInfo::hash() { @@ -123,7 +122,7 @@ bool RequestInfoSet::Add(RequestInfoPtr request_info) { logger_, "Add request app_id = " << request_info->app_id() << "; corr_id = " << request_info->requestId()); - sync_primitives::AutoLock lock(this_lock_); + sync_primitives::AutoLock lock(pending_requests_lock_); CheckSetSizes(); const std::pair<HashSortedRequestInfoSet::iterator, bool>& insert_resilt = hash_sorted_pending_requests_.insert(request_info); @@ -151,10 +150,10 @@ RequestInfoPtr RequestInfoSet::Find(const uint32_t connection_key, RequestInfoPtr result; // Request info for searching in request info set by log_n time - utils::SharedPtr<FakeRequestInfo> request_info_for_search( + std::shared_ptr<FakeRequestInfo> request_info_for_search( new FakeRequestInfo(connection_key, correlation_id)); - sync_primitives::AutoLock lock(this_lock_); + sync_primitives::AutoLock lock(pending_requests_lock_); HashSortedRequestInfoSet::iterator it = hash_sorted_pending_requests_.find(request_info_for_search); if (it != hash_sorted_pending_requests_.end()) { @@ -166,7 +165,7 @@ RequestInfoPtr RequestInfoSet::Find(const uint32_t connection_key, RequestInfoPtr RequestInfoSet::Front() { RequestInfoPtr result; - sync_primitives::AutoLock lock(this_lock_); + sync_primitives::AutoLock lock(pending_requests_lock_); TimeSortedRequestInfoSet::iterator it = time_sorted_pending_requests_.begin(); if (it != time_sorted_pending_requests_.end()) { result = *it; @@ -176,7 +175,7 @@ RequestInfoPtr RequestInfoSet::Front() { RequestInfoPtr RequestInfoSet::FrontWithNotNullTimeout() { LOG4CXX_AUTO_TRACE(logger_); - sync_primitives::AutoLock lock(this_lock_); + sync_primitives::AutoLock lock(pending_requests_lock_); RequestInfoPtr result; TimeSortedRequestInfoSet::iterator it = time_sorted_pending_requests_.begin(); while (it != time_sorted_pending_requests_.end()) { @@ -220,7 +219,7 @@ bool RequestInfoSet::Erase(const RequestInfoPtr request_info) { } bool RequestInfoSet::RemoveRequest(const RequestInfoPtr request_info) { - sync_primitives::AutoLock lock(this_lock_); + sync_primitives::AutoLock lock(pending_requests_lock_); return Erase(request_info); } @@ -229,7 +228,7 @@ uint32_t RequestInfoSet::RemoveRequests( LOG4CXX_AUTO_TRACE(logger_); uint32_t erased = 0; - sync_primitives::AutoLock lock(this_lock_); + sync_primitives::AutoLock lock(pending_requests_lock_); HashSortedRequestInfoSet::iterator it = std::find_if(hash_sorted_pending_requests_.begin(), hash_sorted_pending_requests_.end(), @@ -257,6 +256,7 @@ uint32_t RequestInfoSet::RemoveMobileRequests() { } const size_t RequestInfoSet::Size() { + sync_primitives::AutoLock lock(pending_requests_lock_); CheckSetSizes(); return time_sorted_pending_requests_.size(); } @@ -283,7 +283,7 @@ bool RequestInfoSet::AppIdCompararator::operator()( bool RequestInfoTimeComparator::operator()(const RequestInfoPtr lhs, const RequestInfoPtr rhs) const { date_time::TimeCompare compare_result = - date_time::DateTime::compareTime(lhs->end_time(), rhs->end_time()); + date_time::compareTime(lhs->end_time(), rhs->end_time()); if (compare_result == date_time::LESS) { return true; } else if (compare_result == date_time::GREATER) { |