#include <algorithm>
#include <unordered_map>
#include <list>
+#include <thread>
#include "hs-helper.h"
#include "hs-clientmanager.h"
#include "hs-appinfo.h"
struct hs_handshake {
hs_handshake(int times, int sleep) : m_times(times), m_sleep(sleep) {}
- int start(afb_api_t api) const;
+ int start(afb_api_t api);
+ void handshake_loop(afb_api_t api);
enum HandshakeStatus {
Handshake_Idle = 0,
* - api : the api
*
* #### Return
- * None
* 0 : handshake success
- * -1 : handshake fail
+ * other : handshake fail
*
*/
-int hs_handshake::start(afb_api_t api) const
+int hs_handshake::start(afb_api_t api)
{
AFB_NOTICE("start handshake with windowmanager.");
- int ret = -1;
setEventHook(sub_event.c_str(), on_handshake_event);
+
+ std::thread th(&hs_handshake::handshake_loop, this, api);
+ th.detach();
+ return 0;
+}
+
+/**
+ * handshake loop
+ *
+ * #### Parameters
+ * - api : the api
+ *
+ * #### Return
+ * None
+ *
+ */
+void hs_handshake::handshake_loop(afb_api_t api)
+{
int count = 0;
do {
// try to subscribe handshake event
// wait handshake event
if(hs_handshake::hs_sts == hs_handshake::Handshake_Over) {
- ret = 0;
break;
}
++count;
usleep(m_sleep*1000);
} while(count < m_times);
-
- return ret;
+ AFB_NOTICE("handshake over, count=%d.", count);
+ HS_AppRecover::instance()->startRecovery(api);
}
struct hs_instance {
return -1;
}
+ if(app_recover == nullptr) {
+ AFB_ERROR("app_recover is nullptr.");
+ return -1;
+ }
+ app_recover->init(api);
+ app_recover->setRecoverMap(hs_config.getRecoverMap());
+
const struct handshake_info *h = hs_config.getHandshakeInfo();
struct hs_handshake handshake(h->times, h->sleep);
if(handshake.start(api) < 0) {
return -1;
}
- if(app_recover == nullptr) {
- AFB_ERROR("app_recover is nullptr.");
- return -1;
- }
- app_recover->init(api);
- app_recover->startRecovery(api, hs_config.getRecoverMap());
-
return 0;
}
* None
*
*/
-void HS_AppRecover::startRecovery(afb_api_t api, recover_map &map)
+void HS_AppRecover::startRecovery(afb_api_t api)
{
for(auto &key : HS_Config::keys_recover_type) {
- for(auto &m : map[key]){
+ for(auto &m : recover_app_map[key]){
struct app_recover_info recover_info = {
.recover_type = key,
.visibility = m.visibility,
}
}
}
+ recover_app_map.clear();
}
/**
static HS_AppRecover* instance(void);
int init(afb_api_t api);
- void startRecovery(afb_api_t api, recover_map &map);
+ void setRecoverMap(recover_map &map) {recover_app_map.swap(map);}
+ void startRecovery(afb_api_t api);
bool registerRecoveredApp(afb_api_t api, const std::string &appid);
void screenUpdated(struct json_object *obj);
std::set<std::string> m_recovering_set;
std::map<std::string, std::set<std::string>> m_wait_recover_set;
std::set<std::string> m_lastmode_list;
+ recover_map recover_app_map;
};
#endif // HOMESCREEN_APPRECOVER_H
\ No newline at end of file