History

set pointers to null and call uninit

sijchen committed 10 years ago

Commit 74955c81 parent cc675f92 files · +18 −0Browse files

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

Unified · Split

codec/common/src/WelsThreadPool.cpp+17−0
@@ -52,16 +52,28 @@ CWelsThreadPool::CWelsThreadPool (IWelsThreadPoolSink* pSink, int32_t iMaxThread · 51 unmodified lines
52 52
53 if (NULL == m_cWaitedTasks || NULL == m_cIdleThreads || NULL == m_cBusyThreads) {53 if (NULL == m_cWaitedTasks || NULL == m_cIdleThreads || NULL == m_cBusyThreads) {
54 delete m_cWaitedTasks;54 delete m_cWaitedTasks;
55 m_cWaitedTasks = NULL;
56
55 delete m_cIdleThreads;57 delete m_cIdleThreads;
58 m_cIdleThreads = NULL;
59
56 delete m_cBusyThreads;60 delete m_cBusyThreads;
61 m_cBusyThreads = NULL;
62
57 return;63 return;
58 }64 }
59 65
60 if (WELS_THREAD_ERROR_OK != Init (iMaxThreadNum)) {66 if (WELS_THREAD_ERROR_OK != Init (iMaxThreadNum)) {
61 Uninit();67 Uninit();
68
62 delete m_cWaitedTasks;69 delete m_cWaitedTasks;
70 m_cWaitedTasks = NULL;
71
63 delete m_cIdleThreads;72 delete m_cIdleThreads;
73 m_cIdleThreads = NULL;
74
64 delete m_cBusyThreads;75 delete m_cBusyThreads;
76 m_cBusyThreads = NULL;
65 }77 }
66}78}
67 79
@@ -70,8 +82,13 @@ CWelsThreadPool::~CWelsThreadPool() { · 2 unmodified lines
70 Uninit();82 Uninit();
71 83
72 delete m_cWaitedTasks;84 delete m_cWaitedTasks;
85 m_cWaitedTasks = NULL;
86
73 delete m_cIdleThreads;87 delete m_cIdleThreads;
88 m_cIdleThreads = NULL;
89
74 delete m_cBusyThreads;90 delete m_cBusyThreads;
91 m_cBusyThreads = NULL;
75}92}
76 93
77WELS_THREAD_ERROR_CODE CWelsThreadPool::OnTaskStart (CWelsTaskThread* pThread, IWelsTask* pTask) {94WELS_THREAD_ERROR_CODE CWelsThreadPool::OnTaskStart (CWelsTaskThread* pThread, IWelsTask* pTask) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t