RDKAAMP-427 [AAMP] Fix possible thread leak in AAMP

Reason for change: Fix for original issue DELIA-58622
Fix thread management in AAMP
Test Procedure: Play various assets in AAMP and make sure there is no thread leak
Can be monitored by dumping /proc/<pid>/status
Risks: Low

Signed-off-by: Vinish K B <[email protected]>
Change-Id: I85ec278b8b7b81248ed2962aa3b90433947c469e
(cherry picked from commit 592a042)

Author: Vinish K B

AampCacheHandler.cpp

@@ -236,7 +236,6 @@ void AampCacheHandler::Init()
 	//Check if already initialized
 	if(true == mInitialized)
 		return;
-
 	if(0 != pthread_create(&mAsyncCleanUpTaskThreadId, NULL, &AampCacheThreadFunction, this))
 	{
 		AAMPLOG_ERR("Failed to create AampCacheHandler thread errno = %d, %s", errno, strerror(errno));
@@ -273,6 +272,7 @@ void AampCacheHandler::ClearCacheHandler()
 		{
 			AAMPLOG_ERR("***pthread_join AsyncCacheCleanUpTask returned %d(%s)", rc, strerror(rc));
 		}
+		mAsyncThreadStartedFlag = false;
 	}
 	ClearPlaylistCache();
 

admanager_mpd.cpp

@@ -70,7 +70,7 @@ void CDAIObjectMPD::SetAlternateContents(const std::string &periodId, const std:
  * @brief PrivateCDAIObjectMPD constructor
  */
 PrivateCDAIObjectMPD::PrivateCDAIObjectMPD(AampLogManager* logObj, PrivateInstanceAAMP* aamp) : mLogObj(logObj),mAamp(aamp),mDaiMtx(), mIsFogTSB(false), mAdBreaks(), mPeriodMap(), mCurPlayingBreakId(), mAdObjThreadID(0), mAdFailed(false), mCurAds(nullptr),
-					mCurAdIdx(-1), mContentSeekOffset(0), mAdState(AdState::OUTSIDE_ADBREAK),mPlacementObj(), mAdFulfillObj(),mAdtoInsertInNextBreak()
+					mCurAdIdx(-1), mContentSeekOffset(0), mAdState(AdState::OUTSIDE_ADBREAK),mPlacementObj(), mAdFulfillObj(),mAdtoInsertInNextBreak(), mAdObjThreadStarted(false)
 {
 	mAamp->CurlInit(eCURLINSTANCE_DAI,1,mAamp->GetNetworkProxy());
 }
@@ -80,14 +80,14 @@ PrivateCDAIObjectMPD::PrivateCDAIObjectMPD(AampLogManager* logObj, PrivateInstan
  */
 PrivateCDAIObjectMPD::~PrivateCDAIObjectMPD()
 {
-	if(mAdObjThreadID)
+	if(mAdObjThreadStarted)
 	{
 		int rc = pthread_join(mAdObjThreadID, NULL);
 		if (rc != 0)
 		{
 			AAMPLOG_ERR("***pthread_join failed, returned %d", rc);
 		}
-		mAdObjThreadID = 0;
+		mAdObjThreadStarted = false;
 	}
 	mAamp->CurlTerm(eCURLINSTANCE_DAI);
 }
@@ -775,15 +775,15 @@ void PrivateCDAIObjectMPD::SetAlternateContents(const std::string &periodId, con
 	}
 	else
 	{
-		if(mAdObjThreadID)
+		if(mAdObjThreadStarted)
 		{
 			//Clearing the previous thread
 			int rc = pthread_join(mAdObjThreadID, NULL);
 			if(rc != 0)  //CID:101068 - Resolving the local variable rc initialized but not used
 			{
 				AAMPLOG_ERR("pthread_join(mAdObjThreadID) failed , errno = %d, %s , Rejecting promise.",errno,strerror(errno));
 			}
-			mAdObjThreadID = 0;
+			mAdObjThreadStarted = false;
 		}
 		if(isAdBreakObjectExist(periodId))
 		{
@@ -804,6 +804,10 @@ void PrivateCDAIObjectMPD::SetAlternateContents(const std::string &periodId, con
 				{
 					AAMPLOG_ERR(" pthread_create(FulFillAdObject) failed, errno = %d, %s. Rejecting promise.", errno, strerror(errno));
 				}
+				else
+				{
+					mAdObjThreadStarted = true;
+				}
 			}
 			if(ret != 0)
 			{

admanager_mpd.h

@@ -286,6 +286,7 @@ class PrivateCDAIObjectMPD
 	std::unordered_map<std::string, Period2AdData> mPeriodMap;          /**< periodId to Ad map */
 	std::string                                    mCurPlayingBreakId;  /**< Currently playing Ad */
 	pthread_t                                      mAdObjThreadID;      /**< ThreadId of Ad fulfillment */
+	bool                                           mAdObjThreadStarted; /**< Flag denotes if ad object thread is started */
 	bool                                           mAdFailed;           /**< Current Ad playback failed flag */
 	std::shared_ptr<std::vector<AdNode>>           mCurAds;             /**< Vector of ads from the current Adbreak */
 	int                                            mCurAdIdx;           /**< Currently playing Ad index */

fragmentcollector_mpd.cpp

@@ -6318,8 +6318,11 @@ void StreamAbstractionAAMP_MPD::ProcessEAPLicenseRequest()
 	if(!deferredDRMRequestThreadStarted)
 	{
 		// wait for thread to complete and create a new thread
-		if ((deferredDRMRequestThread!= NULL) && (deferredDRMRequestThread->joinable()))
+		if ((deferredDRMRequestThread != NULL) && (deferredDRMRequestThread->joinable()))
 		{
+			//Need to check if we ever hit this code block, there is a possible delay
+			//since mAbortDeferredLicenseLoop is not updated. Add a log for now for monitoring
+			AAMPLOG_INFO("Trying to join deferred DRM request thread with possible time delay!");
 			deferredDRMRequestThread->join();
 			SAFE_DELETE(deferredDRMRequestThread);
 		}
@@ -6400,7 +6403,6 @@ void StreamAbstractionAAMP_MPD::StartDeferredDRMRequestThread(MediaType mediaTyp
 		}
 	}
 	while(!exitLoop);
-	deferredDRMRequestThreadStarted = false;
 }
 #endif
 
@@ -9349,7 +9351,7 @@ void StreamAbstractionAAMP_MPD::FetcherLoop()
 				while (!exitFetchLoop && !liveMPDRefresh)
 				{
 					bool bCacheFullState = true;
-					std::thread *parallelDownload[AAMP_TRACK_COUNT];
+					std::thread *parallelDownload[AAMP_TRACK_COUNT] = { nullptr };
 
 					for (int trackIdx = (mNumberOfTracks - 1); trackIdx >= 0; trackIdx--)
 					{