From 8e657c165caba46fcb06871f4390ff8529eff4b3 Mon Sep 17 00:00:00 2001
From: "Galantsev, Dmitrii" <dmitrii.galantsev@amd.com>
Date: Fri, 8 Nov 2024 13:21:42 -0600
Subject: [PATCH] RVS - Fix cookie_t -> rdc_diag_callback_t types issue

Issue introduced in ae9030ab1af20329d4140d53e746fe8ac67e8642

Change-Id: I2b6a8024d45fc44d92cf2770be9887dfc0fb3ede
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>


[ROCm/rdc commit: e1b57c43f30b090d3e2b1408f7f66c3f96951dc3]
---
 projects/rdc/include/rdc_modules/rdc_rvs/RvsBase.h        | 8 ++++----
 .../rdc/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc  | 6 +++---
 projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RvsBase.cc      | 7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/projects/rdc/include/rdc_modules/rdc_rvs/RvsBase.h b/projects/rdc/include/rdc_modules/rdc_rvs/RvsBase.h
index c48fa255df..7f94baf022 100644
--- a/projects/rdc/include/rdc_modules/rdc_rvs/RvsBase.h
+++ b/projects/rdc/include/rdc_modules/rdc_rvs/RvsBase.h
@@ -49,12 +49,12 @@ class RdcRVSBase {
   RdcRVSBase(RdcRVSBase&&) = delete;
   RdcRVSBase& operator=(RdcRVSBase&&) = delete;
 
-  rvs_status_t run_rvs_app(const char* config, size_t config_size, cookie_t* cookie);
+  rvs_status_t run_rvs_app(const char* config, size_t config_size, rdc_diag_callback_t* callback);
 
  private:
   static RdcRVSBase* s_instance;
   volatile rvs_session_state_t _state = RVS_SESSION_STATE_IDLE;
-  cookie_t* _cookie = nullptr;
+  rdc_diag_callback_t* _callback = nullptr;
   rvs_session_callback _rvs_callback = nullptr;
 
   // Static callback function that the C API will call
@@ -72,8 +72,8 @@ class RdcRVSBase {
     // output += "  status -> " + std::to_string(results->status) + "\n";
     // output += "  output -> " + std::string(results->output_log);
     std::string output = std::string(results->output_log);
-    if (_cookie != nullptr && _cookie->callback != nullptr && _cookie->writer != nullptr) {
-      _cookie->callback(_cookie->writer, output.data());
+    if (_callback != nullptr && _callback->callback != nullptr && _callback->cookie != nullptr) {
+      _callback->callback(_callback->cookie, output.data());
     }
   }
 };
diff --git a/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc b/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc
index 38225ba770..39c671b6e5 100644
--- a/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc
+++ b/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RdcDiagnosticLib.cc
@@ -65,14 +65,14 @@ rdc_status_t rdc_diag_test_case_run(rdc_diag_test_cases_t test_case,
   result->status = RDC_DIAG_RESULT_PASS;
   result->per_gpu_result_count = 0;
 
-  if (cookie != nullptr && cookie->callback != nullptr && cookie->writer != nullptr) {
+  if (callback != nullptr && callback->callback != nullptr && callback->cookie != nullptr) {
     std::string str = "RVS test";
-    cookie->callback(cookie->writer, str.data());
+    callback->callback(callback->cookie, str.data());
   }
   switch (test_case) {
     case RDC_DIAG_RVS_TEST:
       strncpy_with_null(result->info, "Finished running RDC_DIAG_RVS_TEST", MAX_DIAG_MSG_LENGTH);
-      rvs_status = rvs_base.run_rvs_app(config, config_size, cookie);
+      rvs_status = rvs_base.run_rvs_app(config, config_size, callback);
       break;
     default:
       result->status = RDC_DIAG_RESULT_SKIP;
diff --git a/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RvsBase.cc b/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RvsBase.cc
index e0a9dc499b..065ecfdf50 100644
--- a/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RvsBase.cc
+++ b/projects/rdc/rdc_libs/rdc_modules/rdc_rvs/RvsBase.cc
@@ -23,6 +23,7 @@ THE SOFTWARE.
 
 #include <string.h>
 
+#include "rdc/rdc.h"
 #include "rdc_lib/RdcLogger.h"
 #include "rdc_lib/rdc_common.h"
 #include "rdc_modules/rdc_rvs/RvsBase.h"
@@ -35,7 +36,7 @@ static constexpr size_t MAX_CONFIG_LENGTH = 1024;
 amd::rdc::RdcRVSBase* amd::rdc::RdcRVSBase::s_instance = nullptr;
 
 rvs_status_t amd::rdc::RdcRVSBase::run_rvs_app(const char* config, const size_t config_size,
-                                               cookie_t* cookie) {
+                                               rdc_diag_callback_t* callback) {
   char active_config[MAX_CONFIG_LENGTH];
   rvs_session_property_t session_property = {RVS_SESSION_TYPE_DEFAULT_CONF, {{RVS_MODULE_GST}}};
   rvs_session_id_t session_id;
@@ -78,7 +79,7 @@ rvs_status_t amd::rdc::RdcRVSBase::run_rvs_app(const char* config, const size_t
 
   /* Using custom gst configuration in string format */
 
-  _cookie = cookie;
+  _callback = callback;
   status = rvs_session_create(&session_id, &RdcRVSBase::static_callback);
 
   session_property.type = RVS_SESSION_TYPE_CUSTOM_ACTION;
@@ -97,7 +98,7 @@ rvs_status_t amd::rdc::RdcRVSBase::run_rvs_app(const char* config, const size_t
   while (_state != RVS_SESSION_STATE_COMPLETED) {
   };
 
-  _cookie = nullptr;
+  _callback = nullptr;
 
   status = rvs_session_destroy(session_id);
   if (status != RVS_STATUS_SUCCESS) {