address clang warnings

Change-Id: I6ee31341dfa3bf52ce9a4c8981a2449bbe6b319d

Author: rdementi

CMakeLists.txt

@@ -48,7 +48,10 @@ if(UNIX)  # APPLE, LINUX, FREE_BSD
     set (PCM_COMMON_FLAGS "-Wno-unknown-pragmas -fPIC")
 
     if(LINUX)
-       set (PCM_COMMON_FLAGS "${PCM_COMMON_FLAGS} -Wl,-z,now -Wextra -DPCM_USE_PERF")
+       set (PCM_COMMON_FLAGS "${PCM_COMMON_FLAGS} -Wextra -DPCM_USE_PERF")
+       if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+         set (PCM_COMMON_FLAGS "${PCM_COMMON_FLAGS} -Wl,-z,now")
+       endif()
 
        if(NOT DEFINED LINUX_SYSTEMD)
          set(LINUX_SYSTEMD FALSE)
@@ -74,9 +77,14 @@ if(UNIX)  # APPLE, LINUX, FREE_BSD
     message(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
 
     set(PCM_OPTIONAL_FLAGS "-Wall")
-    set(CMAKE_CXX_FLAGS_RELEASE "${PCM_OPTIONAL_FLAGS} -O3 -D_FORTIFY_SOURCE=1 -rdynamic")
-    set(CMAKE_CXX_FLAGS_DEBUG "${PCM_OPTIONAL_FLAGS} -O0 -g -rdynamic")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${PCM_OPTIONAL_FLAGS} -O3 -g -D_FORTIFY_SOURCE=1 -rdynamic")
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+         set (PCM_DYNAMIC "-rdynamic")
+    elseif()
+         set (PCM_DYNAMIC "")
+    endif()
+    set(CMAKE_CXX_FLAGS_RELEASE "${PCM_OPTIONAL_FLAGS} -O3 ${PCM_DYNAMIC}")
+    set(CMAKE_CXX_FLAGS_DEBUG "${PCM_OPTIONAL_FLAGS} -O0 -g ${PCM_DYNAMIC}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${PCM_OPTIONAL_FLAGS} -O3 -g ${PCM_DYNAMIC}")
     if(FREE_BSD)
         set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -lexecinfo")
         set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -lexecinfo")

src/cpucounters.cpp

@@ -1019,12 +1019,13 @@ class QATTelemetryVirtualCounterRegister : public HWRegister
 {
     std::shared_ptr<QATTelemetryVirtualGeneralConfigRegister> gConfigReg;
     std::shared_ptr<QATTelemetryVirtualControlRegister> controlReg;
-    int ctr_id;
+    // int ctr_id; // unused
 public:
-    QATTelemetryVirtualCounterRegister( std::shared_ptr<QATTelemetryVirtualGeneralConfigRegister> gConfigReg_, std::shared_ptr<QATTelemetryVirtualControlRegister> controlReg_, int ctr_id_) : 
+    QATTelemetryVirtualCounterRegister( std::shared_ptr<QATTelemetryVirtualGeneralConfigRegister> gConfigReg_,
+        std::shared_ptr<QATTelemetryVirtualControlRegister> controlReg_,
+        int /* ctr_id_ */ ) :
         gConfigReg(gConfigReg_),
-        controlReg(controlReg_),
-        ctr_id(ctr_id_)
+        controlReg(controlReg_)
     {
     }
     void operator = (uint64 /* val */) override
@@ -5738,7 +5739,11 @@ PCM::ErrorCode PCM::program(const RawPMUConfigs& curPMUConfigs_, const bool sile
         return true;
     };
     FixedEventControlRegister fixedReg;
-    auto setOtherConf = [&conf, &fixedReg, &globalRegPos](const RawPMUConfig& corePMUConfig)
+    auto setOtherConf = [&conf, &fixedReg
+#ifdef _MSC_VER
+        , &globalRegPos
+#endif
+            ](const RawPMUConfig& corePMUConfig)
     {
         if ((size_t)globalRegPos < corePMUConfig.programmable.size())
         {

src/pcm-sensor-server.cpp

@@ -4,7 +4,9 @@
 // Use port allocated for PCM in prometheus:
 // https://github.com/prometheus/prometheus/wiki/Default-port-allocations
 constexpr unsigned int DEFAULT_HTTP_PORT = 9738;
+#if defined (USE_SSL)
 constexpr unsigned int DEFAULT_HTTPS_PORT = DEFAULT_HTTP_PORT;
+#endif
 #include "pcm-accel-common.h"
 
 #include <limits.h>
@@ -969,7 +971,7 @@ class basic_socketbuf : public std::basic_streambuf<CharT> {
         return 0;
     }
 
-    virtual int_type overflow( int_type ch ) {
+    virtual int_type overflow( int_type ch ) override {
         // send data in buffer and reset it
         if ( traits_type::eof() != ch ) {
             *Base::pptr() = ch;
@@ -982,7 +984,7 @@ class basic_socketbuf : public std::basic_streambuf<CharT> {
         return bytesWritten; // Anything but traits_type::eof() to signal ok.
     }
 
-    virtual int_type underflow() {
+    virtual int_type underflow() override {
         std::fill(inputBuffer_, inputBuffer_ + SIZE, 0);
         ssize_t bytesReceived;
 
@@ -2547,9 +2549,9 @@ class HTTPConnection : public Work {
 public:
     HTTPConnection() = delete;
 #if defined (USE_SSL)
-    HTTPConnection( HTTPServer* hs, int socketFD, struct sockaddr_in clientAddr, std::vector<http_callback> const & cl, SSL* ssl = nullptr ) : hs_( hs ), socketStream_( socketFD, ssl ), clientAddress_( clientAddr ), callbackList_( cl ) {}
+    HTTPConnection( HTTPServer* hs, int socketFD, struct sockaddr_in /* clientAddr */, std::vector<http_callback> const & cl, SSL* ssl = nullptr ) : hs_( hs ), socketStream_( socketFD, ssl ), /* clientAddress_( clientAddr ), */ callbackList_( cl ) {}
 #else
-    HTTPConnection( HTTPServer* hs, int socketFD, struct sockaddr_in clientAddr, std::vector<http_callback> const & cl ) : hs_( hs ), socketStream_( socketFD ), clientAddress_( clientAddr ), callbackList_( cl ) {}
+    HTTPConnection( HTTPServer* hs, int socketFD, struct sockaddr_in /* clientAddr */, std::vector<http_callback> const & cl ) : hs_( hs ), socketStream_( socketFD ), /* clientAddress_( clientAddr ), */ callbackList_( cl ) {}
 #endif
     HTTPConnection( HTTPConnection const & ) = delete;
     void operator=( HTTPConnection const & ) = delete;
@@ -2644,7 +2646,7 @@ class HTTPConnection : public Work {
 private:
     HTTPServer*  hs_;
     socketstream socketStream_;
-    struct sockaddr_in clientAddress_;
+    // struct sockaddr_in clientAddress_; // Not used yet
     std::vector<http_callback> const & callbackList_;
     std::vector<std::string> responseHeader_;
     std::string responseBody_;

src/tpmi.cpp

@@ -197,7 +197,7 @@ class TPMIHandleDriver : public TPMIHandleInterface
     const size_t instance;
     const size_t ID;
     const size_t offset;
-    const bool readonly;
+    // const bool readonly; // not used
     size_t nentries;
     struct TPMIEntry {
         unsigned int offset{0};
@@ -271,11 +271,11 @@ class TPMIHandleDriver : public TPMIHandleInterface
     }
 public:
     static size_t getNumInstances();
-    TPMIHandleDriver(const size_t instance_, const size_t ID_, const size_t offset_, const bool readonly_ = true) :
+    TPMIHandleDriver(const size_t instance_, const size_t ID_, const size_t offset_, const bool /* readonly_ */ = true) :
         instance(instance_),
         ID(ID_),
         offset(offset_),
-        readonly(readonly_),
+        // readonly(readonly_), // not used
         nentries(0)
     {
         assert(available > 0);

src/tpmi.h

@@ -21,6 +21,7 @@ class TPMIHandleInterface
     virtual size_t getNumEntries() const = 0;
     virtual uint64 read64(size_t entryPos) = 0;
     virtual void write64(size_t entryPos, uint64 val) = 0;
+    virtual ~TPMIHandleInterface() {}
 };
 
 class TPMIHandle : public TPMIHandleInterface

src/uncore_pmu_discovery.cpp

@@ -9,8 +9,6 @@
 
 namespace pcm {
 
-constexpr auto UNCORE_DISCOVERY_MAP_SIZE = 0x80000;
-
 UncorePMUDiscovery::UncorePMUDiscovery()
 {
     if (safe_getenv("PCM_NO_UNCORE_PMU_DISCOVERY") == std::string("1"))