From e9d65f29636dd958359aa0f50b12c8687c455b19 Mon Sep 17 00:00:00 2001 From: Herman Semenov Date: Wed, 12 Mar 2025 05:21:52 +0300 Subject: [PATCH] Align stuctures for 64-bit platforms - extraparam 120 -> 112 bytes - vertval 136 -> 128 bytes - pridef 48 -> 40 bytes - syscap 64 -> 56 bytes --- atopsar.c | 4 ++-- drawbar.c | 2 +- showgeneric.h | 2 +- showlinux.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/atopsar.c b/atopsar.c index a3dd121..8d32090 100644 --- a/atopsar.c +++ b/atopsar.c @@ -82,9 +82,9 @@ static char *datemsg = "-------------------------- analysis " /* ** structure definition for print-functions */ -struct pridef { - char wanted; /* selected option (boolean) */ +struct pridef { char *cntcat; /* used categories of counters */ + char wanted; /* selected option (boolean) */ char flag; /* flag on command line */ void (*prihead)(int, int, int); /* print header of list */ int (*priline)(struct sstat *, struct tstat *, struct tstat **, diff --git a/drawbar.c b/drawbar.c index 0ab3b40..82bd7df 100644 --- a/drawbar.c +++ b/drawbar.c @@ -162,8 +162,8 @@ static WINDOW *headwin, *midline, *colupper, *collower; #define MAXHEIGHT 25 // maximum bar height in lines struct vertval { - int barval; // total value of bar char *barlab; // bar label + int barval; // total value of bar char basecolor; // bar color or fill color char barmap[MAXHEIGHT]; // color map diff --git a/showgeneric.h b/showgeneric.h index a3ed1bb..d2afcb8 100644 --- a/showgeneric.h +++ b/showgeneric.h @@ -35,11 +35,11 @@ struct syscap { - int nrcpu; count_t availcpu; count_t availmem; count_t availdsk; count_t availnet; + int nrcpu; int nrgpu; count_t availgpumem; // GPU memory in Kb! int nrmemnuma; diff --git a/showlinux.h b/showlinux.h index e082c72..d17ab97 100644 --- a/showlinux.h +++ b/showlinux.h @@ -50,11 +50,11 @@ typedef struct { int noverflow; int avgval; int nsecs; + int index; count_t mstot; count_t iotot; - struct perdsk *perdsk; - int index; count_t cputot; + struct perdsk *perdsk; count_t pernumacputot; count_t percputot; } extraparam;