Valgrind on native

CMakeLists.txt

@@ -28,7 +28,8 @@ add_compile_definitions(PROJECT_VER_PATCH="${PROJECT_VERSION_PATCH}")
 set(CMAKE_CXX_STANDARD 17)
 
 if ( COVERAGE_ENABLED )
-    add_compile_options(-coverage -fprofile-update=atomic)
+    add_compile_options(--coverage -fprofile-update=atomic)
+    add_link_options(--coverage)
 endif()
 
 add_compile_options(-Wall -Werror)
@@ -51,7 +52,7 @@ else()
     option(RIALTO_LOG_DEBUG_ENABLED "Enable debug logging for RialtoServer" OFF)
 endif()
 
-if (NOT RIALTO_LOG_FATAL_ENABLED OR 
+if (NOT RIALTO_LOG_FATAL_ENABLED OR
     NOT RIALTO_LOG_ERROR_ENABLED OR
     NOT RIALTO_LOG_WARN_ENABLED OR
     NOT RIALTO_LOG_MIL_ENABLED OR
@@ -62,7 +63,7 @@ if (NOT RIALTO_LOG_FATAL_ENABLED OR
     add_compile_options(-Wno-error=unused-function -Wno-error=unused-variable)
 
 endif()
-   
+
 if ( RIALTO_LOG_FATAL_ENABLED )
     message("RIALTO_LOG_FATAL IS ENABLED")
     add_compile_definitions( RIALTO_LOG_FATAL_ENABLED )
@@ -97,13 +98,13 @@ if ( RIALTO_ENABLE_DECRYPT_BUFFER )
     add_compile_definitions( RIALTO_ENABLE_DECRYPT_BUFFER )
 endif()
 
-# Retrieve the commit ID 
+# Retrieve the commit ID
 execute_process(
     COMMAND git rev-parse HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} 
-    RESULT_VARIABLE RESULT 
-    OUTPUT_VARIABLE SRCREV 
-    OUTPUT_STRIP_TRAILING_WHITESPACE 
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE RESULT
+    OUTPUT_VARIABLE SRCREV
+    OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 if(RESULT)
@@ -113,15 +114,15 @@ endif()
 # Retrieve release tag
 execute_process(
     COMMAND bash -c "git tag --list --contains ${SRCREV} | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$'"
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}  
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     OUTPUT_VARIABLE TAGS
-    OUTPUT_STRIP_TRAILING_WHITESPACE 
+    OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 string(REPLACE "\n" ", " TAGS "${TAGS}")
 
 if(NOT TAGS STREQUAL "")
     set(TAGS ${TAGS})
-endif() 
+endif()
 
 # Preprocesser Variable
 add_compile_definitions(SRCREV="${SRCREV}")
@@ -206,6 +207,8 @@ endif()
 if( NATIVE_BUILD )
     add_subdirectory( stubs/rdk_gstreamer_utils )
     add_subdirectory( stubs/opencdm )
+    add_compile_options(-DFREE_MEM_BEFORE_EXIT)
+    add_compile_options(-O0 -ggdb)
 
     include( GNUInstallDirs )
     configure_file( pkg-config/RialtoClient.in.pc ${CMAKE_BINARY_DIR}/RialtoClient.pc @ONLY )

build_ct.py

@@ -21,6 +21,7 @@
 # Entry script for running rialto componenttests
 
 import argparse
+import os
 from scripts.gtest.build_and_run_tests import getGenericArguments, buildAndRunGTests
 from scripts.gtest.utils import getSuitesToRun, getOutputFile
 from scripts.gtest.generate_coverage import generateCoverageReport, generateSpecificCoverageStats
@@ -50,8 +51,8 @@
 
     # Generate coverage
     if args['coverage'] == True:
-        generateCoverageReport(args['output'], outputFile, suitesToRun)
+        generateCoverageReport(os.getcwd(), args['output'], outputFile)
 
         # Also generate coverage stats for public interfaces source
         files = ["*/main/source/*"]
-        generateSpecificCoverageStats(args['output'], outputFile, files, "coverage_statistics_public_apis")
+        generateSpecificCoverageStats(os.getcwd(), args['output'], outputFile, files, "coverage_statistics_public_apis")

build_ut.py

@@ -21,6 +21,7 @@
 # Entry script for running rialto unittests
 
 import argparse
+import os
 from scripts.gtest.build_and_run_tests import getGenericArguments, buildAndRunGTests
 from scripts.gtest.utils import getSuitesToRun, getOutputFile
 from scripts.gtest.generate_coverage import generateCoverageReport
@@ -58,4 +59,4 @@
     buildAndRunGTests(args, outputFile, buildDefines, suitesToRun)
 
     if args['coverage'] == True:
-        generateCoverageReport(args['output'], outputFile, suitesToRun)
+        generateCoverageReport(os.getcwd(), args['output'], outputFile)

common/CMakeLists.txt

@@ -55,11 +55,3 @@ target_link_libraries (
         PRIVATE
         RialtoLogging
     )
-
-if ( COVERAGE_ENABLED )
-    target_link_libraries(
-        RialtoCommon
-        PRIVATE
-        gcov
-        )
-endif()

media/client/ipc/source/MediaPipelineIpc.cpp

@@ -17,10 +17,10 @@
  * limitations under the License.
  */
 #include "MediaPipelineIpc.h"
+#include "IMediaPipeline.h"
 #include "RialtoClientLogging.h"
 #include "RialtoCommonIpc.h"
 #include "mediapipelinemodule.pb.h"
-#include <IMediaPipeline.h>
 
 namespace firebolt::rialto::client
 {

media/client/main/CMakeLists.txt

@@ -88,15 +88,6 @@ target_link_libraries(
         Threads::Threads
 
         )
-if ( COVERAGE_ENABLED )
-    target_link_libraries(
-        RialtoClient
-
-        PRIVATE
-        gcov
-        )
-endif()
-
 
 include( GNUInstallDirs )
 

media/client/main/source/MediaPipeline.cpp

@@ -17,12 +17,13 @@
  * limitations under the License.
  */
 
-#include "MediaPipeline.h"
-#include "KeyIdMap.h"
-#include "RialtoClientLogging.h"
 #include <inttypes.h>
 #include <stdint.h>
 
+#include "KeyIdMap.h"
+#include "MediaPipeline.h"
+#include "RialtoClientLogging.h"
+
 namespace
 {
 const char *toString(const firebolt::rialto::client::MediaPipeline::State &state)

media/server/CMakeLists.txt

@@ -61,6 +61,7 @@ target_link_libraries(
         RialtoServerIpc
         RialtoServerMain
         RialtoServerService
+        protobuf::libprotobuf
 )
 
 if( NATIVE_BUILD )

media/server/gstplayer/include/GstSrc.h

@@ -122,7 +122,7 @@ class GstSrc : public IGstSrc
 
     void initSrc() override;
 
-    void setupAndAddAppArc(IDecryptionService *decryptionService, GstElement *source, StreamInfo &streamInfo,
+    void setupAndAddAppSrc(IDecryptionService *decryptionService, GstElement *source, StreamInfo &streamInfo,
                            GstAppSrcCallbacks *callbacks, gpointer userData,
                            firebolt::rialto::MediaSourceType type) override;
 

media/server/gstplayer/include/IGstSrc.h

@@ -96,7 +96,7 @@ class IGstSrc
      * @param[in] userData  : Data to be passed to the callbacks.
      * @param[in] type      : The media type of the source.
      */
-    virtual void setupAndAddAppArc(IDecryptionService *decryptionService, GstElement *source, StreamInfo &streamInfo,
+    virtual void setupAndAddAppSrc(IDecryptionService *decryptionService, GstElement *source, StreamInfo &streamInfo,
                                    GstAppSrcCallbacks *callbacks, gpointer userData,
                                    firebolt::rialto::MediaSourceType type) = 0;
 

media/server/gstplayer/interface/GstInit.h

@@ -33,6 +33,13 @@ namespace firebolt::rialto::server
  * @param[in] argv    : Vector of C strings each containing a command line argument.
  */
 bool gstInitalise(int argc, char **argv);
+
+/**
+ * @brief Deinitalise gstreamer.
+ *
+ */
+bool gstDeinitalise();
+
 }; // namespace firebolt::rialto::server
 
 #endif // FIREBOLT_RIALTO_SERVER_GST_INIT_H_

media/server/gstplayer/source/GstGenericPlayer.cpp

@@ -18,6 +18,7 @@
  */
 
 #include <chrono>
+#include <cinttypes>
 
 #include "GstDispatcherThread.h"
 #include "GstGenericPlayer.h"
@@ -27,7 +28,6 @@
 #include "RialtoServerLogging.h"
 #include "WorkerThread.h"
 #include "tasks/generic/GenericPlayerTaskFactory.h"
-#include <cinttypes>
 
 namespace
 {

media/server/gstplayer/source/GstInit.cpp

@@ -49,4 +49,22 @@ bool gstInitalise(int argc, char **argv)
 
     return true;
 }
+
+bool gstDeinitalise()
+{
+    using firebolt::rialto::wrappers::IGstWrapper;
+    using firebolt::rialto::wrappers::IGstWrapperFactory;
+    std::shared_ptr<IGstWrapperFactory> factory = IGstWrapperFactory::getFactory();
+    std::shared_ptr<IGstWrapper> gstWrapper = factory->getGstWrapper();
+
+    if (!gstWrapper)
+    {
+        RIALTO_SERVER_LOG_ERROR("Failed to create the gst wrapper");
+        return false;
+    }
+
+    gstWrapper->gstDeinit();
+
+    return true;
+}
 }; // namespace firebolt::rialto::server

media/server/gstplayer/source/GstSrc.cpp

@@ -388,7 +388,7 @@ void GstSrc::setDefaultStreamFormatIfNeeded(GstElement *appSrc)
     m_gstWrapper->gstCapsUnref(currentCaps);
 }
 
-void GstSrc::setupAndAddAppArc(IDecryptionService *decryptionService, GstElement *source, StreamInfo &streamInfo,
+void GstSrc::setupAndAddAppSrc(IDecryptionService *decryptionService, GstElement *source, StreamInfo &streamInfo,
                                GstAppSrcCallbacks *callbacks, gpointer userData, firebolt::rialto::MediaSourceType type)
 {
     // Configure and add appsrc

media/server/gstplayer/source/tasks/generic/FinishSetupSource.cpp

@@ -102,15 +102,15 @@ void FinishSetupSource::execute() const
     auto elem = m_context.streamInfo.find(firebolt::rialto::MediaSourceType::AUDIO);
     if (elem != m_context.streamInfo.end())
     {
-        m_context.gstSrc->setupAndAddAppArc(m_context.decryptionService, m_context.source, elem->second, &callbacks,
+        m_context.gstSrc->setupAndAddAppSrc(m_context.decryptionService, m_context.source, elem->second, &callbacks,
                                             &m_player, firebolt::rialto::MediaSourceType::AUDIO);
         m_player.notifyNeedMediaData(true, false);
     }
 
     elem = m_context.streamInfo.find(firebolt::rialto::MediaSourceType::VIDEO);
     if (elem != m_context.streamInfo.end())
     {
-        m_context.gstSrc->setupAndAddAppArc(m_context.decryptionService, m_context.source, elem->second, &callbacks,
+        m_context.gstSrc->setupAndAddAppSrc(m_context.decryptionService, m_context.source, elem->second, &callbacks,
                                             &m_player, firebolt::rialto::MediaSourceType::VIDEO);
         m_player.notifyNeedMediaData(false, true);
     }

media/server/ipc/source/ApplicationManagementServer.cpp

@@ -18,9 +18,9 @@
  */
 
 #include "ApplicationManagementServer.h"
+#include "IIpcServerFactory.h"
 #include "IServerManagerModuleServiceFactory.h"
 #include "RialtoServerLogging.h"
-#include <IIpcServerFactory.h>
 
 namespace
 {

media/server/service/source/main.cpp

@@ -17,10 +17,14 @@
  * limitations under the License.
  */
 
+#include <cstring>
+#include <thread>
+
+#include <google/protobuf/service.h>
+
 #include "GstInit.h"
 #include "IApplicationSessionServer.h"
 #include "RialtoServerLogging.h"
-#include <cstring>
 
 // NOLINT(build/filename_format)
 
@@ -47,13 +51,32 @@ int main(int argc, char *argv[])
 
     firebolt::rialto::server::gstInitalise(argc, argv);
 
-    auto appSessionServer =
-        firebolt::rialto::server::IApplicationSessionServerFactory::getFactory()->createApplicationSessionServer();
+    {
+        // Creation of this variable in a local scope ensures Rialto
+        // destructors are called before potentially calling gst_deinit()
+        // which would cause free memory reads
+        auto appSessionServer =
+            firebolt::rialto::server::IApplicationSessionServerFactory::getFactory()->createApplicationSessionServer();
+
+        if (!appSessionServer->init(argc, argv))
+        {
+            firebolt::rialto::server::gstDeinitalise();
+            return EXIT_FAILURE;
+        }
+
+        appSessionServer->startService();
+    }
 
-    if (!appSessionServer->init(argc, argv))
+#ifdef FREE_MEM_BEFORE_EXIT
+    if (getenv("RIALTO_FREE_MEM_BEFORE_EXIT"))
     {
-        return EXIT_FAILURE;
+        RIALTO_SERVER_LOG_INFO("Calling gst_deinit");
+        firebolt::rialto::server::gstDeinitalise();
+
+        RIALTO_SERVER_LOG_INFO("Calling ShutdownProtobufLibrary");
+        google::protobuf::ShutdownProtobufLibrary();
     }
-    appSessionServer->startService();
+#endif
+
     return EXIT_SUCCESS;
 }