fix low memory crash issue

huili2 committed 9 years ago

Commit d1c0a931 parent 48c2fe116 files · +401 −386Browse files

Showing the changes to codec/common/src/WelsThreadPool.cpp (1 of 16 files). Show all

Unified · Split

codec/common/src/WelsThreadPool.cpp+28−15

 int32_t CWelsThreadPool::m_iRefCount = 0;
 CWelsLock CWelsThreadPool::m_cInitLock;
 int32_t CWelsThreadPool::m_iMaxThreadNum = DEFAULT_THREAD_NUM;
+CWelsThreadPool* CWelsThreadPool::m_pThreadPoolSelf = NULL;
 CWelsThreadPool::CWelsThreadPool() :
   m_cWaitedTasks (NULL), m_cIdleThreads (NULL), m_cBusyThreads (NULL) {
 }
-CWelsThreadPool& CWelsThreadPool::AddReference () {
+CWelsThreadPool* CWelsThreadPool::AddReference() {
   CWelsAutoLock  cLock (m_cInitLock);
-  static CWelsThreadPool m_cThreadPoolSelf;
+  if (m_pThreadPoolSelf == NULL) {
+    m_pThreadPoolSelf = new CWelsThreadPool();
+    if (!m_pThreadPoolSelf) {
+      return NULL;
+    }
+  }
   if (m_iRefCount == 0) {
-    //TODO: will remove this afterwards
+    if (WELS_THREAD_ERROR_OK != m_pThreadPoolSelf->Init()) {
-    if (WELS_THREAD_ERROR_OK != m_cThreadPoolSelf.Init()) {
+      m_pThreadPoolSelf->Uninit();
-      m_cThreadPoolSelf.Uninit();
+      delete m_pThreadPoolSelf;
+      m_pThreadPoolSelf = NULL;
+      return NULL;
     }
   }
   ++ m_iRefCount;
   //fprintf(stdout, "m_iRefCount2=%d\n", m_iRefCount);
-  return m_cThreadPoolSelf;
+  return m_pThreadPoolSelf;
 }
 void CWelsThreadPool::RemoveInstance() {
   if (0 == m_iRefCount) {
     StopAllRunning();
     Uninit();
+    if (m_pThreadPoolSelf) {
+      delete m_pThreadPoolSelf;
+      m_pThreadPoolSelf = NULL;
+    }
     //fprintf(stdout, "m_iRefCount=%d, IdleThreadNum=%d, BusyThreadNum=%d, WaitedTask=%d\n", m_iRefCount, GetIdleThreadNum(), GetBusyThreadNum(), GetWaitedTaskNum());
   }
 }
 bool CWelsThreadPool::IsReferenced() {
   CWelsAutoLock  cLock (m_cInitLock);
-  return (m_iRefCount>0);
+  return (m_iRefCount > 0);
 }
   return WELS_THREAD_ERROR_OK;
 }
-WELS_THREAD_ERROR_CODE CWelsThreadPool::Init () {
+WELS_THREAD_ERROR_CODE CWelsThreadPool::Init() {
   //fprintf(stdout, "Enter WelsThreadPool Init\n");
   CWelsAutoLock  cLock (m_cLockPool);
   Kill();
-  WELS_DELETE_OP(m_cWaitedTasks);
+  WELS_DELETE_OP (m_cWaitedTasks);
-  WELS_DELETE_OP(m_cIdleThreads);
+  WELS_DELETE_OP (m_cIdleThreads);
-  WELS_DELETE_OP(m_cBusyThreads);
+  WELS_DELETE_OP (m_cBusyThreads);
   return iReturn;
 }
     }
   }
   //fprintf(stdout, "ThreadPool:  AddTaskToWaitedList: %x\n", pTask);
-  if (false == AddTaskToWaitedList (pTask)){
+  if (false == AddTaskToWaitedList (pTask)) {
-      return WELS_THREAD_ERROR_GENERAL;
+    return WELS_THREAD_ERROR_GENERAL;
   }
   //fprintf(stdout, "ThreadPool:  SignalThread: %x\n", pTask);
 void  CWelsThreadPool::DestroyThread (CWelsTaskThread* pThread) {
   pThread->Kill();
-  WELS_DELETE_OP(pThread);
+  WELS_DELETE_OP (pThread);
   return;
 }
   int32_t nRet = m_cWaitedTasks->push_back (pTask);
   //fprintf(stdout, "CWelsThreadPool::AddTaskToWaitedList=%d, pTask=%x\n", m_cWaitedTasks->size(), pTask);
-  return (0==nRet ? true : false);
+  return (0 == nRet ? true : false);
 }
 CWelsTaskThread*   CWelsThreadPool::GetIdleThread() {

fix low memory crash issue

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code