优化GetTaskStatus接口

Hu Chunming
1 parent 7ded47c9
Showing 5 changed files with 19 additions and 89 deletions
src/ai_platform/Makefile
src/ai_platform/MultiSourceProcess.cpp
src/ai_platform/MultiSourceProcess.h
src/ai_platform/stl_aiplatform.cpp
src/ai_platform/stl_aiplatform.h
-# 各项目录
-LIB_DIR:=$(BUILD_DIR)/$(MODULE)/lib
-DEP_DIR:=$(BUILD_DIR)/$(MODULE)/.dep
-OBJ_DIR:=$(BUILD_DIR)/$(MODULE)/obj
-SRC_DIR:=$(TOP_DIR)/$(MODULE)
-
-# 源文件以及中间目标文件和依赖文件
-SRCS:=$(notdir $(wildcard $(SRC_DIR)/*.cpp))
-OBJS:=$(addprefix $(OBJ_DIR)/, $(patsubst %.cpp, %.o, $(SRCS)))
-DEPS:=$(addprefix $(DEP_DIR)/, $(patsubst %.cpp, %.d,a $(SRCS)))
-
-# 自动生成头文件依赖选项
-DEPFLAGS=-MT $@ -MMD -MP -MF $(DEP_DIR)/$*.d
-
-DEFS = -DENABLE_DVPP_INTERFACE
-
-# 最终目标文件
-TARGET:=$(BUILD_DIR)/bin/demo
-
-
-include_dir=-I/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/include
-
-lib_dir=-L/usr/lib \
-		-L/usr/local/lib \
-		-L/usr/local/Ascend/driver/lib64 \
-		-L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/atc/lib64\
-		-L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/lib64 \
-		-L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/runtime/lib64/stub \
-		-L/usr/local/Ascend/ascend-toolkit/6.3.RC1.alpha001/lib64 \
-		-L/usr/local/Ascend/driver/lib64/driver
-		
-lib=-lacl_dvpp -lascendcl -lmmpa -lglog -lgflags -lpthread -lz -lacl_dvpp_mpi -lruntime -lascendalog -lc_sec -lmsprofiler -lgert -lge_executor -lge_common \
-	-lgraph -lascend_protobuf -lprofapi -lerror_manager -lexe_graph -lregister -lplatform
-
-INCLUDE= -I $(TOP_DIR)/interface \
-
-LIBSPATH= -L $(BUILD_DIR)/interface/lib -l:interface.a \
-			-L $(BUILD_DIR)/dvpp/lib -l:dvpp.a
-
-CXXFLAGS= -g -O0 -fPIC $(INCLUDE) $(include_dir) $(LIBSPATH) $(INCS) $(LIBS) $(lib_dir) $(lib) $(DEFS) -lpthread -lrt -lz -fexceptions -std=c++11 -fvisibility=hidden -Wl,-Bsymbolic -ldl
-	# -DUNICODE -D_UNICODE
-
-# 默认最终目标
-.PHONY:all
-all:$(TARGET)
-
-# 生成最终目标
-$(TARGET): $(OBJS) | $(LIB_DIR)
-	@echo -e "\e[32m""Linking static library $(TARGET)""\e[0m"
-	@echo -e "$(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(MACROS)"
-	$(CXX) -o $@ $^ $(DEPFLAGS) $(CXXFLAGS) $(MACROS)
-
-# 若没有lib目录则自动生成
-$(LIB_DIR):
-	@mkdir -p $@
-
-# 生成中间目标文件
-$(OBJ_DIR)/%.o:$(SRC_DIR)/%.cpp $(DEP_DIR)/%.d | $(OBJ_DIR) $(DEP_DIR)
-	@echo -e "\e[33m""Building object $@""\e[0m"
-	@echo -e "$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<"
-	$(CXX) -c $(DEPFLAGS) $(CXXFLAGS) -o $@ $<
-
-# 若没有obj目录则自动生成
-$(OBJ_DIR):
-	@mkdir -p $@
-
-# 若没有.dep目录则自动生成
-$(DEP_DIR):
-	@mkdir -p $@
-
-# 依赖文件会在生成中间文件的时候自动生成，这里只是为了防止报错
-$(DEPS):
-
-# 引入中间目标文件头文件依赖关系
-include $(wildcard $(DEPS))
-
-# 直接删除组件build目录
-.PHONY:clean
-clean:
-	@rm -rf $(BUILD_DIR)/$(MODULE)
@@ -300,6 +300,8 @@ int CMultiSourceProcess::AddMqConn(mq_type_t mq_type, rabbitmq_conn_params_t mq_
   return SUCCESS;
 }
+#endif
+
 /* 获取任务的状态 MQ返回 */
 int CMultiSourceProcess::GetTaskStatus(const string taskID) {
@@ -307,22 +309,30 @@ int CMultiSourceProcess::GetTaskStatus(const string taskID) {
   std::vector<std::string> taskids;
   std::vector<int> statues;
+  int sta = 0;
   if(pDecManager->isPausing(taskID)){
     taskids.emplace_back(taskID);
     statues.emplace_back(2);
-  }else if(pDecManager->isRunning(taskID)){
+    sta = 2;
+  } else if(pDecManager->isRunning(taskID)){
     taskids.emplace_back(taskID);
     statues.emplace_back(1);
+    sta = 1;
+  } else if(pDecManager->isFinished(taskID)){
+    taskids.emplace_back(taskID);
+    statues.emplace_back(0);
+    sta = 0;
   }
+#ifdef POST_USE_RABBITMQ
   if (!taskids.empty()) {
     auto json_str = helpers::gen_json::gen_task_status_json(taskids, statues);
     mq_manager_->publish(mq_type_t::GET_TASK_MQ, json_str.c_str(),true);
   }
+#endif
-  return SUCCESS;
+  return sta;
 }
-#endif
 bool CMultiSourceProcess::AddTask(task_param _cur_task_param){
     DecoderManager* pDecManager = DecoderManager::getInstance();
@@ -52,9 +52,10 @@ public:
 #ifdef POST_USE_RABBITMQ
   int AddMqConn(mq_type_t mq_type, rabbitmq_conn_params_t mq_conn_param);
-  int GetTaskStatus(const string taskID);
 #endif
+int GetTaskStatus(const string taskID);
+
 public:
   int algorthim_process_thread();  // 算法处理线程
   void task_finished(const string task_id);
@@ -25,14 +25,14 @@ int add_mq_conn(void *handle, mq_type_t tstatus, rabbitmq_conn_params_t mq_conn_
 	return tools->AddMqConn(tstatus, mq_conn_param);
 }
+#endif
+
 int get_task_status(void *handle, char *task_id)
 {
 	CMultiSourceProcess* tools = (CMultiSourceProcess*)handle;
 	return tools->GetTaskStatus(task_id);
 }
-#endif
-
 int add_task(void *handle, task_param param)
 {
 	CMultiSourceProcess* tools = (CMultiSourceProcess*)handle;
@@ -43,12 +43,11 @@ extern &quot;C&quot;
 	 */
 	TSL_AIPLATFORM_API int add_mq_conn(void *handle, mq_type_t tstatus, rabbitmq_conn_params_t mq_conn_param);
+#endif
-
+	
 	TSL_AIPLATFORM_API int get_task_status(void *handle, char *task_id);
-#endif
-
 	/*************************************************************************
 	* FUNCTION: add_task
 	* PURPOSE: 添加任务