Merge pull request #146 from intel-innersource/rdementi/opcm-merge-2022-01-24-1

Rdementi/opcm merge 2022 01 24 1

Author: rdementi

.cirrus.yml

@@ -2,7 +2,7 @@ freebsd_instance:
   image_family: freebsd-12-1
 
 task:
-  install_script: pkg install -y gmake
+  install_script: pkg install -y gmake cmake
   script:
     - cmake -B build -DCMAKE_INSTALL_PREFIX=.
     - cd build && gmake install

.github/workflows/linux_make.yml

@@ -14,11 +14,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: cmake
-      run:
+      run: |
         rm -rf ${{ github.workspace }}/build
         cmake -B ${{ github.workspace }}/build -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}
     - name: make
-      run:
+      run: |
         cd ${{ github.workspace }}/build
         make install -j
 

.github/workflows/macosx_build.yml

@@ -20,4 +20,4 @@ jobs:
     - name: make
       run: |
         cd ${{ github.workspace }}/build
-        make install
+        sudo make install

appveyor.yml

@@ -6,17 +6,16 @@ configuration: Release
 platform: x64
 before_build:
 - cmd: >-
-    echo ------------------------
+    cmake --version
 
-    echo       Building PCM
+    cmake -B build
+
+
+build_script:
+- cmake --build build --config Release --parallel
 
-    echo ------------------------
-build:
-  project: pcm-all.sln
-  parallel: true
-  verbosity: minimal
 after_build:
-- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\x64\Release\*.exe %APPVEYOR_BUILD_FOLDER%\x64\Release\*.dll %APPVEYOR_BUILD_FOLDER%\x64\Release\*.lib %APPVEYOR_BUILD_FOLDER%\x64\Release\*.exp
+- cmd: 7z a pcm-all.zip %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Release\*.dll %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.lib %APPVEYOR_BUILD_FOLDER%\build\src\Release\*.exp
 artifacts:
 - path: pcm-all.zip
   name: pcm-all

doc/DOCKER_README.md

@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
-How To Run Processor Counter Monitor Server Container from Docker Hub
+How To Run Processor Counter Monitor Server Container from GitHub Container Repository or Docker Hub
 --------------------------------------------------------------------------------
 
 As root user:

pcm.spec

@@ -25,7 +25,7 @@ Processor Counter Monitor (PCM) is an application programming interface (API) an
 %build
 mkdir build
 cd build
-cmake -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/%{_bindir}/.. -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
+cmake -DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT/ -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 make -j 
 
 %install
@@ -64,7 +64,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pcm/
 
 %changelog
-* Tue Jun 04 2022 - [email protected]
+* Tue Jan 04 2022 - [email protected]
         Add cmake adaptation
 * Fri Dec 17 2021 - [email protected]
         Move licence.txt Linix_HOWTO.txt to doc folder
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Apr 01 2020 - [email protected]
         Add pcm-sensor-server under %files
 * Mon Nov 25 2019 - [email protected]
-        call make install and use %{_sbindir} or %{_bindir}
+        call make install and use _sbindir or _bindir
 * Mon Oct 21 2019 - [email protected]
 	add opCode file to /usr/share/pcm
 	use "install" to copy pcm-bw-histogram.sh

src/CMakeLists.txt

@@ -145,7 +145,8 @@ if(UNIX) # APPLE, LINUX, FREE_BSD
 
     # Install extra files
     install(FILES pcm-bw-histogram.sh
-            DESTINATION "sbin/pcm-bw-histogram"
+            DESTINATION "sbin"
+            RENAME pcm-bw-histogram
             PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
     file(GLOB OPCODE_FILES "opCode*.txt")
     foreach(opcode_file ${OPCODE_FILES})

src/cpucounters.cpp

@@ -232,10 +232,12 @@ class TemporalThreadAffinity  // speedup trick for Linux, FreeBSD, DragonFlyBSD,
         cpu_set_t new_affinity;
         CPU_ZERO(&new_affinity);
         CPU_SET(core_id, &new_affinity);
-        if (CPU_EQUAL(&old_affinity, &new_affinity))
+/* TODO: use CPU_CMP
+	if (CPU_EQUAL(&old_affinity, &new_affinity))
         {
             return;
         }
+*/
         res = pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &new_affinity);
         if (res != 0 && checkStatus)
         {