wilderjds
/
htop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some more locations for ARRAYSIZE

Browse Source
main
Benny Baumann 6 years ago committed by cgzones
parent 2970cae543
commit 4a78f4bb92
9 changed files with 18 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      darwin/Platform.c
  2. 3
      dragonflybsd/DragonFlyBSDProcessList.c
  3. 3
      dragonflybsd/Platform.c
  4. 3
      freebsd/FreeBSDProcessList.c
  5. 3
      freebsd/Platform.c
  6. 3
      openbsd/OpenBSDProcessList.c
  7. 3
      openbsd/Platform.c
  8. 3
      solaris/Platform.c
  9. 3
      unsupported/Platform.c

3
darwin/Platform.c
Unescape View File

@ -7,6 +7,7 @@ in the source distribution for its full text.
*/ */
#include "Platform.h" #include "Platform.h"
#include "Macros.h"
#include "CPUMeter.h" #include "CPUMeter.h"
#include "MemoryMeter.h" #include "MemoryMeter.h"
#include "SwapMeter.h" #include "SwapMeter.h"
@ -63,7 +64,7 @@ const SignalItem Platform_signals[] = {
{ .name = "31 SIGUSR2", .number = 31 }, { .name = "31 SIGUSR2", .number = 31 },
}; };
const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
ProcessFieldData Process_fields[] = { ProcessFieldData Process_fields[] = {
[0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, }, [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },

3
dragonflybsd/DragonFlyBSDProcessList.c
Unescape View File

@ -9,6 +9,7 @@ in the source distribution for its full text.
#include "ProcessList.h" #include "ProcessList.h"
#include "DragonFlyBSDProcessList.h" #include "DragonFlyBSDProcessList.h"
#include "DragonFlyBSDProcess.h" #include "DragonFlyBSDProcess.h"
#include "Macros.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -253,7 +254,7 @@ static inline void DragonFlyBSDProcessList_scanMemoryInfo(ProcessList* pl) {
//pl->freeMem *= pageSizeKb; //pl->freeMem *= pageSizeKb;
struct kvm_swap swap[16]; struct kvm_swap swap[16];
int nswap = kvm_getswapinfo(dfpl->kd, swap, sizeof(swap)/sizeof(swap[0]), 0); int nswap = kvm_getswapinfo(dfpl->kd, swap, ARRAYSIZE(swap), 0);
pl->totalSwap = 0; pl->totalSwap = 0;
pl->usedSwap = 0; pl->usedSwap = 0;
for (int i = 0; i < nswap; i++) { for (int i = 0; i < nswap; i++) {

3
dragonflybsd/Platform.c
Unescape View File

@ -7,6 +7,7 @@ in the source distribution for its full text.
*/ */
#include "Platform.h" #include "Platform.h"
#include "Macros.h"
#include "Meter.h" #include "Meter.h"
#include "CPUMeter.h" #include "CPUMeter.h"
#include "MemoryMeter.h" #include "MemoryMeter.h"
@ -71,7 +72,7 @@ const SignalItem Platform_signals[] = {
{ .name = "33 SIGLIBRT", .number = 33 }, { .name = "33 SIGLIBRT", .number = 33 },
}; };
const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
void Platform_setBindings(Htop_Action* keys) { void Platform_setBindings(Htop_Action* keys) {
(void) keys; (void) keys;

3
freebsd/FreeBSDProcessList.c
Unescape View File

@ -11,6 +11,7 @@ in the source distribution for its full text.
#include "FreeBSDProcess.h" #include "FreeBSDProcess.h"
#include "zfs/ZfsArcStats.h" #include "zfs/ZfsArcStats.h"
#include "zfs/openzfs_sysctl.h" #include "zfs/openzfs_sysctl.h"
#include "Macros.h"
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
@ -293,7 +294,7 @@ static inline void FreeBSDProcessList_scanMemoryInfo(ProcessList* pl) {
//pl->freeMem *= pageSizeKb; //pl->freeMem *= pageSizeKb;
struct kvm_swap swap[16]; struct kvm_swap swap[16];
int nswap = kvm_getswapinfo(fpl->kd, swap, sizeof(swap)/sizeof(swap[0]), 0); int nswap = kvm_getswapinfo(fpl->kd, swap, ARRAYSIZE(swap), 0);
pl->totalSwap = 0; pl->totalSwap = 0;
pl->usedSwap = 0; pl->usedSwap = 0;
for (int i = 0; i < nswap; i++) { for (int i = 0; i < nswap; i++) {

3
freebsd/Platform.c
Unescape View File

@ -6,6 +6,7 @@ in the source distribution for its full text.
*/ */
#include "Platform.h" #include "Platform.h"
#include "Macros.h"
#include "Meter.h" #include "Meter.h"
#include "CPUMeter.h" #include "CPUMeter.h"
#include "MemoryMeter.h" #include "MemoryMeter.h"
@ -72,7 +73,7 @@ const SignalItem Platform_signals[] = {
{ .name = "33 SIGLIBRT", .number = 33 }, { .name = "33 SIGLIBRT", .number = 33 },
}; };
const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
void Platform_setBindings(Htop_Action* keys) { void Platform_setBindings(Htop_Action* keys) {
(void) keys; (void) keys;

3
openbsd/OpenBSDProcessList.c
Unescape View File

@ -10,6 +10,7 @@ in the source distribution for its full text.
#include "ProcessList.h" #include "ProcessList.h"
#include "OpenBSDProcessList.h" #include "OpenBSDProcessList.h"
#include "OpenBSDProcess.h" #include "OpenBSDProcess.h"
#include "Macros.h"
#include <err.h> #include <err.h>
#include <errno.h> #include <errno.h>
@ -118,7 +119,7 @@ static inline void OpenBSDProcessList_scanMemoryInfo(ProcessList* pl) {
pl->cachedMem *= PAGE_SIZE_KB; pl->cachedMem *= PAGE_SIZE_KB;
struct kvm_swap swap[16]; struct kvm_swap swap[16];
int nswap = kvm_getswapinfo(opl->kd, swap, sizeof(swap)/sizeof(swap[0]), 0); int nswap = kvm_getswapinfo(opl->kd, swap, ARRAYSIZE(swap), 0);
pl->totalSwap = 0; pl->totalSwap = 0;
pl->usedSwap = 0; pl->usedSwap = 0;
for (int i = 0; i < nswap; i++) { for (int i = 0; i < nswap; i++) {

3
openbsd/Platform.c
Unescape View File

@ -7,6 +7,7 @@ in the source distribution for its full text.
*/ */
#include "Platform.h" #include "Platform.h"
#include "Macros.h"
#include "Meter.h" #include "Meter.h"
#include "CPUMeter.h" #include "CPUMeter.h"
#include "MemoryMeter.h" #include "MemoryMeter.h"
@ -84,7 +85,7 @@ const SignalItem Platform_signals[] = {
{ .name = "32 SIGTHR", .number = 32 }, { .name = "32 SIGTHR", .number = 32 },
}; };
const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
void Platform_setBindings(Htop_Action* keys) { void Platform_setBindings(Htop_Action* keys) {
(void) keys; (void) keys;

3
solaris/Platform.c
Unescape View File

@ -8,6 +8,7 @@ in the source distribution for its full text.
*/ */
#include "Platform.h" #include "Platform.h"
#include "Macros.h"
#include "Meter.h" #include "Meter.h"
#include "CPUMeter.h" #include "CPUMeter.h"
#include "MemoryMeter.h" #include "MemoryMeter.h"
@ -83,7 +84,7 @@ const SignalItem Platform_signals[] = {
{ .name = "41 SIGINFO", .number = 41 }, { .name = "41 SIGINFO", .number = 41 },
}; };
const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
ProcessField Platform_defaultFields[] = { PID, LWPID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; ProcessField Platform_defaultFields[] = { PID, LWPID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };

3
unsupported/Platform.c
Unescape View File

@ -9,6 +9,7 @@ in the source distribution for its full text.
#include <math.h> #include <math.h>
#include "Platform.h" #include "Platform.h"
#include "Macros.h"
#include "CPUMeter.h" #include "CPUMeter.h"
#include "MemoryMeter.h" #include "MemoryMeter.h"
#include "SwapMeter.h" #include "SwapMeter.h"
@ -25,7 +26,7 @@ const SignalItem Platform_signals[] = {
{ .name = " 0 Cancel", .number = 0 }, { .name = " 0 Cancel", .number = 0 },
}; };
const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 }; ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };

Write Preview
Loading…
Cancel
Save