Merge pull request #419 from opcm/macos-scan-build

Macos scan build

Author: opcm

.github/workflows/macos-scan-build.yml

@@ -0,0 +1,23 @@
+name: Mac OS X scan-build
+
+on:
+  push:
+    branches: [ macos-scan-build ]
+  pull_request:
+    branches: [ macos-scan-build ]
+
+jobs:
+  build:
+
+    runs-on: macos-11
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: cmake
+      run: |
+        rm -rf ${{ github.workspace }}/build
+        /usr/local/opt/llvm/bin/scan-build cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}
+    - name: make
+      run: |
+        cd ${{ github.workspace }}/build
+        /usr/local/opt/llvm/bin/scan-build --exclude src/simdjson --status-bugs make -j 

examples/c_example.c

@@ -107,16 +107,16 @@ int main(int argc, const char *argv[])
 	printf("[c_example] PCM measurement stopped, compute result %u\n", total);
 
 	lcore_id = pcm_getcpu();
-	printf("C:%lu I:%lu, IPC:%3.2f\n",
-		PCM.pcm_c_get_cycles(lcore_id),
-		PCM.pcm_c_get_instr(lcore_id),
+	printf("C:%llu I:%llu, IPC:%3.2f\n",
+		(unsigned long long)PCM.pcm_c_get_cycles(lcore_id),
+		(unsigned long long)PCM.pcm_c_get_instr(lcore_id),
 		(double)PCM.pcm_c_get_instr(lcore_id)/PCM.pcm_c_get_cycles(lcore_id));
-	printf("CPU%d E0: %lu, E1: %lu, E2: %lu, E3: %lu\n",
+	printf("CPU%d E0: %llu, E1: %llu, E2: %llu, E3: %llu\n",
 		lcore_id,
-		PCM.pcm_c_get_core_event(lcore_id,0),
-		PCM.pcm_c_get_core_event(lcore_id,1),
-		PCM.pcm_c_get_core_event(lcore_id,2),
-		PCM.pcm_c_get_core_event(lcore_id,3));
+		(unsigned long long)PCM.pcm_c_get_core_event(lcore_id,0),
+		(unsigned long long)PCM.pcm_c_get_core_event(lcore_id,1),
+		(unsigned long long)PCM.pcm_c_get_core_event(lcore_id,2),
+		(unsigned long long)PCM.pcm_c_get_core_event(lcore_id,3));
 
 	return 0;
 }

src/MacMSRDriver/PcmMsr/PcmMsr.cpp

@@ -249,10 +249,11 @@ void* PcmMsrDriverClassName::mapMemory (uint32_t address, UInt8 **virtual_addres
 
     IOMemoryMap        *memory_map        = NULL;
     IOMemoryDescriptor *memory_descriptor = NULL;
-	
+	#ifndef __clang_analyzer__ // address a false-positive
     memory_descriptor = IOMemoryDescriptor::withPhysicalAddress(address,
                                                                 4096,
                                                                 kIODirectionInOut);
+    #endif
     if (memory_descriptor) {
         IOReturn ioErr = memory_descriptor->prepare(kIODirectionInOut);
         if (ioErr == kIOReturnSuccess) {
@@ -268,9 +269,12 @@ void* PcmMsrDriverClassName::mapMemory (uint32_t address, UInt8 **virtual_addres
 			}
         }
         else {
-            memory_descriptor->release();
 			IOLog("%s[%p]::%s() -- IOMemoryDescriptor::prepare() failure\n", getName(), this, __FUNCTION__);
         }
+        if (!memory_map)
+        {
+            memory_descriptor->release();
+        }
     } else {
 		IOLog("%s[%p]::%s() -- IOMemoryDescriptor::withPhysicalAddress() failure\n", getName(), this, __FUNCTION__);
 	}
@@ -288,7 +292,9 @@ void PcmMsrDriverClassName::unmapMemory (void *memory_map)
 
     if (m_map) {
         m_map->getMemoryDescriptor()->complete();
+        #ifndef __clang_analyzer__ // address a false-positive
         m_map->getMemoryDescriptor()->release();
+        #endif
         m_map->unmap();
         m_map->release();
     }

src/MacMSRDriver/PcmMsr/PcmMsr.h

@@ -10,16 +10,16 @@ class PcmMsrDriverClassName : public IOService
     OSDeclareDefaultStructors(com_intel_driver_PcmMsr)
 public:
     // IOService methods
-    virtual bool start(IOService* provider);
+    virtual bool start(IOService* provider) override;
 
     virtual IOReturn writeMSR(pcm_msr_data_t* data);
     virtual IOReturn readMSR(pcm_msr_data_t* idata,pcm_msr_data_t* odata);
     virtual IOReturn buildTopology(topologyEntry* odata, uint32_t input_num_cores);
-    virtual bool init(OSDictionary *dict);
-    virtual void free(void);
-    virtual bool handleOpen(IOService* forClient, IOOptionBits opts, void* args);
-    virtual bool handleIsOpen(const IOService* forClient) const;
-    virtual void handleClose(IOService* forClient, IOOptionBits opts);
+    virtual bool init(OSDictionary *dict) override;
+    virtual void free(void) override;
+    virtual bool handleOpen(IOService* forClient, IOOptionBits opts, void* args) override;
+    virtual bool handleIsOpen(const IOService* forClient) const override;
+    virtual void handleClose(IOService* forClient, IOOptionBits opts) override;
 
     virtual uint32_t getNumCores();
 

src/cpucounters.cpp

@@ -1024,6 +1024,8 @@ bool PCM::discoverSystemTopology()
         return false;
     }
 
+    (void) coreMaskWidth; // to supress warnings on MacOS (unused vars)
+
     uint32 l2CacheMaskShift = 0;
 #ifdef PCM_DEBUG_TOPOLOGY
     uint32 threadsSharingL2;
@@ -1044,13 +1046,15 @@ bool PCM::discoverSystemTopology()
               << " [the most significant bit = " << l2CacheMaskShift << "]\n";
 #endif
 
+#ifndef __APPLE__
     auto populateEntry = [&smtMaskWidth, &coreMaskWidth, &l2CacheMaskShift](TopologyEntry & entry, const int apic_id)
     {
         entry.thread_id = smtMaskWidth ? extract_bits_ui(apic_id, 0, smtMaskWidth - 1) : 0;
         entry.core_id = (smtMaskWidth + coreMaskWidth) ? extract_bits_ui(apic_id, smtMaskWidth, smtMaskWidth + coreMaskWidth - 1) : 0;
         entry.socket = extract_bits_ui(apic_id, smtMaskWidth + coreMaskWidth, 31);
         entry.tile_id = extract_bits_ui(apic_id, l2CacheMaskShift, 31);
     };
+#endif
 
     auto populateHybridEntry = [this](TopologyEntry& entry, int core) -> bool
     {
@@ -7466,7 +7470,7 @@ void ServerPCICFGUncore::cleanupMemTest(const ServerPCICFGUncore::MemTestParam &
         munmap(b, memBufferBlockSize);
 #elif defined(_MSC_VER)
         VirtualFree(b, memBufferBlockSize, MEM_RELEASE);
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__APPLE__)
         (void) b;                  // avoid the unused variable warning
         (void) memBufferBlockSize; // avoid the unused variable warning
 #else

src/mmio.cpp

@@ -160,10 +160,9 @@ OwnMMIORange::~OwnMMIORange()
 
 #include "PCIDriverInterface.h"
 
-MMIORange::MMIORange(uint64 physical_address, uint64 size_, bool readonly_) :
+MMIORange::MMIORange(uint64 physical_address, uint64 size_, bool) :
     mmapAddr(NULL),
-    size(size_),
-    readonly(readonly_)
+    size(size_)
 {
     if (size > 4096)
     {

src/mmio.h

@@ -134,10 +134,14 @@ class MMIORange
 
 class MMIORange
 {
+#ifndef __APPLE__
     int32 fd;
+#endif
     char * mmapAddr;
     const uint64 size;
+#ifndef __APPLE__
     const bool readonly;
+#endif
 public:
     MMIORange(uint64 baseAddr_, uint64 size_, bool readonly_ = true);
     uint32 read32(uint64 offset);

tests/daemon_alignment_test.cpp

@@ -14,7 +14,7 @@ void checkAlignment(char const * debugMessage, void* ptr)
 	if(currentAlignment != 0)
 	{
 		printf("Failed\n");
-		printf("Current alignment: %lu\n\n", currentAlignment);
+		printf("Current alignment: %llu\n\n", (unsigned long long)currentAlignment);
 		exit(EXIT_FAILURE);
 	}
 	else