X11GLESRenderer: implements IPlugin for health monitoring support

Signed-off-by: Timo Lotterbach <timo.lotterbach@bmw-carit.de>

diff --git a/LayerManagerPlugins/Renderers/Base/src/BaseRenderer.cpp b/LayerManagerPlugins/Renderers/Base/src/BaseRenderer.cpp
index 90629f3..096eec3 100644 (file)
--- a/LayerManagerPlugins/Renderers/Base/src/BaseRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Base/src/BaseRenderer.cpp
@@ -28,6 +28,7 @@ BaseRenderer::BaseRenderer(Scene* pScene) : m_pScene(pScene)
 {
     LOG_DEBUG("BaseRenderer", "Creating Renderer");
     m_pInputManager = new InputManager(pScene);
+    setHealth(HealthRunning);
 }
 
 BaseRenderer::~BaseRenderer()
@@ -36,6 +37,7 @@ BaseRenderer::~BaseRenderer()
     {
         delete m_pInputManager;
     }
+    setHealth(HealthStopped);
 }
 
 uint BaseRenderer::getLayerTypeCapabilities(LayerType layerType)

diff --git a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/BaseWindowSystem.h b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/BaseWindowSystem.h
index 3c9a3f2..125512b 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/BaseWindowSystem.h
+++ b/LayerManagerPlugins/Renderers/Graphic/include/WindowSystems/BaseWindowSystem.h
@@ -44,6 +44,7 @@ public:
     virtual void doScreenShotOfLayer(std::string fileName, const uint id) = 0;
     virtual void doScreenShotOfSurface(std::string fileName, const uint id, const uint layer_id) = 0;
 
+    unsigned long int mThreadId; // TODO: remove
 protected:
     virtual void ClearDamage();
     Scene* m_pScene;

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/NullWindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/NullWindowSystem.cpp
index 7974457..4c46e87 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/NullWindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/NullWindowSystem.cpp
@@ -193,6 +193,7 @@ bool NullWindowSystem::start(int displayWidth, int displayHeight, const char* Di
     {
         return false;
     }
+    mThreadId = renderThread;
     while (!m_initialized)
     {
         sleep(1);

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandBaseWindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandBaseWindowSystem.cpp
index 4465c03..cf0b908 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandBaseWindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandBaseWindowSystem.cpp
@@ -1030,6 +1030,7 @@ bool WaylandBaseWindowSystem::init(BaseGraphicSystem<void*, void*>* base)
         return false;
     }
 
+    mThreadId = renderThread;
     while (false == m_initialized)
     {
         usleep(10000); // TODO

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
index 69538e3..73e41e6 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
@@ -1084,6 +1084,8 @@ bool X11WindowSystem::init(BaseGraphicSystem<Display*,Window>* base)
         pthread_mutex_unlock(&init_lock);
         return false;
     }
+    mThreadId = renderThread;
+    
     pthread_cond_wait(&init_condition,&init_lock);
 /*  while (!m_initialized)
     {

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h
index b08fffa..4e6008a 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/include/X11GLESRenderer.h
@@ -41,6 +41,8 @@ public:
     void forceCompositionWindowSystem();
     Shader* createShader(const string* vertexName, const string* fragmentName);
 
+    virtual HealthCondition getHealth();
+
 private:
     X11WindowSystem* m_pWindowSystem;
     GLESGraphicsystem* m_pGraphicSystem;

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
index 83afb6f..e10670f 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
@@ -24,6 +24,8 @@
 #include "X11/Xlib.h"
 #include "TextureBinders/X11CopyGLES.h"
 #include "TextureBinders/X11EglImage.h"
+#include <pthread.h>
+#include <signal.h>
 
 X11GLESRenderer::X11GLESRenderer(Scene* pScene)
 : BaseRenderer(pScene)
@@ -176,6 +178,16 @@ Shader* X11GLESRenderer::createShader(const string* vertexName, const string* fr
     return result;
 }
 
+HealthCondition X11GLESRenderer::getHealth()
+{
+    HealthCondition health = PluginBase::getHealth();
+    if (0 != pthread_kill(m_pWindowSystem->mThreadId, 0))
+    {
+        health = HealthDead;
+    }
+    return health;
+}
+
 extern "C" BaseRenderer* createX11GLESRenderer(Scene* pScene){
     return new X11GLESRenderer(pScene);
 }

diff --git a/LayerManagerService/include/IRenderer.h b/LayerManagerService/include/IRenderer.h
index d6d3b00..8404776 100644 (file)
--- a/LayerManagerService/include/IRenderer.h
+++ b/LayerManagerService/include/IRenderer.h
@@ -21,6 +21,7 @@
 #define _IRENDERER_H_
 
 #include <string>
+#include "PluginBase.h"
 #include "LayerType.h"
 #include "Shader.h"
 
@@ -32,7 +33,7 @@ class InputManager;
  * Abstract Base of all CompositingControllers, ie Renderers.
  * \defgroup RendererAPI Layer Management Renderer API
  */
-class IRenderer
+class IRenderer : public PluginBase
 {
 public:
     /**