浏览代码

20210423, 调度流程debug

huli 4 年之前
父节点
当前提交
664c7cc37a
共有 4 个文件被更改,包括 21 次插入14 次删除
  1. 5 5
      dispatch/carrier.cpp
  2. 5 5
      dispatch/catcher.cpp
  3. 1 0
      dispatch/dispatch_device_base.h
  4. 10 4
      dispatch/dispatch_process.cpp

+ 5 - 5
dispatch/carrier.cpp

@@ -256,11 +256,11 @@ Error_manager Carrier::check_and_read_memory_to_task(std::shared_ptr<Task_Base>
 {
 
 
-	std::cout << " huli test :::: " << " ((((((((((((((((((((((((((333333333333333333 = " << 333 << std::endl;
-	std::cout << " huli test :::: " << " m_request_key = " << m_request_key << std::endl;
-	std::cout << " huli test :::: " << " m_respons_key = " << m_respons_key << std::endl;
-	std::cout << " huli test :::: " << " m_respons_status = " << m_respons_status << std::endl;
-	std::cout << " huli test :::: " << " )))))))))))))))))))))))))))))))4444444444444 = " << 444 << std::endl;
+//	std::cout << " huli test :::: " << " ((((((((((((((((((((((((((333333333333333333 = " << 333 << std::endl;
+//	std::cout << " huli test :::: " << " m_request_key = " << m_request_key << std::endl;
+//	std::cout << " huli test :::: " << " m_respons_key = " << m_respons_key << std::endl;
+//	std::cout << " huli test :::: " << " m_respons_status = " << m_respons_status << std::endl;
+//	std::cout << " huli test :::: " << " )))))))))))))))))))))))))))))))4444444444444 = " << 444 << std::endl;
 
 
 

+ 5 - 5
dispatch/catcher.cpp

@@ -253,11 +253,11 @@ Error_manager Catcher::update_device_communication()
 Error_manager Catcher::check_and_read_memory_to_task(std::shared_ptr<Task_Base> p_task)
 {
 
-	std::cout << " huli test :::: " << " ((((((((((((((((((((((((((1111111111111 = " << 111 << std::endl;
-	std::cout << " huli test :::: " << " m_request_key = " << m_request_key << std::endl;
-	std::cout << " huli test :::: " << " m_respons_key = " << m_respons_key << std::endl;
-	std::cout << " huli test :::: " << " m_respons_status = " << m_respons_status << std::endl;
-	std::cout << " huli test :::: " << " ))))))))))))))))))))))))))))2222222222 = " << 222 << std::endl;
+//	std::cout << " huli test :::: " << " ((((((((((((((((((((((((((1111111111111 = " << 111 << std::endl;
+//	std::cout << " huli test :::: " << " m_request_key = " << m_request_key << std::endl;
+//	std::cout << " huli test :::: " << " m_respons_key = " << m_respons_key << std::endl;
+//	std::cout << " huli test :::: " << " m_respons_status = " << m_respons_status << std::endl;
+//	std::cout << " huli test :::: " << " ))))))))))))))))))))))))))))2222222222 = " << 222 << std::endl;
 
 
 

+ 1 - 0
dispatch/dispatch_device_base.h

@@ -11,6 +11,7 @@
 #include <mutex>
 #include "../tool/thread_condition.h"
 #include "../tool/common_data.h"
+#include "../tool/time_tool.h"
 #include "../task/task_base.h"
 #include "../dispatch/dispatch_communication.h"
 #include "../dispatch/dispatch_coordinates.h"

+ 10 - 4
dispatch/dispatch_process.cpp

@@ -296,7 +296,7 @@ Error_manager Dispatch_process::dispatch_control_motion()
 					//长流程结束, 就答复 control_response_msg
 					// 注:这里执行调度控制, 即使报错了 也要答复给调度控制, 交给调度控制来进行决策.
 					iter->second.m_error = t_error;
-					iter->second.m_dispatch_control_status = DISPATCH_CONTROL_RESPONSE;
+					iter->second.m_dispatch_control_status = DISPATCH_CONTROL_TASK_WITHDRAW;
 				}
 				break;
 		    }
@@ -404,6 +404,9 @@ Error_manager Dispatch_process::connect_dispatch_device(int dispatch_device_type
 		}
 		else
 		{
+			std::cout << " huli test :::: " << " 123123123123123123123 = " << 1233 << std::endl;
+			std::cout << " huli test :::: " << " tp_catcher->check_status() = " << tp_catcher->check_status().to_string() << std::endl;
+			std::cout << " huli test :::: " << " tp_catcher->m_actual_device_status = " << tp_catcher->m_actual_device_status << std::endl;
 			t_error = Error_manager(Error_code::DISPATCH_PROCESS_DEVICE_STATUS_ERROR, Error_level::MINOR_ERROR,
 														  " tp_catcher->m_actual_device_status device_status error ");
 			dispatch_control_node.m_error = t_error;
@@ -475,6 +478,9 @@ Error_manager Dispatch_process::connect_dispatch_device(int dispatch_device_type
 		}
 		else
 		{
+			std::cout << " huli test :::: " << " 123123123123123123123 = " << 4566 << std::endl;
+			std::cout << " huli test :::: " << " tp_carrier->check_status() = " << tp_carrier->check_status().to_string() << std::endl;
+			std::cout << " huli test :::: " << " tp_carrier->m_actual_device_status = " << tp_carrier->m_actual_device_status << std::endl;
 			t_error = Error_manager(Error_code::DISPATCH_PROCESS_DEVICE_STATUS_ERROR, Error_level::MINOR_ERROR,
 								 " tp_carrier->m_actual_device_status device_status error ");
 			dispatch_control_node.m_error = t_error;
@@ -2627,9 +2633,9 @@ Error_manager Dispatch_process::check_task_ex(std::shared_ptr<Task_Base> p_task,
 	}
 	else
 	{
-		std::cout << " huli test :::: " << " ffffffffffffffffffffffffffffffffffffffffffffffffffffff = " << 333 << std::endl;
-		std::cout << " huli test :::: " << " p_task->get_task_statu() = " << p_task->get_task_statu() << std::endl;
-		std::cout << " huli test :::: " << " gggggggggggggggggggggggggggggggggggggggggggggggggggggg = " << 333 << std::endl;
+//		std::cout << " huli test :::: " << " ffffffffffffffffffffffffffffffffffffffffffffffffffffff = " << 333 << std::endl;
+//		std::cout << " huli test :::: " << " p_task->get_task_statu() = " << p_task->get_task_statu() << std::endl;
+//		std::cout << " huli test :::: " << " gggggggggggggggggggggggggggggggggggggggggggggggggggggg = " << 333 << std::endl;
 
 
 		if ( p_task->get_task_statu() == Task_Base::Task_statu::TASK_OVER )