fix deadlock
This commit is contained in:
@@ -611,11 +611,10 @@ bool assign_qvvr_file_list(const std::string& id, ushort nCpuNo, const std::vect
|
||||
bool update_qvvr_file_download(const std::string& filename_with_mac, const std::string& terminal_id);
|
||||
|
||||
//上送文件列表接口
|
||||
bool send_file_list(const std::string &dev_id, const std::vector<tag_dir_info> &FileList);
|
||||
bool send_file_list(terminal_dev* dev, const std::vector<tag_dir_info> &FileList);
|
||||
|
||||
//提取mac
|
||||
std::string normalize_mac(const std::string& mac);
|
||||
std::string get_mac_by_devid(const std::string &devid);
|
||||
|
||||
//暂态文件超时检测
|
||||
void check_and_backup_qvvr_files();
|
||||
@@ -624,10 +623,7 @@ void check_and_backup_qvvr_files();
|
||||
void check_device_busy_timeout();
|
||||
|
||||
//业务上报
|
||||
void send_reply_to_cloud(int reply_code, const std::string& dev_id, int type);
|
||||
|
||||
//查guid
|
||||
std::string find_guid_index_from_dev_id(const std::string& dev_id);
|
||||
void send_reply_to_cloud(int reply_code, const std::string& dev_id, int type, const std::string& guid, const std::string& mac);
|
||||
|
||||
//内部定值响应
|
||||
bool send_internal_value_reply(const std::string &dev_id, const std::vector<DZ_kzz_bit> &control_words);
|
||||
@@ -650,8 +646,6 @@ void SendFileWeb(const std::string& strUrl, const std::string& localpath, const
|
||||
//状态翻转
|
||||
void connect_status_update(const std::string& id, int status);
|
||||
|
||||
//业务停止
|
||||
void clear_terminal_runtime_state(const std::string& id);
|
||||
|
||||
//业务响应
|
||||
void on_device_response_minimal(int response_code,
|
||||
|
||||
Reference in New Issue
Block a user