Introducing handling of crashed applications.

- If an application crashes, the reference to this
  application will be automatically removed

4 files changed, 108 insertions, 47 deletions

diff --git a/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSCommunicator.h b/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSCommunicator.h
index e364767..a60635b 100644
--- a/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSCommunicator.h
+++ b/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSCommunicator.h
@@ -187,7 +187,10 @@ public:
     void SetUniforms(DBusConnection* conn, DBusMessage* msg);
     DBusHandlerResult delegateMessage(DBusConnection* conn, DBusMessage* msg);
 
+
 private:
+    void AddClientWatch(DBusConnection *conn, char* sender);
+    void RemoveApplicationReference(char* owner);
     static DBusHandlerResult processMessageFunc(DBusConnection* conn,DBusMessage* msg, void *user_data);
     static void unregisterMessageFunc(DBusConnection* conn, void *user_data);
     bool m_running;
diff --git a/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSMessageHandler.h b/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSMessageHandler.h
index 22ea7f5..dad6429 100644
--- a/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSMessageHandler.h
+++ b/LayerManagerPlugins/Communicators/DBUSCommunicator/include/DBUSMessageHandler.h
@@ -40,7 +40,8 @@ public:
     void initReply(DBusMessage* msg);
     void closeReply();
     void ReplyError(DBusMessage* msg, const char* errorname, const char* errorMsg);
-
+    bool registerMessageFilter(  DBusHandleMessageFunction fMessageFunc,
+                                 void* comInstance );
 
     dbus_uint32_t getUInt();
     char getByte();
diff --git a/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSCommunicator.cpp b/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSCommunicator.cpp
index d647a92..c47fc79 100644
--- a/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSCommunicator.cpp
+++ b/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSCommunicator.cpp
@@ -150,22 +150,32 @@ void DBUSCommunicator::setdebug(bool onoff)
 
 bool DBUSCommunicator::start()
 {
-	LOG_DEBUG("DBUSCommunicator", "Starting up dbus connector");
-
+    LOG_DEBUG("DBUSCommunicator", "Starting up dbus connector");
+    bool result = true;
     g_pDbusMessage = new DBUSMessageHandler();
 
     LOG_DEBUG("DBUSCommunicator","registering for dbus path " << DBUS_SERVICE_OBJECT_PATH);
     bool registered = g_pDbusMessage->registerPathFunction(DBUSCommunicator::processMessageFunc,
-    		                                               DBUSCommunicator::unregisterMessageFunc,
-    		                                               this);
+                                                           DBUSCommunicator::unregisterMessageFunc,
+                                                           this);
     if (!registered)
     {
+        
         LOG_ERROR("DBUSCommunicator","Register Message Callbacks failed");
-        exit(-1);
+        result = false;
+    } 
+    else 
+    {
+        registered =  g_pDbusMessage->registerMessageFilter(DBUSCommunicator::processMessageFunc,this);
+        if (!registered)
+        {
+            
+            LOG_ERROR("DBUSCommunicator","Register Message Filter failed");
+            result = false;
+        } 
     }
-
     LOG_INFO("DBUSCommunicator", "Started dbus connector");
-    return true;
+    return result;
 }
 
 void DBUSCommunicator::stop()
@@ -178,16 +188,15 @@ void DBUSCommunicator::stop()
 
 void DBUSCommunicator::ServiceConnect(DBusConnection* conn, DBusMessage* msg)
 {
-   (void)conn; // TODO: remove, only prevents warning
     g_pDbusMessage->initReceive(msg);
     u_int32_t processId = g_pDbusMessage->getUInt();
     char* owner = strdup(dbus_message_get_sender(msg));   
     m_executor->addApplicationReference(new IApplicationReference(owner,processId));    
+    AddClientWatch(conn,owner);
     g_pDbusMessage->initReply(msg);
     g_pDbusMessage->closeReply();
 }
 
-
 void DBUSCommunicator::ServiceDisconnect(DBusConnection* conn, DBusMessage* msg)   
 {
    IApplicationReference* reference = NULL;
@@ -195,14 +204,7 @@ void DBUSCommunicator::ServiceDisconnect(DBusConnection* conn, DBusMessage* msg)
     g_pDbusMessage->initReceive(msg);
     char* owner = strdup(dbus_message_get_sender(msg));
     u_int32_t processId = g_pDbusMessage->getUInt();
-    ApplicationReferenceMapIterator iter = m_executor->getApplicationReferenceMap()->find(IApplicationReference::generateApplicationHash(owner));
-    ApplicationReferenceMapIterator iterEnd = m_executor->getApplicationReferenceMap()->end();
-
-    if ( iter != iterEnd ) 
-    {
-        m_executor->removeApplicationReference((*iter).second);
-    }
-    
+    RemoveApplicationReference(owner);
     g_pDbusMessage->initReply(msg);
     g_pDbusMessage->closeReply();
 }
@@ -1987,6 +1989,32 @@ void DBUSCommunicator::SetUniforms(DBusConnection* conn, DBusMessage* msg)
     }
 }
 
+void DBUSCommunicator::RemoveApplicationReference(char* owner)
+{
+    ApplicationReferenceMapIterator iter = m_executor->getApplicationReferenceMap()->find(IApplicationReference::generateApplicationHash(owner));
+    ApplicationReferenceMapIterator iterEnd = m_executor->getApplicationReferenceMap()->end();
+
+    if ( iter != iterEnd ) 
+    {
+        m_executor->removeApplicationReference((*iter).second);
+    }
+}
+
+
+void DBUSCommunicator::AddClientWatch(DBusConnection *conn, char* sender) 
+{
+    DBusError err;
+    char rule[1024];
+    sprintf(rule,"type='signal',sender='%s',interface='%s',member='%s',arg0='%s'",DBUS_INTERFACE_DBUS,DBUS_INTERFACE_DBUS,"NameOwnerChanged",sender);
+    
+    dbus_bus_add_match(conn,rule,&err);
+    if (dbus_error_is_set(&err))
+    {
+        LOG_ERROR("DBUSCommunicator", "Could not add client watch "<< err.message);
+        dbus_error_free(&err);
+    }
+}
+
 DBusHandlerResult DBUSCommunicator::delegateMessage(DBusConnection* conn, DBusMessage* msg) 
 {
     DBusHandlerResult result = DBUS_HANDLER_RESULT_HANDLED;
@@ -2011,13 +2039,30 @@ DBusHandlerResult DBUSCommunicator::delegateMessage(DBusConnection* conn, DBusMe
 
     if (dbus_message_is_method_call(msg, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
     {
-    	LOG_DEBUG("DBUSCommunicator", "Introspection called");
+        LOG_DEBUG("DBUSCommunicator", "Introspection called");
         DBUSIntrospection introspectionString(manager_methods);
         introspectionString.process(conn, msg);
         g_pDbusMessage->setConnection(conn);
         found = true; // TODO: always true
     }
-
+    
+    if (dbus_message_is_signal(msg, DBUS_INTERFACE_DBUS, "NameOwnerChanged"))
+    {
+        char *name, *oldName, *newName;
+        LOG_DEBUG("DBUSCommunicator","NameOwner Changed detected ");
+        if (!dbus_message_get_args(msg, NULL,
+            DBUS_TYPE_STRING, &name,
+            DBUS_TYPE_STRING, &oldName,
+            DBUS_TYPE_STRING, &newName,
+            DBUS_TYPE_INVALID)) 
+        {
+            LOG_WARNING("DBUSCommunicator","Invalid arguments for NameOwnerChanged signal");
+        } else if ( *newName == '\0' ) 
+        {
+            LOG_DEBUG("DBUSCommunicator","Client Disconnect detected " << name);
+            RemoveApplicationReference(name);
+        }
+    }
     if (!found)
     {
         result = DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
diff --git a/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSMessageHandler.cpp b/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSMessageHandler.cpp
index a9e56da..28053f2 100644
--- a/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSMessageHandler.cpp
+++ b/LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSMessageHandler.cpp
@@ -17,24 +17,24 @@ DBUSMessageHandler::DBUSMessageHandler()
     char* useSessionBus = getenv("LM_USE_SESSION_BUS");
     if ( NULL != useSessionBus && strcmp(useSessionBus,"enable") == 0 )
     {
-        LOG_INFO("DBUSCommunicator", "Using Session Bus");
+        LOG_INFO("DBUSMessageHandler", "Using Session Bus");
         m_pConnection = dbus_bus_get(DBUS_BUS_SESSION, &m_err);
     } 
     else 
     {
-        LOG_INFO("DBUSCommunicator", "Using System Bus");
+        LOG_INFO("DBUSMessageHandler", "Using System Bus");
         m_pConnection = dbus_bus_get(DBUS_BUS_SYSTEM, &m_err);
     }    
 
     if (dbus_error_is_set(&m_err))
     {
-        LOG_ERROR("DBUSCommunicator","Connection error");
+        LOG_ERROR("DBUSMessageHandler","Connection error");
         dbus_error_free(&m_err);
     }
     
     if (NULL == m_pConnection)
     {
-        LOG_ERROR("DBUSCommunicator","Connection is null");
+        LOG_ERROR("DBUSMessageHandler","Connection is null");
         exit(1);
     }
     
@@ -42,13 +42,13 @@ DBUSMessageHandler::DBUSMessageHandler()
     
     if (dbus_error_is_set(&m_err))
     {
-        LOG_ERROR("DBUSCommunicator", "Name Error "<< m_err.message);
+        LOG_ERROR("DBUSMessageHandler", "Name Error "<< m_err.message);
         dbus_error_free(&m_err);
     }
     
     if (DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER != ret)
     {
-        LOG_ERROR("DBUSCommunicator", "Not Primary Owner "<< ret);
+        LOG_ERROR("DBUSMessageHandler", "Not Primary Owner "<< ret);
         exit(1);
     }
 }
@@ -60,20 +60,32 @@ DBUSMessageHandler::~DBUSMessageHandler()
     bool errorset = dbus_error_is_set(&err);
     if (errorset)
     {
-        LOG_ERROR("DBUSCommunicator","there was an dbus error");
+        LOG_ERROR("DBUSMessageHandler","there was an dbus error");
     }
     dbus_connection_unregister_object_path(m_pConnection,DBUS_SERVICE_OBJECT_PATH);
-    LOG_INFO("DBUSCommunicator","Ask about owner name");
+    LOG_INFO("DBUSMessageHandler","Ask about owner name");
     dbus_bus_name_has_owner(m_pConnection, DBUS_SERVICE_PREFIX, &err);
     errorset = dbus_error_is_set(&err);
     if (errorset)
     {
-        LOG_ERROR("DBUSCommunicator","there was an dbus error");
+        LOG_ERROR("DBUSMessageHandler","there was an dbus error");
     }
     dbus_error_init(&err);
     dbus_bus_release_name(m_pConnection, DBUS_SERVICE_PREFIX, &err);
 }
 
+bool DBUSMessageHandler::registerMessageFilter(  DBusHandleMessageFunction fMessageFunc,
+                                                 void* comInstance )
+{
+    bool result = true;
+    if ( !dbus_connection_add_filter ( m_pConnection , fMessageFunc, comInstance, NULL) ) 
+    {
+        result = false;
+    }
+    return result;
+}
+
+
 bool DBUSMessageHandler::registerPathFunction(  DBusObjectPathMessageFunction fMessageFunc,
                                                 DBusObjectPathUnregisterFunction fUnregisterFunc, 
                                                 void* comInstance)
@@ -91,10 +103,10 @@ bool DBUSMessageHandler::registerPathFunction(  DBusObjectPathMessageFunction fM
 
 void DBUSMessageHandler::initReceive(DBusMessage* msg)
 {
-    LOG_DEBUG("DBUSCommunicator","Message " << dbus_message_get_member(msg) << " was sent by " << dbus_message_get_sender(msg) );
+    LOG_DEBUG("DBUSMessageHandler","Message " << dbus_message_get_member(msg) << " was sent by " << dbus_message_get_sender(msg) );
     if (!dbus_message_iter_init(msg, &m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator", "Message has no arguments!");
+        LOG_ERROR("DBUSMessageHandler", "Message has no arguments!");
     }
 }
 
@@ -110,10 +122,10 @@ void DBUSMessageHandler::closeReply()
     // send the reply && flush the connection
     if (!dbus_connection_send(m_pConnection, m_pReply, &m_serial))
     {
-        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        LOG_ERROR("DBUSMessageHandler", "Out Of Memory!");
         exit(1);
     }
-    LOG_DEBUG("DBUSCommunicator", "sending reply");
+    LOG_DEBUG("DBUSMessageHandler", "sending reply");
     dbus_connection_flush(m_pConnection);
 
     // free the reply
@@ -127,10 +139,10 @@ void DBUSMessageHandler::ReplyError(DBusMessage* msg, const char* errorname, con
     // send the reply && flush the connection
     if (!dbus_connection_send(m_pConnection, m_pReply, &m_serial))
     {
-        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        LOG_ERROR("DBUSMessageHandler", "Out Of Memory!");
         exit(1);
     }
-    LOG_INFO("DBUSCommunicator", "sending reply with error");
+    LOG_INFO("DBUSMessageHandler", "sending reply with error");
     dbus_connection_flush(m_pConnection);
 
     // free the reply
@@ -144,7 +156,7 @@ char* DBUSMessageHandler::getString()
 
     if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator", "Argument is not string!");
+        LOG_ERROR("DBUSMessageHandler", "Argument is not string!");
     }
     else
     {
@@ -160,7 +172,7 @@ dbus_bool_t DBUSMessageHandler::getBool()
 
     if (DBUS_TYPE_BOOLEAN != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator", "Argument is not bool!");
+        LOG_ERROR("DBUSMessageHandler", "Argument is not bool!");
     }
     else
     {
@@ -176,7 +188,7 @@ char DBUSMessageHandler::getByte()
 
     if (DBUS_TYPE_BYTE != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator", "Argument is not byte!");
+        LOG_ERROR("DBUSMessageHandler", "Argument is not byte!");
     }
     else
     {
@@ -192,7 +204,7 @@ dbus_uint32_t DBUSMessageHandler::getUInt()
 
     if (DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator", "Argument is not uint32!");
+        LOG_ERROR("DBUSMessageHandler", "Argument is not uint32!");
     }
     else
     {
@@ -208,7 +220,7 @@ double DBUSMessageHandler::getDouble()
 
     if (DBUS_TYPE_DOUBLE != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator","Argument is not double!");
+        LOG_ERROR("DBUSMessageHandler","Argument is not double!");
     }
     else
     {
@@ -222,7 +234,7 @@ void DBUSMessageHandler::getArrayOfUInt(int* pLength, unsigned int** ppArray)
 {
     if (DBUS_TYPE_ARRAY != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator","Argument is not an array!");
+        LOG_ERROR("DBUSMessageHandler","Argument is not an array!");
         return;
     }
 
@@ -243,7 +255,7 @@ void DBUSMessageHandler::getArrayOfString(std::vector<std::string>* stringVector
 {
     if (DBUS_TYPE_ARRAY != dbus_message_iter_get_arg_type(&m_MessageIter))
     {
-        LOG_ERROR("DBUSCommunicator", "Argument is not an array!");
+        LOG_ERROR("DBUSMessageHandler", "Argument is not an array!");
         return;
     }
 
@@ -254,7 +266,7 @@ void DBUSMessageHandler::getArrayOfString(std::vector<std::string>* stringVector
     {
         if (DBUS_TYPE_STRING != dbus_message_iter_get_arg_type(&arrayIter))
         {
-            LOG_ERROR("DBUSCommunicator", "Argument is not an string!");
+            LOG_ERROR("DBUSMessageHandler", "Argument is not an string!");
         }
         char* param;
         dbus_message_iter_get_basic(&arrayIter, &param);
@@ -276,7 +288,7 @@ void DBUSMessageHandler::appendBool(dbus_bool_t toAppend)
 {
     if (!dbus_message_iter_append_basic(&m_MessageIter, DBUS_TYPE_BOOLEAN, &toAppend))
     {
-        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        LOG_ERROR("DBUSMessageHandler", "Out Of Memory!");
         exit(1);
     }
 }
@@ -285,7 +297,7 @@ void DBUSMessageHandler::appendUInt(dbus_uint32_t toAppend)
 {
     if (!dbus_message_iter_append_basic(&m_MessageIter, DBUS_TYPE_UINT32, &toAppend))
     {
-        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        LOG_ERROR("DBUSMessageHandler", "Out Of Memory!");
         exit(1);
     }
 }
@@ -294,7 +306,7 @@ void DBUSMessageHandler::appendDouble(double toAppend)
 {
     if (!dbus_message_iter_append_basic(&m_MessageIter, DBUS_TYPE_DOUBLE, &toAppend))
     {
-        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        LOG_ERROR("DBUSMessageHandler", "Out Of Memory!");
         exit(1);
     }
 }
@@ -303,7 +315,7 @@ void DBUSMessageHandler::appendByte(char toAppend)
 {
     if (!dbus_message_iter_append_basic(&m_MessageIter, DBUS_TYPE_BYTE, &toAppend))
     {
-        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        LOG_ERROR("DBUSMessageHandler", "Out Of Memory!");
         exit(1);
     }
 }