zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor code clean up and corrections.

This commit is contained in:
fraggerfox 2021-04-09 08:24:02 +05:30 committed by BenBE
parent db98623684
commit 440bb87058
2 changed files with 2 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
netbsd/Platform.c
View File

@ -1,5 +1,5 @@
/* /*
htop - openbsd/Platform.c htop - netbsd/Platform.c
(C) 2014 Hisham H. Muhammad (C) 2014 Hisham H. Muhammad
(C) 2021 Santhosh Raju (C) 2021 Santhosh Raju
Released under the GNU GPLv2, see the COPYING file Released under the GNU GPLv2, see the COPYING file
@ -16,11 +16,9 @@ in the source distribution for its full text.
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include <sys/resource.h> #include <sys/resource.h>
//#include <sys/sensors.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>
//#include <uvm/uvmexp.h>
#include "CPUMeter.h" #include "CPUMeter.h"
#include "ClockMeter.h" #include "ClockMeter.h"
@ -319,62 +317,8 @@ bool Platform_getNetworkIO(NetworkIOData* data) {
return false; return false;
} }
//static bool findDevice(const char* name, int* mib, struct sensordev* snsrdev, size_t* sdlen) {
// for (int devn = 0;; devn++) {
// mib[2] = devn;
// if (sysctl(mib, 3, snsrdev, sdlen, NULL, 0) == -1) {
// if (errno == ENXIO)
// continue;
// if (errno == ENOENT)
// return false;
// }
// if (String_eq(name, snsrdev->xname)) {
// return true;
// }
// }
//}
void Platform_getBattery(double* percent, ACPresence* isOnAC) { void Platform_getBattery(double* percent, ACPresence* isOnAC) {
// TODO // TODO
(void)percent; (void)percent;
(void)isOnAC; (void)isOnAC;
// int mib[] = {CTL_HW, HW_SENSORS, 0, 0, 0};
// struct sensor s;
// size_t slen = sizeof(struct sensor);
// struct sensordev snsrdev;
// size_t sdlen = sizeof(struct sensordev);
//
// bool found = findDevice("acpibat0", mib, &snsrdev, &sdlen);
//
// *percent = NAN;
// if (found) {
// /* last full capacity */
// mib[3] = 7;
// mib[4] = 0;
// double last_full_capacity = 0;
// if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1)
// last_full_capacity = s.value;
// if (last_full_capacity > 0) {
// /* remaining capacity */
// mib[3] = 7;
// mib[4] = 3;
// if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1) {
// double charge = s.value;
// *percent = 100 * (charge / last_full_capacity);
// if (charge >= last_full_capacity) {
// *percent = 100;
// }
// }
// }
// }
//
// found = findDevice("acpiac0", mib, &snsrdev, &sdlen);
//
// *isOnAC = AC_ERROR;
// if (found) {
// mib[3] = 9;
// mib[4] = 0;
// if (sysctl(mib, 5, &s, &slen, NULL, 0) != -1)
// *isOnAC = s.value;
// }
} }

2
netbsd/ProcessField.h
View File

@ -1,7 +1,7 @@
#ifndef HEADER_NetBSDProcessField #ifndef HEADER_NetBSDProcessField
#define HEADER_NetBSDProcessField #define HEADER_NetBSDProcessField
/* /*
htop - openbsd/ProcessField.h htop - netbsd/ProcessField.h
(C) 2020 htop dev team (C) 2020 htop dev team
Released under the GNU GPLv2, see the COPYING file Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.