Merge pull request #120 from thewtex/dependabot/github_actions/actions/stale-11

Bump actions/stale from 10 to 11

.github/workflows/expired.yml

@@ -6,7 +6,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v11
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-milestones: 'future,alpha,beta,release'

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
         build_type: [Release, Debug]
     steps:
       - name: "📥 Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
         with:
           submodules: 'recursive'
           fetch-depth: 0

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         arch_name: [linux-arm64, linux-arm64-musl, linux-armv5, linux-armv5-musl, linux-armv6, linux-armv6-musl, linux-armv7, linux-armv7a, linux-armv7l-musl, linux-x64-clang, linux-s390x, linux-x64, linux-x86, linux-mips, linux-ppc64le, manylinux1-x64, manylinux1-x86, manylinux2010-x64, manylinux2010-x86, manylinux2014-x64, manylinux2014-x86, manylinux2014-aarch64, linux-riscv64, linux-riscv32]
     steps:
       - name: "📥 Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
         with:
           submodules: 'recursive'
           fetch-depth: 0
@@ -29,25 +29,26 @@ jobs:
       - name: "🗜️ compress"
         run: cd build-${{ matrix.arch_name }} && find . -maxdepth 1 -name "tmux-mem-cpu-load*" -o -name "*.sha256" | XZ_OPT=-e9 tar -cJf tmux-mem-cpu-load-${{ matrix.arch_name }}.tar.xz -T - && mv tmux-mem-cpu-load-${{ matrix.arch_name }}.tar.xz ..
       - name: "💾 save binaries"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v7
         with:
-          name: bin-artifact
+          name: bin-artifact-${{ matrix.arch_name }}
           path: tmux-mem-cpu-load-${{ matrix.arch_name }}.tar.xz
-          retention-days: 1        
+          retention-days: 1
   release:
     name: release
     runs-on: ubuntu-latest
     needs: build
     steps:
       - name: "📥 Checkout Code"
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
         with:
           submodules: 'recursive'
           fetch-depth: 0
       - name: get artifact
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v8
         with:
-          name: bin-artifact
+          pattern: bin-artifact-*
+          merge-multiple: true
           path: .
       - name: "✅ checksum"
         run: find . -maxdepth 1 -name "*.tar.xz" | xargs sha256sum > checksum_all.sha256
@@ -59,4 +60,4 @@ jobs:
           files: |
             LICENSE
             *.tar.xz
-            *.sha256
+            *.sha256

CMakeLists.txt

@@ -22,7 +22,7 @@ cmake_minimum_required(VERSION 3.5)
 project(tmux-mem-cpu-load)
 set(tmux-mem-cpu-load_VERSION_MAJOR 3)
 set(tmux-mem-cpu-load_VERSION_MINOR 8)
-set(tmux-mem-cpu-load_VERSION_PATCH 0)
+set(tmux-mem-cpu-load_VERSION_PATCH 3)
 #Compute full version string
 set(tmux-mem-cpu-load_VERSION
   ${tmux-mem-cpu-load_VERSION_MAJOR}.${tmux-mem-cpu-load_VERSION_MINOR}.${tmux-mem-cpu-load_VERSION_PATCH})
@@ -121,7 +121,7 @@ if(BUILD_TESTING)
     )
 
   add_test(NAME invalid_graph_lines
-    COMMAND tmux-mem-cpu-load --graph_lines -2
+    COMMAND tmux-mem-cpu-load --graph-lines -2
     )
 
   add_test(NAME old_option_specification

README.rst

@@ -5,9 +5,6 @@
 CPU, RAM, and load monitor for use with tmux_
 ---------------------------------------------
 
-.. image:: https://travis-ci.org/thewtex/tmux-mem-cpu-load.svg
-  :target: https://travis-ci.org/thewtex/tmux-mem-cpu-load
-
 .. image:: https://circleci.com/gh/thewtex/tmux-mem-cpu-load.svg?style=svg
   :target: https://circleci.com/gh/thewtex/tmux-mem-cpu-load
   
@@ -99,6 +96,7 @@ Install with Package Managers
 
 * Gentoo: ``emerge tmux-mem-cpu-load``
 * Homebrew: ``brew install tmux-mem-cpu-load``
+* FreeBSD: ``pkg install tmux-mem-cpu-load``
 
 Build and Install Using Antigen_
 --------------------------------
@@ -122,7 +120,7 @@ Edit ``$HOME/.tmux.conf`` to display the program's output in *status-left* or
 If you installed using tpm, you must specify the full path to the
 ``tmux-mem-cpu-load`` script, like below::
 
-  set -g status-right '#[fg=green]#($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load --colors --powerline-right --interval 2)#[default]'
+  set -g status-right "#[fg=green]#($TMUX_PLUGIN_MANAGER_PATH/tmux-mem-cpu-load/tmux-mem-cpu-load --colors --powerline-right --interval 2)#[default]"
 
 Note that the *interval* argument to `tmux-mem-cpu-load` should be the same number
 of seconds that *status-interval* is set at.

common/cpu.h

@@ -28,12 +28,15 @@
   #define CP_IDLE 2
   #define CP_NICE 3
   #define CP_STATES 4
+#elif defined(__OpenBSD__)
+  #include <sys/sched.h>
+  #define CP_STATES CPUSTATES
 #else
   #define CP_USER   0
   #define CP_NICE   1
   #define CP_SYS    2
 
-  #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+  #if defined(__FreeBSD__) || defined(__NetBSD__)
     // *BSD or OSX
     #define CP_INTR   3
     #define CP_IDLE   4

common/load.cc

@@ -42,8 +42,6 @@ std::string load_string( bool use_colors,
   std::ostringstream ss;
   ss.setf( std::ios::fixed, std::ios::floatfield );
   ss.precision( 2 );
-  double averages[num_averages];
-  // based on: opensource.apple.com/source/Libc/Libc-262/gen/getloadavg.c
 
   if( num_averages <= 0 || num_averages > 3)
   {
@@ -51,6 +49,9 @@ std::string load_string( bool use_colors,
     return ss.str();
   }
 
+  double averages[3];
+  // based on: opensource.apple.com/source/Libc/Libc-262/gen/getloadavg.c
+
   if( getloadavg( averages, num_averages ) < 0 )
   {
     ss << " 0.00 0.00 0.00"; // couldn't get averages.

common/powerline.cc

@@ -74,6 +74,8 @@ void powerline_char( std::ostringstream & oss, const char dynamic_color[],
   sprintf(write_color, "%d", static_color);
   switch( direction )
   {
+    case NONE:
+    break;
     case POWERLINE_LEFT:
       if ( eol )
       {

linux/memory.cc

@@ -66,21 +66,21 @@ void mem_status( MemoryStatus & status )
     if( substr.compare( "MemTotal" ) == 0 )
     {
       // get total memory
-      total_mem = stoi( line.substr( substr_start, substr_len ) );
+      total_mem = stol( line.substr( substr_start, substr_len ) );
     }
     else if( substr.compare( "MemFree" ) == 0 )
     {
-      used_mem = total_mem - stoi( line.substr( substr_start, substr_len ) );
+      used_mem = total_mem - stol( line.substr( substr_start, substr_len ) );
     }
     else if( substr.compare( "Shmem" ) == 0 )
     {
-      used_mem += stoi( line.substr( substr_start, substr_len ) );
+      used_mem += stol( line.substr( substr_start, substr_len ) );
     }
     else if( substr.compare( "Buffers" ) == 0 ||
              substr.compare( "Cached" ) == 0  ||
              substr.compare( "SReclaimable" ) == 0 )
     {
-      used_mem -= stoi( line.substr( substr_start, substr_len ) );
+      used_mem -= stol( line.substr( substr_start, substr_len ) );
     }
   }
 

openbsd/cpu.cc

@@ -24,7 +24,7 @@
 #include "error.h"
 #include "cpu.h"
 
-uint8_t get_cpu_count()
+uint32_t get_cpu_count()
 {
   int cpu_count = 1; // default to 1
   int mib[2] = { CTL_HW, HW_NCPUONLINE };
@@ -35,7 +35,7 @@ uint8_t get_cpu_count()
     error( "sysctl: error getting cpu count" );
   }
 
-  return cpu_count;
+  return static_cast<uint32_t>( cpu_count );
 }
 
 float cpu_percentage( unsigned int cpu_usage_delay )
@@ -55,6 +55,8 @@ float cpu_percentage( unsigned int cpu_usage_delay )
 
   usleep( cpu_usage_delay );
 
+  size = sizeof( load2 );
+
   // update cpu times
   if( sysctl( cpu_ctl, 2, &load2, &size, NULL, 0 ) < 0 )
   {

osx/memory.cc

@@ -28,14 +28,16 @@ void mem_status( MemoryStatus & status )
 {
   // These values are in bytes
   u_int64_t total_mem;
-  float used_mem;
+  // float app_mem = 0.0f;
+  // float cached_file_mem = 0.0f;
+  float available_mem = 0.0f;
   float percentage_mem;
   float free_mem;
   float free_mem_in_gigabytes; // used to check if free mem < 1 GB
   //u_int64_t unused_mem;
 
   vm_size_t page_size;
-  vm_statistics_data_t vm_stats;
+  vm_statistics64_data_t vm_stats; // Use 64-bit VM statistics
 
   // Get total physical memory
   int mib[] = { CTL_HW, HW_MEMSIZE };
@@ -43,18 +45,21 @@ void mem_status( MemoryStatus & status )
   sysctl( mib, 2, &total_mem, &length, NULL, 0 );
 
   mach_port_t mach_port = mach_host_self();
-  mach_msg_type_number_t count = sizeof( vm_stats ) / sizeof( natural_t );
+
+  // Use HOST_VM_INFO64_COUNT as the count for vm_statistics64_data_t
+  mach_msg_type_number_t count = HOST_VM_INFO64_COUNT;
+
   if( KERN_SUCCESS == host_page_size( mach_port, &page_size ) &&
-      KERN_SUCCESS == host_statistics( mach_port, HOST_VM_INFO,
+      KERN_SUCCESS == host_statistics64( mach_port, HOST_VM_INFO64,
         ( host_info_t )&vm_stats, &count )
     )
   {
     //unused_mem = static_cast<u_int64_t>( vm_stats.free_count * page_size );
-
-    used_mem = static_cast<float>(
-        ( vm_stats.active_count + vm_stats.wire_count ) * page_size);
+    // app_mem = static_cast<float>(( vm_stats.internal_page_count - vm_stats.purgeable_count ) * page_size );
+    // cached_file_mem = static_cast<float>(( vm_stats.purgeable_count + vm_stats.external_page_count ) * page_size );
+    available_mem = static_cast<float>(( vm_stats.free_count + vm_stats.external_page_count - vm_stats.speculative_count ) * page_size );
   }
 
-  status.used_mem = convert_unit(static_cast< float >( used_mem ), MEGABYTES );
+  status.used_mem = convert_unit(static_cast< float >(total_mem - available_mem ), MEGABYTES );
   status.total_mem = convert_unit(static_cast< float >( total_mem ), MEGABYTES );
 }

tmux-mem-cpu-load.plugin.tmux

@@ -35,7 +35,7 @@ if [ ! -f $CURRENT_DIR/tmux-mem-cpu-load ] && ! $(builtin type -P "tmux-mem-cpu-
       exit 1
    fi
 
-   if output=$(make 2>&1); then 
+   if output=$(cmake --build . 2>&1); then 
       tmux run-shell "echo \"tmux-mem-cpu-load built successfully.
       \""
    else