[hermes] Use generic Config on reload (#3985)

Source now has a default "reload" method implementation which uses
generic configure method.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/contrib/hermes/include/hermes/core/Config.h b/contrib/hermes/include/hermes/core/Config.h
index 49042dd..d937a36 100644 (file)
--- a/contrib/hermes/include/hermes/core/Config.h
+++ b/contrib/hermes/include/hermes/core/Config.h
@@ -17,9 +17,15 @@
 #ifndef __HERMES_CONFIG_H__
 #define __HERMES_CONFIG_H__
 
+#include "hermes/core/Severity.h" // TODO Put this into SourceSetting.h
+#include "hermes/core/SourceSetting.h"
+
 namespace hermes
 {
 
+// TODO Introduce Source.forward.h
+class Source;
+
 /**
  * @brief Top-level configuration interface
  *
@@ -28,6 +34,8 @@ namespace hermes
 struct Config
 {
   virtual ~Config() = default;
+
+  virtual void configure(const Source *, SourceSetting &) const = 0;
 };
 
 } // namespace hermes

diff --git a/contrib/hermes/include/hermes/core/Source.h b/contrib/hermes/include/hermes/core/Source.h
index b408b4a..b28532b 100644 (file)
--- a/contrib/hermes/include/hermes/core/Source.h
+++ b/contrib/hermes/include/hermes/core/Source.h
@@ -77,8 +77,10 @@ public:
    * @brief Update Source with a given configuration
    *
    * WARNING Do NOT invoke this manually.
+   *
+   * TODO Remove virtual after migration
    */
-  virtual void reload(const Config *) = 0;
+  virtual void reload(const Config *);
 
 public:
   std::unique_ptr<MessageBuffer> buffer(const Severity &) const;

diff --git a/contrib/hermes/src/core/Source.cpp b/contrib/hermes/src/core/Source.cpp
index 4d473cd..33f8b05 100644 (file)
--- a/contrib/hermes/src/core/Source.cpp
+++ b/contrib/hermes/src/core/Source.cpp
@@ -59,6 +59,8 @@ void Source::deactivate(void)
   assert((_reg == nullptr) && (_bus == nullptr));
 }
 
+void Source::reload(const Config *c) { c->configure(this, _setting); }
+
 std::unique_ptr<MessageBuffer> Source::buffer(const Severity &) const
 {
   // TODO Pass Severity