diff options
Diffstat (limited to 'dragonflybsd/Platform.c')
-rw-r--r-- | dragonflybsd/Platform.c | 69 |
1 files changed, 35 insertions, 34 deletions
diff --git a/dragonflybsd/Platform.c b/dragonflybsd/Platform.c index 8ce216c..62a1fb6 100644 --- a/dragonflybsd/Platform.c +++ b/dragonflybsd/Platform.c @@ -6,29 +6,31 @@ Released under the GNU GPLv2, see the COPYING file in the source distribution for its full text. */ -#include "Platform.h" -#include "Macros.h" -#include "Meter.h" +#include "dragonflybsd/Platform.h" + +#include <math.h> +#include <time.h> +#include <sys/resource.h> +#include <sys/sysctl.h> +#include <sys/time.h> +#include <sys/types.h> +#include <vm/vm_param.h> + +#include "ClockMeter.h" #include "CPUMeter.h" +#include "DateMeter.h" +#include "DateTimeMeter.h" +#include "HostnameMeter.h" +#include "LoadAverageMeter.h" #include "MemoryMeter.h" +#include "MemorySwapMeter.h" +#include "ProcessList.h" #include "SwapMeter.h" +#include "SysArchMeter.h" #include "TasksMeter.h" -#include "LoadAverageMeter.h" #include "UptimeMeter.h" -#include "ClockMeter.h" -#include "DateMeter.h" -#include "DateTimeMeter.h" -#include "HostnameMeter.h" -#include "DragonFlyBSDProcess.h" -#include "DragonFlyBSDProcessList.h" - -#include <sys/types.h> -#include <sys/sysctl.h> -#include <sys/time.h> -#include <sys/resource.h> -#include <vm/vm_param.h> -#include <time.h> -#include <math.h> +#include "dragonflybsd/DragonFlyBSDProcess.h" +#include "dragonflybsd/DragonFlyBSDProcessList.h" const ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; @@ -80,11 +82,13 @@ const MeterClass* const Platform_meterTypes[] = { &LoadAverageMeter_class, &LoadMeter_class, &MemoryMeter_class, + &MemorySwapMeter_class, &SwapMeter_class, &TasksMeter_class, &UptimeMeter_class, &BatteryMeter_class, &HostnameMeter_class, + &SysArchMeter_class, &AllCPUsMeter_class, &AllCPUs2Meter_class, &AllCPUs4Meter_class, @@ -155,9 +159,9 @@ int Platform_getMaxPid() { return maxPid; } -double Platform_setCPUValues(Meter* this, int cpu) { +double Platform_setCPUValues(Meter* this, unsigned int cpu) { const DragonFlyBSDProcessList* fpl = (const DragonFlyBSDProcessList*) this->pl; - int cpus = this->pl->cpuCount; + unsigned int cpus = this->pl->activeCPUs; const CPUData* cpuData; if (cpus == 1) { @@ -198,13 +202,16 @@ void Platform_setMemoryValues(Meter* this) { this->total = pl->totalMem; this->values[0] = pl->usedMem; this->values[1] = pl->buffersMem; - this->values[2] = pl->cachedMem; + // this->values[2] = "shared memory, like tmpfs and shm" + this->values[3] = pl->cachedMem; + // this->values[4] = "available memory" } void Platform_setSwapValues(Meter* this) { const ProcessList* pl = this->pl; this->total = pl->totalSwap; this->values[0] = pl->usedSwap; + this->values[1] = NAN; } char* Platform_getProcessEnv(pid_t pid) { @@ -214,14 +221,14 @@ char* Platform_getProcessEnv(pid_t pid) { } char* Platform_getInodeFilename(pid_t pid, ino_t inode) { - (void)pid; - (void)inode; - return NULL; + (void)pid; + (void)inode; + return NULL; } FileLocks_ProcessData* Platform_getProcessLocks(pid_t pid) { - (void)pid; - return NULL; + (void)pid; + return NULL; } bool Platform_getDiskIO(DiskIOData* data) { @@ -230,15 +237,9 @@ bool Platform_getDiskIO(DiskIOData* data) { return false; } -bool Platform_getNetworkIO(unsigned long int* bytesReceived, - unsigned long int* packetsReceived, - unsigned long int* bytesTransmitted, - unsigned long int* packetsTransmitted) { +bool Platform_getNetworkIO(NetworkIOData* data) { // TODO - *bytesReceived = 0; - *packetsReceived = 0; - *bytesTransmitted = 0; - *packetsTransmitted = 0; + (void)data; return false; } |