1 files changed, 68 insertions, 31 deletions

diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index 06f7793..bbfd08c 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -988,9 +988,10 @@ ActivityManager::ActivityManager (void)
   ;
 }
 
-void ActivityManager::api_register_activity_observer (afb_req_t req)
+void ActivityManager::api_register_activity_observer (afb_req_t req, void* &lcm_ctx)
 {
-  std::string observer = afb_req_get_application_id(req);
+  //std::string observer = afb_req_get_application_id(req);
+  observer* obs = static_cast<observer *>(lcm_ctx);
 
   json_object *j_data = afb_req_json(req);
   json_object *j_target;
@@ -1000,39 +1001,53 @@ void ActivityManager::api_register_activity_observer (afb_req_t req)
   }
   std::string target(json_object_get_string(j_target));
 
-  for (auto itr = this->map_observers.begin(); itr != this->map_observers.end(); ++itr) {
-    observers mp = itr->second;
-    if (mp.count(observer)) {
-      // Already exist
-      HMI_DEBUG("observer(%s) is already exist", observer.c_str());
-      if (this->map_observers[target].count(observer)) {
-        // Aready registered
-        HMI_DEBUG("observer(%s->%s) is already registered", observer.c_str(), target.c_str());
-      } else {
-        HMI_DEBUG("observer(%s->%s) is registered", observer.c_str(), target.c_str());
-
-        (this->map_observers[target])[observer] = mp[observer];
-      }
+  if (obs == nullptr) {
+    // New observer
+    afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED);
+    //afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED);
+    obs = new observer({
+        event,
+        std::bitset<NUM_STATUS>(ACTIVITY_FILTER_ALL_SET)
+      });
+
+    if (afb_req_subscribe(req, event) != 0) {
+      afb_req_fail(req, "failed", "cannot subscribe event");
       return;
     }
+    HMI_DEBUG("observer(%p, target=\"%s\") is created.[NEW]", obs, target.c_str());
+
+    lcm_ctx = static_cast<observer *>(obs);
   }
 
-  // New observer
-  afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED);
-  //afb_event_t event = afb_daemon_make_event(LCM_EVENT_STATUS_CHANGED);
-  (this->map_observers[target])[observer] = {
-    event,
-    std::bitset<NUM_STATUS>(ACTIVITY_FILTER_ALL_SET)
-  };
+  if (this->map_observers.count(target)) {
+    // already registered
+    HMI_DEBUG("observer(%p, target=\"%s\") is already exist", obs, target.c_str());
+    std::vector<observer*> obs_v = this->map_observers[target];
+    auto result = std::find(obs_v.begin(), obs_v.end(), obs);
+    if (result != obs_v.end()) {
+      HMI_DEBUG("observer(%p, target=\"%s\") is already registered", obs, target.c_str());
+      return;
+    }
+  }
+  HMI_DEBUG("observer(%p, target=\"%s\") is registered", obs, target.c_str());
+  (this->map_observers[target]).push_back(obs);
+}
 
-  if (afb_req_subscribe(req, event) != 0) {
-    HMI_ERROR("cannot subscribe event");
+void ActivityManager::remove_observer (observer *obs, std::vector<observer*>& obs_v)
+{
+  auto obs_itr = obs_v.begin();
+  while (obs_itr != obs_v.end()) {
+    if (*obs_itr == obs) {
+      obs_itr = obs_v.erase(obs_itr);
+    } else {
+      obs_itr++;
+    }
   }
 }
 
-void ActivityManager::api_unregister_activity_observer (afb_req_t req)
+void ActivityManager::api_unregister_activity_observer (afb_req_t req, void* &lcm_ctx)
 {
-  std::string observer = afb_req_get_application_id(req);
+  observer *obs = static_cast<observer *>(lcm_ctx);
 
   json_object *j_data = afb_req_json(req);
   json_object *j_target;
@@ -1043,7 +1058,24 @@ void ActivityManager::api_unregister_activity_observer (afb_req_t req)
   }
   std::string target(json_object_get_string(j_target));
 
-  HMI_DEBUG("observer(%s->%s) is unregistered.", observer.c_str(), target.c_str());
+  HMI_DEBUG("observer(%p->\"%s\") is unregistered.", obs, target.c_str());
+
+  if (this->map_observers.count(target) != 0) {
+    remove_observer(obs, this->map_observers[target]);
+  }
+}
+
+void ActivityManager::lcm_clear_context (void* &lcm_ctx)
+{
+  observer *obs = static_cast<observer *>(lcm_ctx);
+
+  for (auto itr = this->map_observers.begin(); itr != this->map_observers.end(); itr++) {
+    remove_observer(obs, itr->second);
+  }
+
+  HMI_DEBUG("observer(%p) is removed.", obs);
+
+  delete obs;
 }
 
 wm::result<json_object *> ActivityManager::api_get_activity_status (const char *appid)
@@ -1074,18 +1106,23 @@ void ActivityManager::emit_activity_status_changed (const char* appid, const cha
 {
   // POI: AGL LifeCycle Management
   // E.g. statusChanged(CREATED->STARTED)
+  HMI_DEBUG("emit_activity_status_changed(%s, %s)", appid, state);
+
   std::string id = appid;
 
   if (this->map_observers.count(id)) {
-    observers mp = this->map_observers[id];
-    for (auto itr = mp.begin(); itr != mp.end(); ++itr) {
-      afb_event_t event = itr->second.event;
+    std::vector<observer*>& obs_v = this->map_observers[id];
+
+    for (auto itr = obs_v.begin(); itr != obs_v.end(); ++itr) {
+      auto obs = *itr;
+      afb_event_t event = obs->event;
       if (afb_event_is_valid(event)) {
-        HMI_DEBUG("emit_activity_status_changed(%s, %s)", appid, state);
         json_object *data = json_object_new_object();
         json_object_object_add(data, LCM_STATE, json_object_new_string(state));
         json_object_object_add(data, LCM_TARGET, json_object_new_string(appid));
 
+        HMI_DEBUG("send Event_statusChanged(%s, %s)", appid, state);
+
         afb_event_push(event, json_object_get(data));
         json_object_put(data);
       } else {