FreeBSD and OpenBSD ports

- Removed OpenBSD stuff from freebsd port
- Renamed bsd folder to freebsd since now it contains only
  freebsd-relevant files.
- Changed CMake instructions to account for bsd port changes
- modified main source file to account for openbsd port

CMakeLists.txt

@@ -68,13 +68,12 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
   # FreeBSD STUFF HERE
   message("FreeBSD detected")
   message( WARNING "FreeBSD is still experimental!" )
-  set( METER_SOURCES "bsd/memory_freebsd.cc" "bsd/cpu.cc" "bsd/load.cc" )
+  set( METER_SOURCES "freebsd/memory.cc" "freebsd/cpu.cc" "freebsd/load.cc" )
 elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
   # OpenBSD Stuff Here
   message( "OpenBSD detected")
-  message( FATAL_ERROR "OpenBSD is not supported! See bsd/openBSD.txt for more
-  info" )
-  set( METER_SOURCES "bsd/memory_openbsd.cc" "bsd/cpu.cc" "bsd/load.cc" )
+  message( WARNING "OpenBSD is still experimental!" )
+  set( METER_SOURCES "openbsd/memory.cc" "openbsd/cpu.cc" "openbsd/load.cc" )
 else()
   message( FATAL_ERROR "Cannot be compiled on this system" )
 endif()

bsd/memory_openbsd.cc

@@ -1,78 +0,0 @@
-/* vim: tabstop=2 shiftwidth=2 expandtab textwidth=80 linebreak wrap
- *
- * Copyright 2012 Matthew McCormick
- * Copyright 2013 Justin Crawford <Justasic@gmail.com>
- * Copyright 2015 Pawel 'l0ner' Soltys
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Based on: github.com/freebsd/freebsd/blob/master/usr.bin/top/machine.c
-// Based on: Apple.cpp for load_string/mem_string and apple's documentation
-
-#error ToDo: OpenBSD. This file is incomplete and likely will not compile if you remove this error (it is here to tell you it's unfinished)
-
-#include <sstream>
-#include <string>
-#include <sys/types.h>
-
-#include "getsysctl.h"
-#include "memory.h"
-#include "../luts.h"
-#include "../conversions.h"
-
-std::string mem_string( bool use_colors = false )
-{
-  // These values are in bytes
-  int64_t total_mem = 0;
-  int64_t used_mem = 0;
-  int64_t unused_mem = 0;
-  int32_t inactive_mem = 0;
-  int32_t active_mem = 0;
-  int32_t free_mem = 0;
-  int32_t wired_mem = 0;
-  int32_t page_size = 0;
-  int32_t cache_mem = 0;
-  std::ostringstream oss;
-
-  // Get total physical memory, page size, and some other needed info
-  GETSYSCTL( "hw.realmem", total_mem );
-  GETSYSCTL( "hw.pagesize", page_size );
-
-  GETSYSCTL( "vm.stats.vm.v_free_count", free_mem );
-  GETSYSCTL( "vm.stats.vm.v_inactive_count", inactive_mem );
-  GETSYSCTL( "vm.stats.vm.v_cache_count", cache_mem );
-  GETSYSCTL( "vm.stats.vm.v_wire_count", wired_mem );
-
-  // Get all memory which can be allocated
-  //unused_mem = (inactive_mem + cache_mem + free_mem) * page_size;
-  used_mem = (
-      static_cast<int64_t>( active_mem ) + static_cast<int64_t>( wired_mem ) + 
-      static_cast<int64_t>( inactive_mem ) ) * static_cast<int64_t>( page_size );
-
-  if( use_colors )
-  {
-    oss << mem_lut[( 100 * used_mem ) / total_mem];
-  }
-
-  oss << convert_unit( used_mem, MEGABYTES ) << '/' 
-    << convert_unit( total_mem, MEGABYTES ) << "MB";
-
-  if( use_colors )
-  {
-    oss << "#[fg=default,bg=default]";
-  }
-
-  return oss.str();
-}
-

freebsd/cpu.h

@@ -19,6 +19,13 @@
 #ifndef CPU_H_
 #define CPU_H_
 
+#define CP_USER   0
+#define CP_NICE   1
+#define CP_SYS    2
+#define CP_INTR   3
+#define CP_IDLE   4
+#define CPUSTATES 5
+
 float cpu_percentage( unsigned );
 
 #endif

freebsd/getsysctl.h

@@ -27,14 +27,6 @@
 #include <sys/sysctl.h>
 #include <sys/types.h>
 
-// CPU percentages stuff
-#define CP_USER   0
-#define CP_NICE   1
-#define CP_SYS    2
-#define CP_INTR   3
-#define CP_IDLE   4
-#define CPUSTATES 5
-
 #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
 static inline void getsysctl( const char *name, void *ptr, size_t len )
 {

openbsd/cpu.cc

@@ -23,7 +23,7 @@
 #include <sys/sysctl.h>
 #include <sys/types.h>
 
-#include "common.h"
+#include "error.h"
 #include "cpu.h"
 
 uint8_t get_cpu_count() 

openbsd/cpu.h

@@ -3,6 +3,13 @@
 
 #include <sys/types.h>
 
+#define CP_USER   0
+#define CP_NICE   1
+#define CP_SYS    2
+#define CP_INTR   3
+#define CP_IDLE   4
+#define CPUSTATES 5
+
 float cpu_percentage(unsigned);
 uint8_t getCpuCount();
 

openbsd/memory.cc

@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <sys/vmmeter.h> // vmtotal struct
 
-#include "common.h"
+#include "error.h"
 #include "memory.h"
 #include "../luts.h"
 

tmux-mem-cpu-load.cpp

@@ -34,12 +34,17 @@
    #include "osx/cpu.h"
    #include "osx/memory.h"
    #include "osx/load.h"
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
    // BSD system
    #define BSD_BASED 1
-   #include "bsd/cpu.h"
-   #include "bsd/load.h"
-   #include "bsd/memory.h"
+   #include "freebsd/cpu.h"
+   #include "freebsd/load.h"
+   #include "freebsd/memory.h"
+#elif defined(__OpenBSD)
+   #define BSD_BASED 1
+   #include "freebsd/cpu.h"
+   #include "freebsd/load.h"
+   #include "freebsd/memory.h"
 #else
    // assume linux system
    #include "linux/cpu.h"