Fix clang-tidy warnings

Signed-off-by: Rahul Bramandlapalli <rbramand@amd.com>

Author: rbramand-xilinx

src/runtime_src/core/common/detail/linux/syslog.h

@@ -8,15 +8,20 @@
 #include <map>
 #include <syslog.h>
 
-namespace xrt_core { namespace message {
+namespace xrt_core::message {
 
 class syslog_dispatch : public message_dispatch
 {
 public:
   syslog_dispatch()
   { openlog("sdaccel", LOG_PID|LOG_CONS, LOG_USER); }
 
-  ~syslog_dispatch()
+  syslog_dispatch(const syslog_dispatch&) = delete;
+  syslog_dispatch& operator=(const syslog_dispatch&) = delete;
+  syslog_dispatch(syslog_dispatch&&) = delete;
+  syslog_dispatch& operator=(syslog_dispatch&&) = delete;
+
+  ~syslog_dispatch() override
   { closelog(); }
 
   void
@@ -36,4 +41,4 @@ class syslog_dispatch : public message_dispatch
   };
 };
 
-}} // xrt_core::message
+} // xrt_core::message

src/runtime_src/core/common/detail/windows/syslog.h

@@ -17,11 +17,12 @@
 
 #include "core/common/message.h"
 
+#include <array>
 #include <iostream>
 #include <string>
 #include <windows.h>
 
-namespace xrt_core { namespace message {
+namespace xrt_core::message {
 
 class syslog_dispatch : public message_dispatch
 {
@@ -41,7 +42,12 @@ class syslog_dispatch : public message_dispatch
                 << "(error " << GetLastError() << "). Logging disabled.\n";
   }
 
-  ~syslog_dispatch()
+  syslog_dispatch(const syslog_dispatch&) = delete;
+  syslog_dispatch& operator=(const syslog_dispatch&) = delete;
+  syslog_dispatch(syslog_dispatch&&) = delete;
+  syslog_dispatch& operator=(syslog_dispatch&&) = delete;
+
+  ~syslog_dispatch() override
   {
     if (m_handle)
       DeregisterEventSource(m_handle);
@@ -54,37 +60,32 @@ class syslog_dispatch : public message_dispatch
       return;
 
     std::string full_msg = std::string("[") + tag + "] : " + msg;
-    LPCSTR strings[] = {full_msg.c_str()};
+    std::array<LPCSTR, 1> strings = {full_msg.c_str()};
     // Event ID 1 matches the pass-through entry in EventCreate.exe's message
     // table (%1), so Event Viewer displays our text directly without a warning.
     // Severity filtering uses wType (Level column), not event ID.
     static constexpr DWORD event_id = 1;
     ReportEventA(m_handle, to_event_type(l), 0, event_id,
-                 nullptr, 1, 0, strings, nullptr);
+                 nullptr, 1, 0, strings.data(), nullptr);
   }
 
 private:
   HANDLE m_handle = nullptr;
 
   // Maps XRT severity to Windows event type (controls icon in Event Viewer):
-  //   EVENTLOG_ERROR_TYPE       -> red X
+  //   EVENTLOG_ERROR_TYPE       -> red X   (emergency/alert/critical/error)
   //   EVENTLOG_WARNING_TYPE     -> yellow triangle
-  //   EVENTLOG_INFORMATION_TYPE -> blue i
+  //   EVENTLOG_INFORMATION_TYPE -> blue i  (notice/info/debug)
   static WORD
   to_event_type(severity_level l)
   {
-    switch (l) {
-    case severity_level::emergency:
-    case severity_level::alert:
-    case severity_level::critical:
-    case severity_level::error:
-      return EVENTLOG_ERROR_TYPE;
-    case severity_level::warning:
+    if (l == severity_level::warning)
       return EVENTLOG_WARNING_TYPE;
-    default:
-      return EVENTLOG_INFORMATION_TYPE;
-    }
+    if (l == severity_level::emergency || l == severity_level::alert ||
+        l == severity_level::critical  || l == severity_level::error)
+      return EVENTLOG_ERROR_TYPE;
+    return EVENTLOG_INFORMATION_TYPE;
   }
 };
 
-}} // xrt_core::message
+} // xrt_core::message

src/runtime_src/core/common/message.cpp

@@ -166,25 +166,23 @@ send(severity_level l, const char* tag, const char* msg)
 
 namespace xrt_core { namespace message {
 
-message_dispatch*
+std::unique_ptr<message_dispatch>
 message_dispatch::
 make_dispatcher(const std::string& choice)
 {
   if ((choice == "null") || (choice == ""))
-    return new null_dispatch;
-  else if (choice == "console")
-    return new console_dispatch;
-  else if (choice == "syslog")
-    return new syslog_dispatch;
-  else {
-    if (choice.front() == '"') {
-      std::string file = choice;
-      file.erase(0, 1);
-      file.erase(file.size()-1);
-      return new file_dispatch(file);
-    }
-    return new file_dispatch(choice);
+    return std::make_unique<null_dispatch>();
+  if (choice == "console")
+    return std::make_unique<console_dispatch>();
+  if (choice == "syslog")
+    return std::make_unique<syslog_dispatch>();
+
+  std::string file = choice;
+  if (file.front() == '"') {
+    file.erase(0, 1);
+    file.erase(file.size()-1);
   }
+  return std::make_unique<file_dispatch>(file);
 }
 
 void
@@ -195,7 +193,7 @@ send(severity_level l, const char* tag, const char* msg)
   int lev = static_cast<int>(l);
 
   if(ver >= lev) {
-    static message_dispatch* dispatcher = message_dispatch::make_dispatcher(logger);
+    static auto dispatcher = message_dispatch::make_dispatcher(logger);
     dispatcher->send(l, tag, msg);
   }
 }

src/runtime_src/core/common/message.h

@@ -8,6 +8,7 @@
 #include "core/common/config_reader.h"
 #include "core/include/xrt.h"
 #include "core/include/xrt/experimental/xrt_message.h"
+#include <memory>
 #include <string>
 #include <cstdio>
 #include <vector>
@@ -19,9 +20,18 @@ using severity_level = xrt::message::level;
 class message_dispatch
 {
 public:
+  message_dispatch() = default;
+  message_dispatch(const message_dispatch&) = delete;
+  message_dispatch& operator=(const message_dispatch&) = delete;
+  message_dispatch(message_dispatch&&) = delete;
+  message_dispatch& operator=(message_dispatch&&) = delete;
   virtual ~message_dispatch() = default;
-  static message_dispatch* make_dispatcher(const std::string& choice);
-  virtual void send(severity_level l, const char* tag, const char* msg) = 0;
+
+  static std::unique_ptr<message_dispatch>
+  make_dispatcher(const std::string& choice);
+
+  virtual void
+  send(severity_level l, const char* tag, const char* msg) = 0;
 };
 
 XRT_CORE_COMMON_EXPORT