diff options
author | Lutz Helwing <lutz_helwing@mentor.com> | 2015-09-22 10:49:29 +0200 |
---|---|---|
committer | Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> | 2015-10-07 10:37:19 +0200 |
commit | 4c8d43322e89b87288fb5ba12e523237e620481b (patch) | |
tree | 202bc05d45f14f7f30dd3826362811d3ce8840fd /tests/dlt-test-cpp-extension.cpp | |
parent | e5ffa017047525ed2e3ee41ea2294546ee64894c (diff) | |
download | DLT-daemon-4c8d43322e89b87288fb5ba12e523237e620481b.tar.gz |
Fixed whitespace and formatting of new code Fixed licence headers
Signed-off-by: Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Diffstat (limited to 'tests/dlt-test-cpp-extension.cpp')
-rw-r--r-- | tests/dlt-test-cpp-extension.cpp | 180 |
1 files changed, 92 insertions, 88 deletions
diff --git a/tests/dlt-test-cpp-extension.cpp b/tests/dlt-test-cpp-extension.cpp index ce9f1db..c4cf70c 100644 --- a/tests/dlt-test-cpp-extension.cpp +++ b/tests/dlt-test-cpp-extension.cpp @@ -1,118 +1,122 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2015 Intel Corporation + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2015 Intel Corporation * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt-test-cpp-extension.cpp * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Stefan Vacek <stefan.vacek@intel.com> Intel Corporation + * + * \copyright Copyright © 2015 Intel Corporation. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-test-cpp-extension.cpp +*/ + #include "dlt_cpp_extension.hpp" #include <stdio.h> #include <string.h> - struct MyStruct { - int64_t uuid; - int32_t interfaceId; - int32_t registrationState; + int64_t uuid; + int32_t interfaceId; + int32_t registrationState; }; - template<> inline int logToDlt(DltContextData & log, MyStruct const & value) { - int result = 0; - - result += dlt_user_log_write_string(&log, "("); - result += logToDlt(log, value.uuid); - result += dlt_user_log_write_string(&log, ","); - result += logToDlt(log, value.interfaceId); - result += dlt_user_log_write_string(&log, ","); - result += logToDlt(log, value.registrationState); - result += dlt_user_log_write_string(&log, ")"); - - if (result != 0) - { - result = -1; - } - - return result; + int result = 0; + + result += dlt_user_log_write_string(&log, "("); + result += logToDlt(log, value.uuid); + result += dlt_user_log_write_string(&log, ","); + result += logToDlt(log, value.interfaceId); + result += dlt_user_log_write_string(&log, ","); + result += logToDlt(log, value.registrationState); + result += dlt_user_log_write_string(&log, ")"); + + if (result != 0) + { + result = -1; + } + + return result; } - /** * Sample code to show usage of the cpp-extension * mainly the variadic templates */ int main() { - if (dlt_register_app("TCPP", "Test cpp extension") < 0) - { - printf("Failed to register application\n"); - return -1; - } - - DltContext ctx; - if (dlt_register_context_ll_ts(&ctx, "TCPP", "Test cpp extension", DLT_LOG_INFO, DLT_TRACE_STATUS_OFF) < 0) - { - printf("Failed to register context\n"); - return -1; - } - - dlt_enable_local_print(); - dlt_verbose_mode(); - - DLT_LOG(ctx, DLT_LOG_WARN, DLT_STRING("a message")); /* the classic way to go */ - - int an_int = 42; - float a_float = 22.7; - DLT_LOG_FCN_CXX(ctx, DLT_LOG_WARN, "Testing DLT_LOG_CXX_FCN", an_int, a_float); - DLT_LOG_CXX(ctx, DLT_LOG_WARN, 1.0, 65); - - /* Example for logging user-defined types */ - MyStruct myData = { 1u, 2u, 3u}; - DLT_LOG_CXX(ctx, DLT_LOG_WARN, "MyStruct myData", myData); - - char * non_const_string = (char *)malloc(17); - memcpy(non_const_string, "non_const_string", 16); - non_const_string[16] = 0; - DLT_LOG_CXX(ctx, DLT_LOG_WARN, "char *", non_const_string); - - std::string aString = "std::string"; - DLT_LOG_CXX(ctx, DLT_LOG_WARN, "std::string", aString); - - std::vector<int> intVector; - intVector.push_back(0); - intVector.push_back(1); - intVector.push_back(2); - DLT_LOG_CXX(ctx, DLT_LOG_WARN, "vector", intVector); - - std::vector<double> doubleList; - doubleList.push_back(10.); - doubleList.push_back(11.); - doubleList.push_back(12.); - DLT_LOG_CXX(ctx, DLT_LOG_WARN, "list", doubleList); - - std::map<const char *, int> testMap; - testMap["apple"] = 100; - testMap["plum"] = 200; - testMap["orange"] = 300; - DLT_LOG_CXX(ctx, DLT_LOG_WARN, "map", testMap); - - dlt_unregister_context(&ctx); - dlt_unregister_app(); - - return 0; + if (dlt_register_app("TCPP", "Test cpp extension") < 0) + { + printf("Failed to register application\n"); + return -1; + } + + DltContext ctx; + if (dlt_register_context_ll_ts(&ctx, "TCPP", "Test cpp extension", DLT_LOG_INFO, DLT_TRACE_STATUS_OFF) < 0) + { + printf("Failed to register context\n"); + return -1; + } + + dlt_enable_local_print(); + dlt_verbose_mode(); + + DLT_LOG(ctx, DLT_LOG_WARN, DLT_STRING("a message")); /* the classic way to go */ + + int an_int = 42; + float a_float = 22.7; + DLT_LOG_FCN_CXX(ctx, DLT_LOG_WARN, "Testing DLT_LOG_CXX_FCN", an_int, a_float); + DLT_LOG_CXX(ctx, DLT_LOG_WARN, 1.0, 65); + + /* Example for logging user-defined types */ + MyStruct myData = { 1u, 2u, 3u }; + DLT_LOG_CXX(ctx, DLT_LOG_WARN, "MyStruct myData", myData); + + char * non_const_string = (char *) malloc(17); + memcpy(non_const_string, "non_const_string", 16); + non_const_string[16] = 0; + DLT_LOG_CXX(ctx, DLT_LOG_WARN, "char *", non_const_string); + + std::string aString = "std::string"; + DLT_LOG_CXX(ctx, DLT_LOG_WARN, "std::string", aString); + + std::vector<int> intVector; + intVector.push_back(0); + intVector.push_back(1); + intVector.push_back(2); + DLT_LOG_CXX(ctx, DLT_LOG_WARN, "vector", intVector); + + std::vector<double> doubleList; + doubleList.push_back(10.); + doubleList.push_back(11.); + doubleList.push_back(12.); + DLT_LOG_CXX(ctx, DLT_LOG_WARN, "list", doubleList); + + std::map<const char *, int> testMap; + testMap["apple"] = 100; + testMap["plum"] = 200; + testMap["orange"] = 300; + DLT_LOG_CXX(ctx, DLT_LOG_WARN, "map", testMap); + + dlt_unregister_context(&ctx); + dlt_unregister_app(); + + return 0; } |