NetBSD port.
NetBSD port shares with FreeBSD: - load_string() - getsysctl() With OpenBSD: - error()
This commit is contained in:
parent
91594b7a5a
commit
1512a0bda0
@ -73,6 +73,8 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
|
||||
if(CMAKE_SYSTEM_VERSION VERSION_LESS 5.7)
|
||||
add_definitions(-DOPENBSD_WORKAROUND=1)
|
||||
endif()
|
||||
elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
|
||||
set(METER_SOURCES "netbsd/memory.cc" "netbsd/cpu.cc" "freebsd/load.cc")
|
||||
else()
|
||||
message(FATAL_ERROR "Cannot be compiled on this system")
|
||||
endif()
|
||||
|
@ -23,6 +23,7 @@
|
||||
#include <sys/errno.h>
|
||||
#include <cerrno>
|
||||
#include <cstring> // strerror
|
||||
#include <cstdlib> // exit()
|
||||
|
||||
inline void error( const char * error )
|
||||
{
|
||||
@ -30,7 +31,7 @@ inline void error( const char * error )
|
||||
using std::endl;
|
||||
|
||||
cerr << error << ": " << strerror( errno ) << endl;
|
||||
exit( 23 );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
#endif
|
@ -40,11 +40,15 @@
|
||||
#include "freebsd/cpu.h"
|
||||
#include "freebsd/load.h"
|
||||
#include "freebsd/memory.h"
|
||||
#elif defined(__OpenBSD)
|
||||
#elif defined(__OpenBSD__)
|
||||
#define BSD_BASED 1
|
||||
#include "freebsd/cpu.h"
|
||||
#include "freebsd/load.h"
|
||||
#include "freebsd/memory.h"
|
||||
#elif defined(__NetBSD__)
|
||||
#include "freebsd/cpu.h"
|
||||
#include "freebsd/load.h"
|
||||
#include "netbsd/memory.h"
|
||||
#else
|
||||
// assume linux system
|
||||
#include "linux/cpu.h"
|
||||
|
@ -26,6 +26,8 @@
|
||||
#include <cerrno>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/types.h>
|
||||
#include <cstdlib> //exit()
|
||||
#include <string.h> //strerror()
|
||||
|
||||
#define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var))
|
||||
static inline void getsysctl( const char *name, void *ptr, size_t len )
|
||||
@ -36,7 +38,7 @@ static inline void getsysctl( const char *name, void *ptr, size_t len )
|
||||
{
|
||||
std::cerr << "sysctl(" << name << "...) failed: " << strerror( errno )
|
||||
<< std::endl;
|
||||
exit( 23 );
|
||||
exit( EXIT_FAILURE );
|
||||
}
|
||||
|
||||
if( nlen != len )
|
||||
|
57
netbsd/cpu.cc
Normal file
57
netbsd/cpu.cc
Normal file
@ -0,0 +1,57 @@
|
||||
/* 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
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h> // usleep
|
||||
|
||||
#include "../freebsd/getsysctl.h"
|
||||
#include "cpu.h"
|
||||
|
||||
float cpu_percentage( unsigned int cpu_usage_delay )
|
||||
{
|
||||
u_int64_t load1[CPUSTATES];
|
||||
u_int64_t load2[CPUSTATES];
|
||||
|
||||
GETSYSCTL( "kern.cp_time", load1 );
|
||||
usleep( cpu_usage_delay );
|
||||
GETSYSCTL( "kern.cp_time", load2 );
|
||||
|
||||
// Current load times
|
||||
unsigned long long current_user = load1[CP_USER];
|
||||
unsigned long long current_system = load1[CP_SYS];
|
||||
unsigned long long current_nice = load1[CP_NICE];
|
||||
unsigned long long current_idle = load1[CP_IDLE];
|
||||
// Next load times
|
||||
unsigned long long next_user = load2[CP_USER];
|
||||
unsigned long long next_system = load2[CP_SYS];
|
||||
unsigned long long next_nice = load2[CP_NICE];
|
||||
unsigned long long next_idle = load2[CP_IDLE];
|
||||
// Difference between the two
|
||||
unsigned long long diff_user = next_user - current_user;
|
||||
unsigned long long diff_system = next_system - current_system;
|
||||
unsigned long long diff_nice = next_nice - current_nice;
|
||||
unsigned long long diff_idle = next_idle - current_idle;
|
||||
|
||||
return static_cast<float>( diff_user + diff_system + diff_nice ) /
|
||||
static_cast<float>( diff_user + diff_system + diff_nice + diff_idle ) *
|
||||
100.0;
|
||||
}
|
31
netbsd/cpu.h
Normal file
31
netbsd/cpu.h
Normal file
@ -0,0 +1,31 @@
|
||||
/* vim: tabstop=2 shiftwidth=2 expandtab textwidth=80 linebreak wrap
|
||||
*
|
||||
* Copyright 2012 Matthew McCormick
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#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
|
64
netbsd/memory.cc
Normal file
64
netbsd/memory.cc
Normal file
@ -0,0 +1,64 @@
|
||||
/* vim: tabstop=2 shiftwidth=2 expandtab textwidth=80 linebreak wrap
|
||||
*
|
||||
* Copyright 2012 Matthew McCormick
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <uvm/uvm_extern.h> // uvmexp struct
|
||||
|
||||
#include "error.h"
|
||||
#include "luts.h"
|
||||
#include "conversions.h"
|
||||
#include "memory.h"
|
||||
|
||||
std::string mem_string( bool use_colors = false )
|
||||
{
|
||||
std::ostringstream oss;
|
||||
|
||||
// get vm memory stats
|
||||
static int vm_totalmem[] = { CTL_VM, VM_UVMEXP2 };
|
||||
struct uvmexp_sysctl mem;
|
||||
size_t size = sizeof( mem );
|
||||
if( sysctl( vm_totalmem, 2, &mem, &size, NULL, 0 ) < 0 )
|
||||
{
|
||||
error( "memory: error getting vm memory stats" );
|
||||
}
|
||||
|
||||
int64_t total_mem = ( mem.npages << mem.pageshift );
|
||||
int64_t used_mem =
|
||||
( mem.active + mem.wired - mem.filepages ) << mem.pageshift;
|
||||
|
||||
if( use_colors )
|
||||
{
|
||||
oss << mem_lut[( 100 * used_mem ) / total_mem];
|
||||
}
|
||||
|
||||
// add 1 to used which gets lost somewhere along conversions
|
||||
oss << convert_unit( used_mem, MEGABYTES )
|
||||
<< '/' << convert_unit( total_mem, MEGABYTES ) << "MB";
|
||||
|
||||
if( use_colors )
|
||||
{
|
||||
oss << "#[fg=default,bg=default]";
|
||||
}
|
||||
|
||||
return oss.str();
|
||||
|
||||
}
|
26
netbsd/memory.h
Normal file
26
netbsd/memory.h
Normal file
@ -0,0 +1,26 @@
|
||||
/* vim: tabstop=2 shiftwidth=2 expandtab textwidth=80 linebreak wrap
|
||||
*
|
||||
* Copyright 2012 Matthew McCormick
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef MEMORY_H_
|
||||
#define MEMORY_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
std::string mem_string( bool );
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user