windows: Initial addition

This commit is contained in:
Matt McCormick 2018-04-23 21:47:03 -04:00
parent 3fad77c3ac
commit 7cf58a8367
6 changed files with 149 additions and 4 deletions

@ -64,14 +64,17 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
message(STATUS "FreeBSD detected") message(STATUS "FreeBSD detected")
set(METER_SOURCES "freebsd/memory.cc" "freebsd/cpu.cc" "common/load.cc") set(METER_SOURCES "freebsd/memory.cc" "freebsd/cpu.cc" "common/load.cc")
elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") elseif(CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# OpenBSD Stuff Here
message(STATUS "OpenBSD detected") message(STATUS "OpenBSD detected")
set(METER_SOURCES "openbsd/memory.cc" "openbsd/cpu.cc" "common/load.cc") set(METER_SOURCES "openbsd/memory.cc" "openbsd/cpu.cc" "common/load.cc")
if(CMAKE_SYSTEM_VERSION VERSION_LESS 5.7) if(CMAKE_SYSTEM_VERSION VERSION_LESS 5.7)
add_definitions(-DOPENBSD_WORKAROUND=1) add_definitions(-DOPENBSD_WORKAROUND=1)
endif() endif()
elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD") elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
message(STATUS "NetBSD detected")
set(METER_SOURCES "netbsd/memory.cc" "netbsd/cpu.cc" "common/load.cc") set(METER_SOURCES "netbsd/memory.cc" "netbsd/cpu.cc" "common/load.cc")
elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
message(STATUS "Windows detected")
set(METER_SOURCES "windows/memory.cc" "windows/cpu.cc" "windows/load.cc")
else() else()
message(FATAL_ERROR "${CMAKE_SYSTEM_NAME} Cannot be compiled on this system") message(FATAL_ERROR "${CMAKE_SYSTEM_NAME} Cannot be compiled on this system")
message(FATAL_ERROR "Cannot be compiled on this system") message(FATAL_ERROR "Cannot be compiled on this system")
@ -82,8 +85,11 @@ set(COMMON_SOURCES "common/main.cc" "common/memory.cc" "common/graph.cc" "common
add_executable(tmux-mem-cpu-load ${COMMON_SOURCES} ${METER_SOURCES}) add_executable(tmux-mem-cpu-load ${COMMON_SOURCES} ${METER_SOURCES})
# add binary tree so we find version.h # add binary tree so we find version.h
target_include_directories(tmux-mem-cpu-load "${PROJECT_BINARY_DIR}") target_include_directories(tmux-mem-cpu-load PUBLIC "${PROJECT_BINARY_DIR}")
target_include_directories(tmux-mem-cpu-load "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/common") target_include_directories(tmux-mem-cpu-load PUBLIC "${PROJECT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/common")
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
target_link_libraries(tmux-mem-cpu-load Pdh)
endif()
install(TARGETS tmux-mem-cpu-load RUNTIME DESTINATION bin) install(TARGETS tmux-mem-cpu-load RUNTIME DESTINATION bin)
include(CTest) include(CTest)

@ -247,6 +247,8 @@ int main( int argc, char** argv )
<< cpu_string( cpu_mode, cpu_usage_delay, graph_lines, use_colors, use_powerline_left, use_powerline_right ) << cpu_string( cpu_mode, cpu_usage_delay, graph_lines, use_colors, use_powerline_left, use_powerline_right )
<< load_string( use_colors, use_powerline_left, use_powerline_right, averages_count ); << load_string( use_colors, use_powerline_left, use_powerline_right, averages_count );
std::cout << std::endl;
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }

@ -28,7 +28,7 @@
const char * bg2fg( const char s[] ) const char * bg2fg( const char s[] )
{ {
static char buf[40] = {0}; static char buf[40] = {0};
const char *substr = index(s, ','); const char *substr = strchr(s, ',');
buf[0] = '#'; buf[0] = '#';
buf[1] = '['; buf[1] = '[';
buf[2] = 'f'; buf[2] = 'f';

53
windows/cpu.cc Normal file

@ -0,0 +1,53 @@
/* 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 <string>
#include <fstream>
#include <unistd.h> // usleep
#include <thread>
#include "TCHAR.h"
#include "pdh.h"
static PDH_HQUERY cpuQuery;
static PDH_HCOUNTER cpuTotal;
#include "cpu.h"
#include "luts.h"
uint8_t get_cpu_count()
{
return static_cast< uint8_t >( std::thread::hardware_concurrency() );
}
float cpu_percentage( unsigned cpu_usage_delay )
{
PdhOpenQuery(NULL, 0, &cpuQuery);
PdhAddCounter(cpuQuery, "\\Processor(_Total)\\% Processor Time", 0, &cpuTotal);
PdhCollectQueryData(cpuQuery);
usleep( cpu_usage_delay );
PDH_FMT_COUNTERVALUE counterVal;
PdhCollectQueryData(cpuQuery);
PdhGetFormattedCounterValue(cpuTotal, PDH_FMT_DOUBLE, NULL, &counterVal);
return static_cast< float >( counterVal.doubleValue );
}

44
windows/load.cc Normal file

@ -0,0 +1,44 @@
/* 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
* Copyright 2016 Compilenix
*
* 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 <sstream>
#include <string>
#include <cmath> // floorf()
#include <sys/types.h>
#include "cpu.h"
#include "load.h"
#include "luts.h"
#include "powerline.h"
// Load Averages
std::string load_string( bool use_colors,
bool use_powerline_left, bool use_powerline_right,
short num_averages )
{
// Not implemented
std::ostringstream ss;
ss << (char) 0;
return ss.str();
}

40
windows/memory.cc Normal file

@ -0,0 +1,40 @@
/* 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 <fstream>
#include "windows.h"
#include "memory.h"
#include "conversions.h"
void mem_status( MemoryStatus & status )
{
MEMORYSTATUSEX memory_status;
memory_status.dwLength = sizeof(memory_status);
GlobalMemoryStatusEx(&memory_status);
// we want megabytes on output, but since the values already come as
// kilobytes we need to divide them by 1024 only once, thus we use
// KILOBYTES
status.used_mem = convert_unit(static_cast< float >( memory_status.ullAvailPhys ), MEGABYTES, BYTES);
status.total_mem = convert_unit(static_cast< float >( memory_status.ullTotalPhys ), MEGABYTES, BYTES);
}