Hu Chunming / src

Authored by Hu Chunming 2022-11-04 18:06:13 +0800

1 parent 682bbe39

Showing 4 changed files with 12 additions and 1 deletions

test/main.cpp

	@@ -114,7 +114,7 @@ void init_mq_conn(void *handle) {		@@ -114,7 +114,7 @@ void init_mq_conn(void *handle) {
114	}	114	}
115	#endif	115	#endif
116		116
117	-const char* ipc_url = "/home/cmhu/tongtu/tsl_aiplatform_project_with_screenshot/data/duan1.avi";	117	+const char* ipc_url = "/data/cmhu/data2/duan1.avi";
118		118
119	void set_ipc_url(task_param &tparam, const algorithm_type_t &algor_type) {	119	void set_ipc_url(task_param &tparam, const algorithm_type_t &algor_type) {
120		120

tsl_aiplatform/ai_platform/MultiSourceProcess.cpp

	@@ -1280,6 +1280,7 @@ void CMultiSourceProcess::CloseAllTask(){		@@ -1280,6 +1280,7 @@ void CMultiSourceProcess::CloseAllTask(){
1280		1280
1281	pthread_join(m_gpuProcessthread,0);	1281	pthread_join(m_gpuProcessthread,0);
1282		1282
		1283	+ // 待解码线程和算法处理线程都结束后再清理数据队列
1283	m_QueueMtx.lock();	1284	m_QueueMtx.lock();
1284	for (auto iter = m_RgbDataList.begin(); iter!=m_RgbDataList.end(); ){	1285	for (auto iter = m_RgbDataList.begin(); iter!=m_RgbDataList.end(); ){
1285	GpuRgbMemory* gpuMem = *iter;	1286	GpuRgbMemory* gpuMem = *iter;

tsl_aiplatform/reprocessing_module/save_snapshot_reprocessing.cpp

 @@ -34,12 +34,16 @@ save_snapshot_reprocessing::save_snapshot_reprocessing() {
    _snapshot_reprocessing = snapshot_reprocessing::getInstance();
    _task_param_manager = task_param_manager::getInstance();
++  bFinish = false;
    auto m_save_ss_thread = std::thread(save_image_thread_process, this);
    m_save_ss_thread.detach();
  }
  // 释放资源
  void save_snapshot_reprocessing::save_snapshot_reprocessing_release() {
++  // 结束线程
++  bFinish = true;
++
    std::unique_lock<std::mutex> l(waitforsave_image_queue_mutex);
    while (!waitforsave_image_queue.empty()) {
 @@ -322,6 +326,10 @@ DWORD save_image_thread_process(LPVOID param) {
    save_snapshot_reprocessing *pThreadParam = (save_snapshot_reprocessing *)param;
    while (true) {
++    if (bFinish){
++      break;
++    }
++
      std::unique_lock<std::mutex> l(pThreadParam->waitforsave_image_queue_mutex);
      std::unique_lock<std::mutex> l_taskid(pThreadParam->waitforchange_taskid_mutex);
      if (!pThreadParam->waitforsave_image_queue.empty()) {

tsl_aiplatform/reprocessing_module/save_snapshot_reprocessing.h

 @@ -82,6 +82,8 @@ public:
  	// map<OBJ_KEY, int> save_snapshot_info_count; // debug by zsh
  	mutable std::mutex waitforchange_taskid_mutex;
++	bool bFinish{false};
++
  #ifdef POST_USE_RABBITMQ
  	callback_t callback_;
  	std::shared_ptr<mq::post_rabbitmq_reprocessing> rbmq_handler_;