From 89fb966954148daa42955b49af15001e6a282a8a Mon Sep 17 00:00:00 2001
From: Wataru Ishida <ishida@nel-america.com>
Date: Wed, 26 Jun 2019 18:29:06 -0700
Subject: [PATCH] mux: support log handler

Signed-off-by: Wataru Ishida <ishida@nel-america.com>
---
 tai_mux/module_adapter.hpp | 6 +++---
 tai_mux/mux.cpp            | 4 ++--
 tai_mux/mux.hpp            | 3 ++-
 tai_mux/tai.cpp            | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tai_mux/module_adapter.hpp b/tai_mux/module_adapter.hpp
index 370c605..21bfd4e 100644
--- a/tai_mux/module_adapter.hpp
+++ b/tai_mux/module_adapter.hpp
@@ -7,7 +7,7 @@
 typedef tai_status_t (*tai_api_initialize_fn) (uint64_t, const tai_service_method_table_t *);
 typedef tai_status_t (*tai_api_uninitialize_fn) (void);
 typedef tai_status_t (*tai_api_query_fn) (tai_api_t, void**);
-typedef tai_status_t (*tai_log_set_fn) (tai_api_t, tai_log_level_t);
+typedef tai_status_t (*tai_log_set_fn) (tai_api_t, tai_log_level_t, tai_log_fn);
 typedef tai_object_type_t (*tai_object_type_query_fn) (tai_object_id_t);
 typedef tai_object_id_t (*tai_module_id_query_fn) (tai_object_id_t);
 
@@ -27,8 +27,8 @@ class ModuleAdapter {
         tai_status_t tai_api_uninitialize(void) {
             return m_tai_api_uninitialize();
         }
-        tai_status_t tai_log_set(tai_api_t tai_api_id, tai_log_level_t log_level) {
-            return m_tai_log_set(tai_api_id, log_level);
+        tai_status_t tai_log_set(tai_api_t tai_api_id, tai_log_level_t log_level, tai_log_fn log_fn) {
+            return m_tai_log_set(tai_api_id, log_level, log_fn);
         }
         tai_object_type_t tai_object_type_query(tai_object_id_t tai_object_id) {
             return m_tai_object_type_query(tai_object_id);
diff --git a/tai_mux/mux.cpp b/tai_mux/mux.cpp
index 00050c5..153fb46 100644
--- a/tai_mux/mux.cpp
+++ b/tai_mux/mux.cpp
@@ -233,13 +233,13 @@ tai_object_id_t Multiplexier::module_id_query(_In_ tai_object_id_t id) {
     return g_mux->get_reverse_mapping(m_adapter->tai_module_id_query(realid), m_adapter);
 }
 
-tai_status_t Multiplexier::tai_log_set(_In_ tai_api_t api, _In_ tai_log_level_t level) {
+tai_status_t Multiplexier::tai_log_set(_In_ tai_api_t api, _In_ tai_log_level_t level, _In_ tai_log_fn log_fn) {
     if ( g_mux == nullptr ) {
         return TAI_STATUS_UNINITIALIZED;
     }
     auto set = m_pa->list_module_adapters();
     for ( const auto& a :  set ) {
-        auto ret = a->tai_log_set(api, level);
+        auto ret = a->tai_log_set(api, level, log_fn);
         if ( ret != TAI_STATUS_SUCCESS ) {
             return ret;
         }
diff --git a/tai_mux/mux.hpp b/tai_mux/mux.hpp
index 020cab4..f0e4884 100644
--- a/tai_mux/mux.hpp
+++ b/tai_mux/mux.hpp
@@ -136,7 +136,8 @@ class Multiplexier {
 
         tai_status_t tai_log_set(
                 _In_ tai_api_t tai_api_id,
-                _In_ tai_log_level_t log_level);
+                _In_ tai_log_level_t log_level,
+                _In_ tai_log_fn log_fn);
 
     private:
         Multiplexier(const Multiplexier&){}
diff --git a/tai_mux/tai.cpp b/tai_mux/tai.cpp
index e440e7b..307dcaa 100644
--- a/tai_mux/tai.cpp
+++ b/tai_mux/tai.cpp
@@ -220,8 +220,8 @@ tai_status_t tai_api_query(_In_ tai_api_t tai_api_id,
     return TAI_STATUS_SUCCESS;
 }
 
-tai_status_t tai_log_set(tai_api_t tai_api_id, tai_log_level_t log_level) {
-    return g_mux->tai_log_set(tai_api_id, log_level);
+tai_status_t tai_log_set(tai_api_t tai_api_id, tai_log_level_t log_level, tai_log_fn log_fn) {
+    return g_mux->tai_log_set(tai_api_id, log_level, log_fn);
 }
 
 tai_object_type_t tai_object_type_query(tai_object_id_t id) {