From 253f9a224e8e78182b3e5f26c422002a3b581c2c Mon Sep 17 00:00:00 2001 From: Kozoriz Date: Thu, 10 Mar 2016 10:59:30 +0200 Subject: TimeTester refatctoring. Removed singletone using from TimeTester. TimeTester renamed -> TelemetryMonitor. All files and directories corrected. Tests corrected, all works. Disabled 2 tests(task created). Related to : APPLINK-21915 --- .../protocol_handler/protocol_handler_impl.h | 26 ++++++---- .../include/protocol_handler/telemetry_observer.h | 56 ++++++++++++++++++++++ .../protocol_handler/time_metric_observer.h | 56 ---------------------- 3 files changed, 72 insertions(+), 66 deletions(-) create mode 100644 src/components/protocol_handler/include/protocol_handler/telemetry_observer.h delete mode 100644 src/components/protocol_handler/include/protocol_handler/time_metric_observer.h (limited to 'src/components/protocol_handler/include/protocol_handler') diff --git a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h index 9795adaa54..bda65803e8 100644 --- a/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h +++ b/src/components/protocol_handler/include/protocol_handler/protocol_handler_impl.h @@ -57,9 +57,10 @@ #include "transport_manager/transport_manager_listener_empty.h" #include "connection_handler/connection_handler.h" -#ifdef TIME_TESTER -#include "protocol_handler/time_metric_observer.h" -#endif // TIME_TESTER +#ifdef TELEMETRY_MONITOR +#include "protocol_handler/telemetry_observer.h" +#include "telemetry_monitor/telemetry_observable.h" +#endif // TELEMETRY_MONITOR #ifdef ENABLE_SECURITY #include "security_manager/security_manager.h" @@ -138,7 +139,12 @@ class ProtocolHandlerImpl : public ProtocolHandler, public TransportManagerListenerEmpty, public impl::FromMobileQueue::Handler, - public impl::ToMobileQueue::Handler { + public impl::ToMobileQueue::Handler +#ifdef TELEMETRY_MONITOR + , + public telemetry_monitor::TelemetryObservable +#endif // TELEMETRY_MONITOR + { public: /** * @brief Constructor @@ -194,14 +200,14 @@ class ProtocolHandlerImpl */ void SendFramesNumber(uint32_t connection_key, int32_t number_of_frames); -#ifdef TIME_TESTER +#ifdef TELEMETRY_MONITOR /** * @brief Setup observer for time metric. * * @param observer - pointer to observer */ - void SetTimeMetricObserver(PHMetricObserver *observer); -#endif // TIME_TESTER + void SetTelemetryObserver(PHTelemetryObserver *observer); +#endif // TELEMETRY_MONITOR /* * Prepare and send heartbeat message to mobile @@ -545,9 +551,9 @@ class ProtocolHandlerImpl sync_primitives::Lock protocol_observers_lock_; -#ifdef TIME_TESTER - PHMetricObserver *metric_observer_; -#endif // TIME_TESTER +#ifdef TELEMETRY_MONITOR + PHTelemetryObserver *metric_observer_; +#endif // TELEMETRY_MONITOR }; } // namespace protocol_handler #endif // SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_PROTOCOL_HANDLER_IMPL_H_ diff --git a/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h b/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h new file mode 100644 index 0000000000..f0923623e0 --- /dev/null +++ b/src/components/protocol_handler/include/protocol_handler/telemetry_observer.h @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2014, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_ +#define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_ +#include "protocol/common.h" + +#include +#include "utils/date_time.h" + +namespace protocol_handler { + +class PHTelemetryObserver { + public: + struct MessageMetric { + RawMessagePtr raw_msg; + uint32_t message_id; + uint8_t connection_key; + TimevalStruct begin; + TimevalStruct end; + }; + virtual void StartMessageProcess(uint32_t message_id, const TimevalStruct &start_time) = 0; + virtual void EndMessageProcess(utils::SharedPtr m) = 0; + virtual ~PHTelemetryObserver(){} +}; +} // protocol_handler +#endif // SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_ diff --git a/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h b/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h deleted file mode 100644 index 1d3d83ea48..0000000000 --- a/src/components/protocol_handler/include/protocol_handler/time_metric_observer.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) 2014, Ford Motor Company - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following - * disclaimer in the documentation and/or other materials provided with the - * distribution. - * - * Neither the name of the Ford Motor Company nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_ -#define SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_ -#include "protocol/common.h" - -#include -#include "utils/date_time.h" - -namespace protocol_handler { - -class PHMetricObserver { - public: - struct MessageMetric { - RawMessagePtr raw_msg; - uint32_t message_id; - uint8_t connection_key; - TimevalStruct begin; - TimevalStruct end; - }; - virtual void StartMessageProcess(uint32_t message_id, const TimevalStruct &start_time) = 0; - virtual void EndMessageProcess(utils::SharedPtr m) = 0; - virtual ~PHMetricObserver(){} -}; -} // protocol_handler -#endif // SRC_COMPONENTS_PROTOCOL_HANDLER_INCLUDE_PROTOCOL_HANDLER_TIME_METRIC_OBSERVER_H_ -- cgit v1.2.1