From 32caf7f1db12965712a1f74016e7b55e258cab73 Mon Sep 17 00:00:00 2001 From: Christian Linke Date: Wed, 25 Sep 2013 15:42:47 +0200 Subject: * made sure that CommonAPI stuff compiles with release 2.1 Signed-off-by: Christian Linke --- AudioManagerDaemon/fidls/NodeStateManager.fdepl | 2 +- .../src-gen/org/genivi/NodeStateManager/Consumer.h | 27 ++- .../genivi/NodeStateManager/ConsumerDBusProxy.cpp | 46 +++-- .../genivi/NodeStateManager/ConsumerDBusProxy.h | 48 +++-- .../org/genivi/NodeStateManager/ConsumerProxy.h | 162 +++++++++-------- .../genivi/NodeStateManager/ConsumerProxyBase.h | 202 +++++++++++---------- .../org/genivi/NodeStateManager/ConsumerStub.h | 90 +++++---- .../NodeStateManager/ConsumerStubDefault.cpp | 124 ++++++++----- .../genivi/NodeStateManager/ConsumerStubDefault.h | 66 ++++--- .../genivi/NodeStateManager/LifeCycleConsumer.h | 27 ++- .../LifeCycleConsumerDBusProxy.cpp | 34 +++- .../NodeStateManager/LifeCycleConsumerDBusProxy.h | 30 ++- .../LifeCycleConsumerDBusStubAdapter.cpp | 53 ++++-- .../LifeCycleConsumerDBusStubAdapter.h | 36 +++- .../NodeStateManager/LifeCycleConsumerProxy.h | 65 +++++-- .../NodeStateManager/LifeCycleConsumerProxyBase.h | 82 +++++---- .../NodeStateManager/LifeCycleConsumerStub.h | 35 +++- .../LifeCycleConsumerStubDefault.cpp | 24 ++- .../LifeCycleConsumerStubDefault.h | 30 ++- 19 files changed, 757 insertions(+), 426 deletions(-) (limited to 'AudioManagerDaemon') diff --git a/AudioManagerDaemon/fidls/NodeStateManager.fdepl b/AudioManagerDaemon/fidls/NodeStateManager.fdepl index 624175f..e524417 100644 --- a/AudioManagerDaemon/fidls/NodeStateManager.fdepl +++ b/AudioManagerDaemon/fidls/NodeStateManager.fdepl @@ -1,4 +1,4 @@ -import "platform:/plugin/org.genivi.commonapi.dbus/deployment/deployment.fdepl" +import "platform:/plugin/org.genivi.commonapi.dbus/deployment/CommonAPI-DBus_deployment.fdepl" import "NodeStateManager.fidl" define org.genivi.commonapi.dbus.deployment.deployment for interface org.genivi.NodeStateManager.Consumer { diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h index 026f431..9c36cb8 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/Consumer.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_H_ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_H_ +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include @@ -29,7 +45,8 @@ class Consumer { }; const char* Consumer::getInterfaceId() { - return "org.genivi.NodeStateManager.Consumer"; + static const char* interfaceId = "org.genivi.NodeStateManager.Consumer"; + return interfaceId; } CommonAPI::Version Consumer::getInterfaceVersion() { diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp index 202680d..b61fde5 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.cpp @@ -1,10 +1,24 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #include "ConsumerDBusProxy.h" namespace org { @@ -12,12 +26,13 @@ namespace genivi { namespace NodeStateManager { std::shared_ptr createConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyConnection) { - return std::make_shared(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); + return std::make_shared(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } __attribute__((constructor)) void registerConsumerDBusProxy(void) { @@ -26,21 +41,22 @@ __attribute__((constructor)) void registerConsumerDBusProxy(void) { } ConsumerDBusProxy::ConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyconnection): - CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) -, bootMode_(*this, interfaceName.c_str(), "BootMode"), - restartReason_(*this, interfaceName.c_str(), "RestartReason"), - shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"), - wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason") + CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) +,bootMode_(*this, interfaceName.c_str(), "BootMode"), +restartReason_(*this, interfaceName.c_str(), "RestartReason"), +shutdownReason_(*this, interfaceName.c_str(), "ShutdownReason"), +wakeUpReason_(*this, interfaceName.c_str(), "WakeUpReason") , nodeApplicationMode_(*this, "NodeApplicationMode", "i"), - sessionStateChanged_(*this, "SessionStateChanged", "sii"), - nodeState_(*this, "NodeState", "i") - { -} + sessionStateChanged_(*this, "SessionStateChanged", "sii"), + nodeState_(*this, "NodeState", "i") + { + } ConsumerDBusProxy::BootModeAttribute& ConsumerDBusProxy::getBootModeAttribute() { return bootMode_; @@ -267,6 +283,8 @@ std::future ConsumerDBusProxy::SetSessionStateAsync(const std::move(callback)); } + + void ConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { ownVersionMajor = 1; ownVersionMinor = 0; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h index fe17687..e2f39e7 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerDBusProxy.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_DBUS_PROXY_H_ #include +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include #include @@ -28,6 +44,7 @@ namespace NodeStateManager { class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy { public: ConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, @@ -45,53 +62,46 @@ class ConsumerDBusProxy: virtual public ConsumerProxyBase, virtual public Common virtual SessionStateChangedEvent& getSessionStateChangedEvent(); virtual NodeStateEvent& getNodeStateEvent(); - virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count); virtual std::future GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback); - virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback); - virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version); virtual std::future GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback); - virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId); virtual std::future GetApplicationModeAsync(GetApplicationModeAsyncCallback callback); - virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback); - virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback); - virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback); - virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback); - virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId); virtual std::future GetNodeStateAsync(GetNodeStateAsyncCallback callback); - virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode); virtual std::future GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback); - virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback); + virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; private: - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute bootMode_; - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute restartReason_; - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute shutdownReason_; - CommonAPI::DBus::DBusFreedesktopReadonlyAttribute wakeUpReason_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute bootMode_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute restartReason_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute shutdownReason_; + CommonAPI::DBus::DBusFreedesktopReadonlyAttribute wakeUpReason_; CommonAPI::DBus::DBusEvent nodeApplicationMode_; CommonAPI::DBus::DBusEvent sessionStateChanged_; CommonAPI::DBus::DBusEvent nodeState_; + }; + + } // namespace NodeStateManager } // namespace genivi } // namespace org diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h index e0aab4d..1bc14b3 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerProxy.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_H_ #include "ConsumerProxyBase.h" +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include #include @@ -27,52 +43,57 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, ConsumerProxy(std::shared_ptr delegate); ~ConsumerProxy(); - /// Returns the wrapper class that provides access to the attribute BootMode. + /** + * Returns the wrapper class that provides access to the attribute BootMode. + */ virtual BootModeAttribute& getBootModeAttribute() { return delegate_->getBootModeAttribute(); } - - /// Returns the wrapper class that provides access to the attribute RestartReason. + /** + * Returns the wrapper class that provides access to the attribute RestartReason. + */ virtual RestartReasonAttribute& getRestartReasonAttribute() { return delegate_->getRestartReasonAttribute(); } - - /// Returns the wrapper class that provides access to the attribute ShutdownReason. + /** + * Returns the wrapper class that provides access to the attribute ShutdownReason. + */ virtual ShutdownReasonAttribute& getShutdownReasonAttribute() { return delegate_->getShutdownReasonAttribute(); } - - /// Returns the wrapper class that provides access to the attribute WakeUpReason. + /** + * Returns the wrapper class that provides access to the attribute WakeUpReason. + */ virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() { return delegate_->getWakeUpReasonAttribute(); } - - /// Returns the wrapper class that provides access to the broadcast NodeApplicationMode. + /** + * Returns the wrapper class that provides access to the broadcast NodeApplicationMode. + */ virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() { return delegate_->getNodeApplicationModeEvent(); } - - /// Returns the wrapper class that provides access to the broadcast SessionStateChanged. + /** + * Returns the wrapper class that provides access to the broadcast SessionStateChanged. + */ virtual SessionStateChangedEvent& getSessionStateChangedEvent() { return delegate_->getSessionStateChangedEvent(); } - - /// Returns the wrapper class that provides access to the broadcast NodeState. + /** + * Returns the wrapper class that provides access to the broadcast NodeState. + */ virtual NodeStateEvent& getNodeStateEvent() { return delegate_->getNodeStateEvent(); } - - /** * Calls GetAppHealthCount with synchronous semantics. * - * All non-const parameters will be filled with the returned values. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count); /** @@ -86,16 +107,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback); - /** * Calls LifecycleRequestComplete with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -109,15 +128,13 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback); - /** * Calls GetInterfaceVersion with synchronous semantics. * - * All non-const parameters will be filled with the returned values. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version); /** @@ -131,15 +148,13 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback); - /** * Calls GetApplicationMode with synchronous semantics. * - * All non-const parameters will be filled with the returned values. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId); /** @@ -153,16 +168,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future GetApplicationModeAsync(GetApplicationModeAsyncCallback callback); - /** * Calls UnRegisterSession with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -176,16 +189,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback); - /** * Calls RegisterSession with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -199,16 +210,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback); - /** * Calls UnRegisterShutdownClient with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -222,16 +231,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback); - /** * Calls RegisterShutdownClient with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -245,15 +252,13 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback); - /** * Calls GetNodeState with synchronous semantics. * - * All non-const parameters will be filled with the returned values. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId); /** @@ -267,16 +272,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future GetNodeStateAsync(GetNodeStateAsyncCallback callback); - /** * Calls GetSessionState with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode); /** @@ -290,16 +293,14 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback); - /** * Calls SetSessionState with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -313,22 +314,38 @@ class ConsumerProxy: virtual public Consumer, virtual public ConsumerProxyBase, * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback); + - /// Returns the CommonAPI address of the remote partner this proxy communicates with. + /** + * Returns the CommonAPI address of the remote partner this proxy communicates with. + */ virtual std::string getAddress() const; - /// Returns the domain of the remote partner this proxy communicates with. + /** + * Returns the domain of the remote partner this proxy communicates with. + */ virtual const std::string& getDomain() const; - /// Returns the service ID of the remote partner this proxy communicates with. + /** + * Returns the service ID of the remote partner this proxy communicates with. + */ virtual const std::string& getServiceId() const; - /// Returns the instance ID of the remote partner this proxy communicates with. + /** + * Returns the instance ID of the remote partner this proxy communicates with. + */ virtual const std::string& getInstanceId() const; - /// Returns true if the remote partner for this proxy is available. + /** + * Returns true if the remote partner for this proxy is currently known to be available. + */ virtual bool isAvailable() const; + /** + * Returns true if the remote partner for this proxy is available. + */ + virtual bool isAvailableBlocking() const; + /** * Returns the wrapper class that is used to (de-)register for notifications about * the availability of the remote partner of this proxy. @@ -446,7 +463,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) { return delegate_->GetAppHealthCountAsync(callback); } - template void ConsumerProxy<_AttributeExtensions...>::LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) { delegate_->LifecycleRequestComplete(RequestId, Status, callStatus, ErrorCode); @@ -456,7 +472,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) { return delegate_->LifecycleRequestCompleteAsync(RequestId, Status, callback); } - template void ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) { delegate_->GetInterfaceVersion(callStatus, Version); @@ -466,7 +481,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) { return delegate_->GetInterfaceVersionAsync(callback); } - template void ConsumerProxy<_AttributeExtensions...>::GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) { delegate_->GetApplicationMode(callStatus, ErrorCode, ApplicationModeId); @@ -476,7 +490,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) { return delegate_->GetApplicationModeAsync(callback); } - template void ConsumerProxy<_AttributeExtensions...>::UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) { delegate_->UnRegisterSession(SessionName, SessionOwner, SeatID, callStatus, ErrorCode); @@ -486,7 +499,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) { return delegate_->UnRegisterSessionAsync(SessionName, SessionOwner, SeatID, callback); } - template void ConsumerProxy<_AttributeExtensions...>::RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) { delegate_->RegisterSession(SessionName, SessionOwner, SeatID, SessionState, callStatus, ErrorCode); @@ -496,7 +508,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) { return delegate_->RegisterSessionAsync(SessionName, SessionOwner, SeatID, SessionState, callback); } - template void ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) { delegate_->UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, callStatus, ErrorCode); @@ -506,7 +517,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) { return delegate_->UnRegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, callback); } - template void ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) { delegate_->RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, callStatus, ErrorCode); @@ -516,7 +526,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) { return delegate_->RegisterShutdownClientAsync(BusName, ObjName, ShutdownMode, TimeoutMs, callback); } - template void ConsumerProxy<_AttributeExtensions...>::GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) { delegate_->GetNodeState(callStatus, ErrorCode, NodeStateId); @@ -526,7 +535,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::GetNodeStateAsync(GetNodeStateAsyncCallback callback) { return delegate_->GetNodeStateAsync(callback); } - template void ConsumerProxy<_AttributeExtensions...>::GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) { delegate_->GetSessionState(SessionName, SeatID, callStatus, SessionState, ErrorCode); @@ -536,7 +544,6 @@ template std::future ConsumerProxy<_AttributeExtensions...>::GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) { return delegate_->GetSessionStateAsync(SessionName, SeatID, callback); } - template void ConsumerProxy<_AttributeExtensions...>::SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) { delegate_->SetSessionState(SessionName, SessionOwner, SessionState, SeatID, callStatus, ErrorCode); @@ -547,7 +554,6 @@ std::future ConsumerProxy<_AttributeExtensions...>::SetSe return delegate_->SetSessionStateAsync(SessionName, SessionOwner, SessionState, SeatID, callback); } - template std::string ConsumerProxy<_AttributeExtensions...>::getAddress() const { return delegate_->getAddress(); @@ -573,6 +579,11 @@ bool ConsumerProxy<_AttributeExtensions...>::isAvailable() const { return delegate_->isAvailable(); } +template +bool ConsumerProxy<_AttributeExtensions...>::isAvailableBlocking() const { + return delegate_->isAvailableBlocking(); +} + template CommonAPI::ProxyStatusEvent& ConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() { return delegate_->getProxyStatusEvent(); @@ -583,6 +594,8 @@ CommonAPI::InterfaceVersionAttribute& ConsumerProxy<_AttributeExtensions...>::ge return delegate_->getInterfaceVersionAttribute(); } + + } // namespace NodeStateManager } // namespace genivi } // namespace org @@ -600,5 +613,4 @@ struct DefaultAttributeProxyFactoryHelper - #include - #include - #include - #include - - #undef COMMONAPI_INTERNAL_COMPILATION - - namespace org { - namespace genivi { - namespace NodeStateManager { - - class ConsumerProxyBase: virtual public CommonAPI::Proxy { - public: - typedef CommonAPI::ReadonlyAttribute BootModeAttribute; - typedef CommonAPI::ReadonlyAttribute RestartReasonAttribute; - typedef CommonAPI::ReadonlyAttribute ShutdownReasonAttribute; - typedef CommonAPI::ReadonlyAttribute WakeUpReasonAttribute; - typedef CommonAPI::Event NodeApplicationModeEvent; - typedef CommonAPI::Event SessionStateChangedEvent; - typedef CommonAPI::Event NodeStateEvent; - typedef std::function GetAppHealthCountAsyncCallback; - typedef std::function LifecycleRequestCompleteAsyncCallback; - typedef std::function GetInterfaceVersionAsyncCallback; - typedef std::function GetApplicationModeAsyncCallback; - typedef std::function UnRegisterSessionAsyncCallback; - typedef std::function RegisterSessionAsyncCallback; - typedef std::function UnRegisterShutdownClientAsyncCallback; - typedef std::function RegisterShutdownClientAsyncCallback; - typedef std::function GetNodeStateAsyncCallback; - typedef std::function GetSessionStateAsyncCallback; - typedef std::function SetSessionStateAsyncCallback; - - virtual BootModeAttribute& getBootModeAttribute() = 0; - virtual RestartReasonAttribute& getRestartReasonAttribute() = 0; - virtual ShutdownReasonAttribute& getShutdownReasonAttribute() = 0; - virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() = 0; - - virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() = 0; - virtual SessionStateChangedEvent& getSessionStateChangedEvent() = 0; - virtual NodeStateEvent& getNodeStateEvent() = 0; - - - virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0; - virtual std::future GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0; - - virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0; - - virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0; - virtual std::future GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0; - - virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) = 0; - virtual std::future GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) = 0; - - virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0; - - virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) = 0; - - virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0; - - virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0; - - virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) = 0; - virtual std::future GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0; - - virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0; - virtual std::future GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0; - - virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) = 0; - }; - - } // namespace NodeStateManager - } // namespace genivi - } // namespace org - - #endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_ +#ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_ +#define ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_ + +#include "Consumer.h" + + + +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif + + +#include +#include +#include +#include +#include + +#undef COMMONAPI_INTERNAL_COMPILATION + +namespace org { +namespace genivi { +namespace NodeStateManager { + +class ConsumerProxyBase: virtual public CommonAPI::Proxy { + public: + typedef CommonAPI::ReadonlyAttribute BootModeAttribute; + typedef CommonAPI::ReadonlyAttribute RestartReasonAttribute; + typedef CommonAPI::ReadonlyAttribute ShutdownReasonAttribute; + typedef CommonAPI::ReadonlyAttribute WakeUpReasonAttribute; + typedef CommonAPI::Event NodeApplicationModeEvent; + typedef CommonAPI::Event SessionStateChangedEvent; + typedef CommonAPI::Event NodeStateEvent; + + typedef std::function GetAppHealthCountAsyncCallback; + typedef std::function LifecycleRequestCompleteAsyncCallback; + typedef std::function GetInterfaceVersionAsyncCallback; + typedef std::function GetApplicationModeAsyncCallback; + typedef std::function UnRegisterSessionAsyncCallback; + typedef std::function RegisterSessionAsyncCallback; + typedef std::function UnRegisterShutdownClientAsyncCallback; + typedef std::function RegisterShutdownClientAsyncCallback; + typedef std::function GetNodeStateAsyncCallback; + typedef std::function GetSessionStateAsyncCallback; + typedef std::function SetSessionStateAsyncCallback; + + virtual BootModeAttribute& getBootModeAttribute() = 0; + virtual RestartReasonAttribute& getRestartReasonAttribute() = 0; + virtual ShutdownReasonAttribute& getShutdownReasonAttribute() = 0; + virtual WakeUpReasonAttribute& getWakeUpReasonAttribute() = 0; + + virtual NodeApplicationModeEvent& getNodeApplicationModeEvent() = 0; + virtual SessionStateChangedEvent& getSessionStateChangedEvent() = 0; + virtual NodeStateEvent& getNodeStateEvent() = 0; + + virtual void GetAppHealthCount(CommonAPI::CallStatus& callStatus, uint32_t& Count) = 0; + virtual std::future GetAppHealthCountAsync(GetAppHealthCountAsyncCallback callback) = 0; + virtual void LifecycleRequestComplete(const uint32_t& RequestId, const int32_t& Status, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future LifecycleRequestCompleteAsync(const uint32_t& RequestId, const int32_t& Status, LifecycleRequestCompleteAsyncCallback callback) = 0; + virtual void GetInterfaceVersion(CommonAPI::CallStatus& callStatus, uint32_t& Version) = 0; + virtual std::future GetInterfaceVersionAsync(GetInterfaceVersionAsyncCallback callback) = 0; + virtual void GetApplicationMode(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& ApplicationModeId) = 0; + virtual std::future GetApplicationModeAsync(GetApplicationModeAsyncCallback callback) = 0; + virtual void UnRegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future UnRegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, UnRegisterSessionAsyncCallback callback) = 0; + virtual void RegisterSession(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future RegisterSessionAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SeatID, const int32_t& SessionState, RegisterSessionAsyncCallback callback) = 0; + virtual void UnRegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future UnRegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, UnRegisterShutdownClientAsyncCallback callback) = 0; + virtual void RegisterShutdownClient(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future RegisterShutdownClientAsync(const std::string& BusName, const std::string& ObjName, const uint32_t& ShutdownMode, const uint32_t& TimeoutMs, RegisterShutdownClientAsyncCallback callback) = 0; + virtual void GetNodeState(CommonAPI::CallStatus& callStatus, int32_t& ErrorCode, int32_t& NodeStateId) = 0; + virtual std::future GetNodeStateAsync(GetNodeStateAsyncCallback callback) = 0; + virtual void GetSessionState(const std::string& SessionName, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& SessionState, int32_t& ErrorCode) = 0; + virtual std::future GetSessionStateAsync(const std::string& SessionName, const int32_t& SeatID, GetSessionStateAsyncCallback callback) = 0; + virtual void SetSessionState(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future SetSessionStateAsync(const std::string& SessionName, const std::string& SessionOwner, const int32_t& SessionState, const int32_t& SeatID, SetSessionStateAsyncCallback callback) = 0; +}; + +} // namespace NodeStateManager +} // namespace genivi +} // namespace org + +#endif // ORG_GENIVI_NODESTATEMANAGER_Consumer_PROXY_BASE_H_ diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h index 4d4aebb..b4bd9d7 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStub.h @@ -1,10 +1,24 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_H_ @@ -13,8 +27,11 @@ #include "Consumer.h" +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif +#include #include @@ -48,6 +65,15 @@ class ConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public Consume * Instead, the "fireEvent" methods of the stub should be used. */ virtual void fireNodeStateEvent(const int32_t& NodeState) = 0; + + + virtual void deactivateManagedInstances() = 0; + +protected: + /** + * Defines properties for storing the ClientIds of clients / proxies that have + * subscribed to the selective broadcasts + */ }; @@ -67,25 +93,9 @@ class ConsumerStubRemoteEvent { public: virtual ~ConsumerStubRemoteEvent() { } - /// Verification callback for remote set requests on the attribute BootMode. - virtual bool onRemoteSetBootModeAttribute(int32_t BootMode) = 0; - /// Action callback for remote set requests on the attribute BootMode. - virtual void onRemoteBootModeAttributeChanged() = 0; - /// Verification callback for remote set requests on the attribute RestartReason. - virtual bool onRemoteSetRestartReasonAttribute(int32_t RestartReason) = 0; - /// Action callback for remote set requests on the attribute RestartReason. - virtual void onRemoteRestartReasonAttributeChanged() = 0; - /// Verification callback for remote set requests on the attribute ShutdownReason. - virtual bool onRemoteSetShutdownReasonAttribute(int32_t ShutdownReason) = 0; - /// Action callback for remote set requests on the attribute ShutdownReason. - virtual void onRemoteShutdownReasonAttributeChanged() = 0; - /// Verification callback for remote set requests on the attribute WakeUpReason. - virtual bool onRemoteSetWakeUpReasonAttribute(int32_t WakeUpReason) = 0; - /// Action callback for remote set requests on the attribute WakeUpReason. - virtual void onRemoteWakeUpReasonAttributeChanged() = 0; }; @@ -100,44 +110,44 @@ class ConsumerStub : public CommonAPI::Stub clientId) = 0; + /// Provides getter access to the attribute RestartReason + virtual const int32_t& getRestartReasonAttribute(const std::shared_ptr clientId) = 0; + /// Provides getter access to the attribute ShutdownReason + virtual const int32_t& getShutdownReasonAttribute(const std::shared_ptr clientId) = 0; + /// Provides getter access to the attribute WakeUpReason + virtual const int32_t& getWakeUpReasonAttribute(const std::shared_ptr clientId) = 0; /// This is the method that will be called on remote calls on the method GetAppHealthCount. - virtual void GetAppHealthCount(uint32_t& Count) = 0; + virtual void GetAppHealthCount(const std::shared_ptr clientId, uint32_t& Count) = 0; /// This is the method that will be called on remote calls on the method LifecycleRequestComplete. - virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) = 0; + virtual void LifecycleRequestComplete(const std::shared_ptr clientId, uint32_t RequestId, int32_t Status, int32_t& ErrorCode) = 0; /// This is the method that will be called on remote calls on the method GetInterfaceVersion. - virtual void GetInterfaceVersion(uint32_t& Version) = 0; + virtual void GetInterfaceVersion(const std::shared_ptr clientId, uint32_t& Version) = 0; /// This is the method that will be called on remote calls on the method GetApplicationMode. - virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) = 0; + virtual void GetApplicationMode(const std::shared_ptr clientId, int32_t& ErrorCode, int32_t& ApplicationModeId) = 0; /// This is the method that will be called on remote calls on the method UnRegisterSession. - virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0; + virtual void UnRegisterSession(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) = 0; /// This is the method that will be called on remote calls on the method RegisterSession. - virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0; + virtual void RegisterSession(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) = 0; /// This is the method that will be called on remote calls on the method UnRegisterShutdownClient. - virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0; + virtual void UnRegisterShutdownClient(const std::shared_ptr clientId, std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) = 0; /// This is the method that will be called on remote calls on the method RegisterShutdownClient. - virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0; + virtual void RegisterShutdownClient(const std::shared_ptr clientId, std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) = 0; /// This is the method that will be called on remote calls on the method GetNodeState. - virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) = 0; + virtual void GetNodeState(const std::shared_ptr clientId, int32_t& ErrorCode, int32_t& NodeStateId) = 0; /// This is the method that will be called on remote calls on the method GetSessionState. - virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0; + virtual void GetSessionState(const std::shared_ptr clientId, std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) = 0; /// This is the method that will be called on remote calls on the method SetSessionState. - virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) = 0; - + virtual void SetSessionState(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) = 0; /// Sends a broadcast event for NodeApplicationMode. virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId) = 0; /// Sends a broadcast event for SessionStateChanged. virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState) = 0; /// Sends a broadcast event for NodeState. virtual void fireNodeStateEvent(const int32_t& NodeState) = 0; + }; } // namespace NodeStateManager diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp index 2cacb2f..0b19e12 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.cpp @@ -1,9 +1,20 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ #include @@ -24,12 +35,12 @@ const int32_t& ConsumerStubDefault::getBootModeAttribute() { return bootModeAttributeValue_; } -void ConsumerStubDefault::setBootModeAttribute(int32_t value) { - trySetBootModeAttribute(std::move(value)); +const int32_t& ConsumerStubDefault::getBootModeAttribute(const std::shared_ptr clientId) { + return getBootModeAttribute(); } -void ConsumerStubDefault::onRemoteBootModeAttributeChanged() { - // No operation in default +void ConsumerStubDefault::setBootModeAttribute(int32_t value) { + trySetBootModeAttribute(std::move(value)); } bool ConsumerStubDefault::trySetBootModeAttribute(int32_t value) { @@ -45,24 +56,17 @@ bool ConsumerStubDefault::validateBootModeAttributeRequestedValue(const int32_t& return true; } -bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetBootModeAttribute(int32_t value) { - return defaultStub_->trySetBootModeAttribute(std::move(value)); -} - -void ConsumerStubDefault::RemoteEventHandler::onRemoteBootModeAttributeChanged() { - defaultStub_->onRemoteBootModeAttributeChanged(); -} const int32_t& ConsumerStubDefault::getRestartReasonAttribute() { return restartReasonAttributeValue_; } -void ConsumerStubDefault::setRestartReasonAttribute(int32_t value) { - trySetRestartReasonAttribute(std::move(value)); +const int32_t& ConsumerStubDefault::getRestartReasonAttribute(const std::shared_ptr clientId) { + return getRestartReasonAttribute(); } -void ConsumerStubDefault::onRemoteRestartReasonAttributeChanged() { - // No operation in default +void ConsumerStubDefault::setRestartReasonAttribute(int32_t value) { + trySetRestartReasonAttribute(std::move(value)); } bool ConsumerStubDefault::trySetRestartReasonAttribute(int32_t value) { @@ -78,24 +82,17 @@ bool ConsumerStubDefault::validateRestartReasonAttributeRequestedValue(const int return true; } -bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetRestartReasonAttribute(int32_t value) { - return defaultStub_->trySetRestartReasonAttribute(std::move(value)); -} - -void ConsumerStubDefault::RemoteEventHandler::onRemoteRestartReasonAttributeChanged() { - defaultStub_->onRemoteRestartReasonAttributeChanged(); -} const int32_t& ConsumerStubDefault::getShutdownReasonAttribute() { return shutdownReasonAttributeValue_; } -void ConsumerStubDefault::setShutdownReasonAttribute(int32_t value) { - trySetShutdownReasonAttribute(std::move(value)); +const int32_t& ConsumerStubDefault::getShutdownReasonAttribute(const std::shared_ptr clientId) { + return getShutdownReasonAttribute(); } -void ConsumerStubDefault::onRemoteShutdownReasonAttributeChanged() { - // No operation in default +void ConsumerStubDefault::setShutdownReasonAttribute(int32_t value) { + trySetShutdownReasonAttribute(std::move(value)); } bool ConsumerStubDefault::trySetShutdownReasonAttribute(int32_t value) { @@ -111,24 +108,17 @@ bool ConsumerStubDefault::validateShutdownReasonAttributeRequestedValue(const in return true; } -bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetShutdownReasonAttribute(int32_t value) { - return defaultStub_->trySetShutdownReasonAttribute(std::move(value)); -} - -void ConsumerStubDefault::RemoteEventHandler::onRemoteShutdownReasonAttributeChanged() { - defaultStub_->onRemoteShutdownReasonAttributeChanged(); -} const int32_t& ConsumerStubDefault::getWakeUpReasonAttribute() { return wakeUpReasonAttributeValue_; } -void ConsumerStubDefault::setWakeUpReasonAttribute(int32_t value) { - trySetWakeUpReasonAttribute(std::move(value)); +const int32_t& ConsumerStubDefault::getWakeUpReasonAttribute(const std::shared_ptr clientId) { + return getWakeUpReasonAttribute(); } -void ConsumerStubDefault::onRemoteWakeUpReasonAttributeChanged() { - // No operation in default +void ConsumerStubDefault::setWakeUpReasonAttribute(int32_t value) { + trySetWakeUpReasonAttribute(std::move(value)); } bool ConsumerStubDefault::trySetWakeUpReasonAttribute(int32_t value) { @@ -144,55 +134,92 @@ bool ConsumerStubDefault::validateWakeUpReasonAttributeRequestedValue(const int3 return true; } -bool ConsumerStubDefault::RemoteEventHandler::onRemoteSetWakeUpReasonAttribute(int32_t value) { - return defaultStub_->trySetWakeUpReasonAttribute(std::move(value)); -} - -void ConsumerStubDefault::RemoteEventHandler::onRemoteWakeUpReasonAttributeChanged() { - defaultStub_->onRemoteWakeUpReasonAttributeChanged(); -} +void ConsumerStubDefault::GetAppHealthCount(const std::shared_ptr clientId, uint32_t& Count) { + // Call old style methods in default + GetAppHealthCount(Count); +} void ConsumerStubDefault::GetAppHealthCount(uint32_t& Count) { // No operation in default } +void ConsumerStubDefault::LifecycleRequestComplete(const std::shared_ptr clientId, uint32_t RequestId, int32_t Status, int32_t& ErrorCode) { + // Call old style methods in default + LifecycleRequestComplete(RequestId, Status, ErrorCode); +} void ConsumerStubDefault::LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode) { // No operation in default } +void ConsumerStubDefault::GetInterfaceVersion(const std::shared_ptr clientId, uint32_t& Version) { + // Call old style methods in default + GetInterfaceVersion(Version); +} void ConsumerStubDefault::GetInterfaceVersion(uint32_t& Version) { // No operation in default } +void ConsumerStubDefault::GetApplicationMode(const std::shared_ptr clientId, int32_t& ErrorCode, int32_t& ApplicationModeId) { + // Call old style methods in default + GetApplicationMode(ErrorCode, ApplicationModeId); +} void ConsumerStubDefault::GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId) { // No operation in default } +void ConsumerStubDefault::UnRegisterSession(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) { + // Call old style methods in default + UnRegisterSession(SessionName, SessionOwner, SeatID, ErrorCode); +} void ConsumerStubDefault::UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode) { // No operation in default } +void ConsumerStubDefault::RegisterSession(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) { + // Call old style methods in default + RegisterSession(SessionName, SessionOwner, SeatID, SessionState, ErrorCode); +} void ConsumerStubDefault::RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode) { // No operation in default } +void ConsumerStubDefault::UnRegisterShutdownClient(const std::shared_ptr clientId, std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) { + // Call old style methods in default + UnRegisterShutdownClient(BusName, ObjName, ShutdownMode, ErrorCode); +} void ConsumerStubDefault::UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode) { // No operation in default } +void ConsumerStubDefault::RegisterShutdownClient(const std::shared_ptr clientId, std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) { + // Call old style methods in default + RegisterShutdownClient(BusName, ObjName, ShutdownMode, TimeoutMs, ErrorCode); +} void ConsumerStubDefault::RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode) { // No operation in default } +void ConsumerStubDefault::GetNodeState(const std::shared_ptr clientId, int32_t& ErrorCode, int32_t& NodeStateId) { + // Call old style methods in default + GetNodeState(ErrorCode, NodeStateId); +} void ConsumerStubDefault::GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId) { // No operation in default } +void ConsumerStubDefault::GetSessionState(const std::shared_ptr clientId, std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) { + // Call old style methods in default + GetSessionState(SessionName, SeatID, SessionState, ErrorCode); +} void ConsumerStubDefault::GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode) { // No operation in default } +void ConsumerStubDefault::SetSessionState(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) { + // Call old style methods in default + SetSessionState(SessionName, SessionOwner, SessionState, SeatID, ErrorCode); +} void ConsumerStubDefault::SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode) { // No operation in default } @@ -208,6 +235,7 @@ void ConsumerStubDefault::fireNodeStateEvent(const int32_t& NodeState) { stubAdapter_->fireNodeStateEvent(NodeState); } + ConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(ConsumerStubDefault* defaultStub): defaultStub_(defaultStub) { } diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h index 7cc92f9..bc7ee8a 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/ConsumerStubDefault.h @@ -1,14 +1,29 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_ #define ORG_GENIVI_NODESTATEMANAGER_Consumer_STUB_DEFAULT_H_ #include +#include namespace org { namespace genivi { @@ -19,7 +34,7 @@ namespace NodeStateManager { * ConsumerStub. Method callbacks have an empty implementation, * remote set calls on attributes will always change the value of the attribute * to the one received. - * + * * Override this stub if you only want to provide a subset of the functionality * that would be defined for this service, and/or if you do not need any non-default * behaviour. @@ -31,79 +46,75 @@ class ConsumerStubDefault : public ConsumerStub { ConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr& stubAdapter); virtual const int32_t& getBootModeAttribute(); + virtual const int32_t& getBootModeAttribute(const std::shared_ptr clientId); virtual void setBootModeAttribute(int32_t value); - virtual const int32_t& getRestartReasonAttribute(); + virtual const int32_t& getRestartReasonAttribute(const std::shared_ptr clientId); virtual void setRestartReasonAttribute(int32_t value); - virtual const int32_t& getShutdownReasonAttribute(); + virtual const int32_t& getShutdownReasonAttribute(const std::shared_ptr clientId); virtual void setShutdownReasonAttribute(int32_t value); - virtual const int32_t& getWakeUpReasonAttribute(); + virtual const int32_t& getWakeUpReasonAttribute(const std::shared_ptr clientId); virtual void setWakeUpReasonAttribute(int32_t value); - + virtual void GetAppHealthCount(const std::shared_ptr clientId, uint32_t& Count); virtual void GetAppHealthCount(uint32_t& Count); + virtual void LifecycleRequestComplete(const std::shared_ptr clientId, uint32_t RequestId, int32_t Status, int32_t& ErrorCode); virtual void LifecycleRequestComplete(uint32_t RequestId, int32_t Status, int32_t& ErrorCode); + virtual void GetInterfaceVersion(const std::shared_ptr clientId, uint32_t& Version); virtual void GetInterfaceVersion(uint32_t& Version); + virtual void GetApplicationMode(const std::shared_ptr clientId, int32_t& ErrorCode, int32_t& ApplicationModeId); virtual void GetApplicationMode(int32_t& ErrorCode, int32_t& ApplicationModeId); + virtual void UnRegisterSession(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode); virtual void UnRegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t& ErrorCode); + virtual void RegisterSession(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode); virtual void RegisterSession(std::string SessionName, std::string SessionOwner, int32_t SeatID, int32_t SessionState, int32_t& ErrorCode); + virtual void UnRegisterShutdownClient(const std::shared_ptr clientId, std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode); virtual void UnRegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, int32_t& ErrorCode); + virtual void RegisterShutdownClient(const std::shared_ptr clientId, std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode); virtual void RegisterShutdownClient(std::string BusName, std::string ObjName, uint32_t ShutdownMode, uint32_t TimeoutMs, int32_t& ErrorCode); + virtual void GetNodeState(const std::shared_ptr clientId, int32_t& ErrorCode, int32_t& NodeStateId); virtual void GetNodeState(int32_t& ErrorCode, int32_t& NodeStateId); + virtual void GetSessionState(const std::shared_ptr clientId, std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode); virtual void GetSessionState(std::string SessionName, int32_t SeatID, int32_t& SessionState, int32_t& ErrorCode); + virtual void SetSessionState(const std::shared_ptr clientId, std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode); virtual void SetSessionState(std::string SessionName, std::string SessionOwner, int32_t SessionState, int32_t SeatID, int32_t& ErrorCode); - + virtual void fireNodeApplicationModeEvent(const int32_t& ApplicationModeId); virtual void fireSessionStateChangedEvent(const std::string& SessionStateName, const int32_t& SeatID, const int32_t& SessionState); virtual void fireNodeStateEvent(const int32_t& NodeState); + protected: - virtual void onRemoteBootModeAttributeChanged(); virtual bool trySetBootModeAttribute(int32_t value); virtual bool validateBootModeAttributeRequestedValue(const int32_t& value); - - virtual void onRemoteRestartReasonAttributeChanged(); virtual bool trySetRestartReasonAttribute(int32_t value); virtual bool validateRestartReasonAttributeRequestedValue(const int32_t& value); - - virtual void onRemoteShutdownReasonAttributeChanged(); virtual bool trySetShutdownReasonAttribute(int32_t value); virtual bool validateShutdownReasonAttributeRequestedValue(const int32_t& value); - - virtual void onRemoteWakeUpReasonAttributeChanged(); virtual bool trySetWakeUpReasonAttribute(int32_t value); virtual bool validateWakeUpReasonAttributeRequestedValue(const int32_t& value); - - + std::shared_ptr stubAdapter_; private: class RemoteEventHandler: public ConsumerStubRemoteEvent { public: RemoteEventHandler(ConsumerStubDefault* defaultStub); - virtual bool onRemoteSetBootModeAttribute(int32_t value); - virtual void onRemoteBootModeAttributeChanged(); - virtual bool onRemoteSetRestartReasonAttribute(int32_t value); - virtual void onRemoteRestartReasonAttributeChanged(); - virtual bool onRemoteSetShutdownReasonAttribute(int32_t value); - virtual void onRemoteShutdownReasonAttributeChanged(); - virtual bool onRemoteSetWakeUpReasonAttribute(int32_t value); - virtual void onRemoteWakeUpReasonAttributeChanged(); private: @@ -111,7 +122,6 @@ class ConsumerStubDefault : public ConsumerStub { }; RemoteEventHandler remoteEventHandler_; - std::shared_ptr stubAdapter_; int32_t bootModeAttributeValue_; int32_t restartReasonAttributeValue_; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h index 674e11b..cd3b535 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumer.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_H_ +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include @@ -29,7 +45,8 @@ class LifeCycleConsumer { }; const char* LifeCycleConsumer::getInterfaceId() { - return "org.genivi.NodeStateManager.LifeCycleConsumer"; + static const char* interfaceId = "org.genivi.NodeStateManager.LifeCycleConsumer"; + return interfaceId; } CommonAPI::Version LifeCycleConsumer::getInterfaceVersion() { diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp index 40f18e6..8f4bc97 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.cpp @@ -1,10 +1,24 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #include "LifeCycleConsumerDBusProxy.h" namespace org { @@ -12,12 +26,13 @@ namespace genivi { namespace NodeStateManager { std::shared_ptr createLifeCycleConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyConnection) { - return std::make_shared(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); + return std::make_shared(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection); } __attribute__((constructor)) void registerLifeCycleConsumerDBusProxy(void) { @@ -26,14 +41,15 @@ __attribute__((constructor)) void registerLifeCycleConsumerDBusProxy(void) { } LifeCycleConsumerDBusProxy::LifeCycleConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyconnection): - CommonAPI::DBus::DBusProxy(commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) - { -} + CommonAPI::DBus::DBusProxy(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyconnection) + { + } @@ -57,6 +73,8 @@ std::future LifeCycleConsumerDBusProxy::LifecycleRequestA std::move(callback)); } + + void LifeCycleConsumerDBusProxy::getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const { ownVersionMajor = 1; ownVersionMinor = 0; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h index 351558d..7484286 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusProxy.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_PROXY_H_ #include +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include #include @@ -26,6 +42,7 @@ namespace NodeStateManager { class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, virtual public CommonAPI::DBus::DBusProxy { public: LifeCycleConsumerDBusProxy( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, @@ -36,16 +53,19 @@ class LifeCycleConsumerDBusProxy: virtual public LifeCycleConsumerProxyBase, vir - virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); virtual std::future LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback); + virtual void getOwnVersion(uint16_t& ownVersionMajor, uint16_t& ownVersionMinor) const; private: + }; + + } // namespace NodeStateManager } // namespace genivi } // namespace org diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp index f59fb96..9479a80 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.cpp @@ -1,9 +1,20 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ #include "LifeCycleConsumerDBusStubAdapter.h" #include @@ -13,13 +24,14 @@ namespace genivi { namespace NodeStateManager { std::shared_ptr createLifeCycleConsumerDBusStubAdapter( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& interfaceName, const std::string& busName, const std::string& objectPath, const std::shared_ptr& dbusProxyConnection, const std::shared_ptr& stubBase) { - return std::make_shared(commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); + return std::make_shared(factory, commonApiAddress, interfaceName, busName, objectPath, dbusProxyConnection, stubBase); } __attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void) { @@ -28,23 +40,37 @@ __attribute__((constructor)) void registerLifeCycleConsumerDBusStubAdapter(void) } LifeCycleConsumerDBusStubAdapter::LifeCycleConsumerDBusStubAdapter( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& dbusInterfaceName, const std::string& dbusBusName, const std::string& dbusObjectPath, const std::shared_ptr& dbusConnection, const std::shared_ptr& stub): - LifeCycleConsumerDBusStubAdapterHelper(commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, dbusConnection, std::dynamic_pointer_cast(stub)) { + LifeCycleConsumerDBusStubAdapterHelper(factory, commonApiAddress, dbusInterfaceName, dbusBusName, dbusObjectPath, + dbusConnection, std::dynamic_pointer_cast(stub), + NULL) + { +} + +LifeCycleConsumerDBusStubAdapter::~LifeCycleConsumerDBusStubAdapter() { + deactivateManagedInstances(); + deinit(); + stub_.reset(); +} + +void LifeCycleConsumerDBusStubAdapter::deactivateManagedInstances() { } const char* LifeCycleConsumerDBusStubAdapter::getMethodsDBusIntrospectionXmlData() const { - return + static const char* introspectionData = "\n" "\n" "\n" "\n" "\n" ; + return introspectionData; } @@ -57,11 +83,14 @@ static CommonAPI::DBus::DBusMethodWithReplyStubDispatcher< +const LifeCycleConsumerDBusStubAdapter::StubDispatcherTable& LifeCycleConsumerDBusStubAdapter::getStubDispatcherTable() { + static const LifeCycleConsumerDBusStubAdapter::StubDispatcherTable stubDispatcherTable = { + { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher } + }; + return stubDispatcherTable; +} + + } // namespace NodeStateManager } // namespace genivi } // namespace org - -template<> -const org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::StubDispatcherTable org::genivi::NodeStateManager::LifeCycleConsumerDBusStubAdapterHelper::stubDispatcherTable_ = { - { { "LifecycleRequest", "uu" }, &org::genivi::NodeStateManager::lifecycleRequestStubDispatcher } -}; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h index e6073ea..0c4f6c7 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerDBusStubAdapter.h @@ -1,19 +1,37 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_DBUS_STUB_ADAPTER_H_ #include +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include +#include #include +#include #undef COMMONAPI_INTERNAL_COMPILATION @@ -26,17 +44,27 @@ typedef CommonAPI::DBus::DBusStubAdapterHelper LifeCycleC class LifeCycleConsumerDBusStubAdapter: public LifeCycleConsumerStubAdapter, public LifeCycleConsumerDBusStubAdapterHelper { public: LifeCycleConsumerDBusStubAdapter( + const std::shared_ptr& factory, const std::string& commonApiAddress, const std::string& dbusInterfaceName, const std::string& dbusBusName, const std::string& dbusObjectPath, const std::shared_ptr& dbusConnection, const std::shared_ptr& stub); + + ~LifeCycleConsumerDBusStubAdapter(); + + + const StubDispatcherTable& getStubDispatcherTable(); + + void deactivateManagedInstances(); protected: virtual const char* getMethodsDBusIntrospectionXmlData() const; + + private: }; } // namespace NodeStateManager diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h index 9289e83..8180d71 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxy.h @@ -1,16 +1,32 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_ #include "LifeCycleConsumerProxyBase.h" +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #undef COMMONAPI_INTERNAL_COMPILATION @@ -27,16 +43,14 @@ class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public L - /** * Calls LifecycleRequest with synchronous semantics. * - * All const parameters are input parameters to this method. - * All non-const parameters will be filled with the returned values. + * All const parameters are input parameters to this method. + * All non-const parameters will be filled with the returned values. * The CallStatus will be filled when the method returns and indicate either * "SUCCESS" or which type of error has occurred. In case of an error, ONLY the CallStatus * will be set. - * Synchronous calls are not supported (will block indefinitely) when mainloop integration is used. */ virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode); /** @@ -50,22 +64,38 @@ class LifeCycleConsumerProxy: virtual public LifeCycleConsumer, virtual public L * It will provide the same value for CallStatus as will be handed to the callback. */ virtual std::future LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback); + - /// Returns the CommonAPI address of the remote partner this proxy communicates with. + /** + * Returns the CommonAPI address of the remote partner this proxy communicates with. + */ virtual std::string getAddress() const; - /// Returns the domain of the remote partner this proxy communicates with. + /** + * Returns the domain of the remote partner this proxy communicates with. + */ virtual const std::string& getDomain() const; - /// Returns the service ID of the remote partner this proxy communicates with. + /** + * Returns the service ID of the remote partner this proxy communicates with. + */ virtual const std::string& getServiceId() const; - /// Returns the instance ID of the remote partner this proxy communicates with. + /** + * Returns the instance ID of the remote partner this proxy communicates with. + */ virtual const std::string& getInstanceId() const; - /// Returns true if the remote partner for this proxy is available. + /** + * Returns true if the remote partner for this proxy is currently known to be available. + */ virtual bool isAvailable() const; + /** + * Returns true if the remote partner for this proxy is available. + */ + virtual bool isAvailableBlocking() const; + /** * Returns the wrapper class that is used to (de-)register for notifications about * the availability of the remote partner of this proxy. @@ -106,7 +136,6 @@ std::future LifeCycleConsumerProxy<_AttributeExtensions.. return delegate_->LifecycleRequestAsync(Request, RequestId, callback); } - template std::string LifeCycleConsumerProxy<_AttributeExtensions...>::getAddress() const { return delegate_->getAddress(); @@ -132,6 +161,11 @@ bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailable() const { return delegate_->isAvailable(); } +template +bool LifeCycleConsumerProxy<_AttributeExtensions...>::isAvailableBlocking() const { + return delegate_->isAvailableBlocking(); +} + template CommonAPI::ProxyStatusEvent& LifeCycleConsumerProxy<_AttributeExtensions...>::getProxyStatusEvent() { return delegate_->getProxyStatusEvent(); @@ -142,10 +176,11 @@ CommonAPI::InterfaceVersionAttribute& LifeCycleConsumerProxy<_AttributeExtension return delegate_->getInterfaceVersionAttribute(); } + + } // namespace NodeStateManager } // namespace genivi } // namespace org - #endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_H_ diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h index 7ee8471..4da22c9 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerProxyBase.h @@ -1,43 +1,59 @@ - /* - * This file was generated by the CommonAPI Generators. - * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +/* +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. +* +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. +*/ +/** + * @author Christian Linke */ - #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_ - #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_ - - #include "LifeCycleConsumer.h" - - - - #define COMMONAPI_INTERNAL_COMPILATION - +#ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_ +#define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_ - #include - #include - #include - - #undef COMMONAPI_INTERNAL_COMPILATION +#include "LifeCycleConsumer.h" - namespace org { - namespace genivi { - namespace NodeStateManager { - class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy { - public: - typedef std::function LifecycleRequestAsyncCallback; +#if !defined (COMMONAPI_INTERNAL_COMPILATION) +#define COMMONAPI_INTERNAL_COMPILATION +#endif +#include +#include +#include - virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; - virtual std::future LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0; - }; +#undef COMMONAPI_INTERNAL_COMPILATION - } // namespace NodeStateManager - } // namespace genivi - } // namespace org +namespace org { +namespace genivi { +namespace NodeStateManager { - #endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_ +class LifeCycleConsumerProxyBase: virtual public CommonAPI::Proxy { + public: + + typedef std::function LifecycleRequestAsyncCallback; + + + + virtual void LifecycleRequest(const uint32_t& Request, const uint32_t& RequestId, CommonAPI::CallStatus& callStatus, int32_t& ErrorCode) = 0; + virtual std::future LifecycleRequestAsync(const uint32_t& Request, const uint32_t& RequestId, LifecycleRequestAsyncCallback callback) = 0; +}; + +} // namespace NodeStateManager +} // namespace genivi +} // namespace org + +#endif // ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_PROXY_BASE_H_ diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h index b7d83fd..595e887 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStub.h @@ -1,10 +1,24 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_H_ @@ -13,7 +27,9 @@ #include "LifeCycleConsumer.h" +#if !defined (COMMONAPI_INTERNAL_COMPILATION) #define COMMONAPI_INTERNAL_COMPILATION +#endif #include @@ -33,6 +49,15 @@ namespace NodeStateManager { class LifeCycleConsumerStubAdapter: virtual public CommonAPI::StubAdapter, public LifeCycleConsumer { public: + + + virtual void deactivateManagedInstances() = 0; + +protected: + /** + * Defines properties for storing the ClientIds of clients / proxies that have + * subscribed to the selective broadcasts + */ }; @@ -67,7 +92,7 @@ class LifeCycleConsumerStub : public CommonAPI::Stub clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) = 0; }; diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp index cc7dbfd..843f310 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.cpp @@ -1,9 +1,20 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ #include @@ -21,12 +32,17 @@ LifeCycleConsumerStubRemoteEvent* LifeCycleConsumerStubDefault::initStubAdapter( } +void LifeCycleConsumerStubDefault::LifecycleRequest(const std::shared_ptr clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) { + // Call old style methods in default + LifecycleRequest(Request, RequestId, ErrorCode); +} void LifeCycleConsumerStubDefault::LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode) { // No operation in default } + LifeCycleConsumerStubDefault::RemoteEventHandler::RemoteEventHandler(LifeCycleConsumerStubDefault* defaultStub): defaultStub_(defaultStub) { } diff --git a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h index 22e86ab..db7c1b8 100644 --- a/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h +++ b/AudioManagerDaemon/src-gen/org/genivi/NodeStateManager/LifeCycleConsumerStubDefault.h @@ -1,14 +1,29 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.1.201309251246. +* Used org.franca.core 0.8.9.201308271211. * - * Copyright (C) 2013, BMW AG - * - * \author Christian Linke, christian.linke@bmw.de BMW 2012,2013 +* Copyright (C) 2012, BMW AG +* This file is part of GENIVI Project AudioManager. +* +* Contributions are licensed to the GENIVI Alliance under one or more +* Contribution License Agreements. +* +* \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/. +* +* \author Aleksandar Donchev, aleksander.donchev@partner.bmw.de BMW 2013 +* \author Christian Linke christian.linke@bmw.de BMW 2013 +* For further information see http://www.genivi.org/. */ +/** + * @author Christian Linke + */ #ifndef ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_ #define ORG_GENIVI_NODESTATEMANAGER_Life_Cycle_Consumer_STUB_DEFAULT_H_ #include +#include namespace org { namespace genivi { @@ -19,7 +34,7 @@ namespace NodeStateManager { * LifeCycleConsumerStub. Method callbacks have an empty implementation, * remote set calls on attributes will always change the value of the attribute * to the one received. - * + * * Override this stub if you only want to provide a subset of the functionality * that would be defined for this service, and/or if you do not need any non-default * behaviour. @@ -31,12 +46,14 @@ class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub { LifeCycleConsumerStubRemoteEvent* initStubAdapter(const std::shared_ptr& stubAdapter); + virtual void LifecycleRequest(const std::shared_ptr clientId, uint32_t Request, uint32_t RequestId, int32_t& ErrorCode); virtual void LifecycleRequest(uint32_t Request, uint32_t RequestId, int32_t& ErrorCode); + protected: - + std::shared_ptr stubAdapter_; private: class RemoteEventHandler: public LifeCycleConsumerStubRemoteEvent { public: @@ -48,7 +65,6 @@ class LifeCycleConsumerStubDefault : public LifeCycleConsumerStub { }; RemoteEventHandler remoteEventHandler_; - std::shared_ptr stubAdapter_; }; -- cgit v1.2.1