9f27e9d8d9
One ought not to assume that random memory access will always succeed or, when it does, that an obviously bad item enumerator will always be found at that location. Thus, this patch corrects some really poor assumptions associated with the 'xtra_procps_debug.h' header file. [ and it does so in somewhat contorted ways so as to ] [ avoid several darn gcc -Wnonnull warning messages! ] Signed-off-by: Jim Warner <james.warner@comcast.net>
211 lines
6.4 KiB
C
211 lines
6.4 KiB
C
/*
|
|
* libprocps - Library to read proc filesystem
|
|
*
|
|
* Copyright (C) 2016 Jim Warner <james.warner@comcast.net>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef XTRA_PROCPS_DEBUG_H
|
|
#define XTRA_PROCPS_DEBUG_H
|
|
|
|
#include <proc/procps-private.h>
|
|
|
|
|
|
// --- DISKSTATS ------------------------------------------
|
|
#ifdef DISKSTATS_GET
|
|
#undef DISKSTATS_GET
|
|
struct diskstats_result *xtra_diskstats_get (
|
|
struct diskstats_info *info,
|
|
const char *name,
|
|
enum diskstats_item actual_enum,
|
|
const char *typestr,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define DISKSTATS_GET( info, name, actual_enum, type ) ( { \
|
|
struct diskstats_result *r; \
|
|
r = xtra_diskstats_get(info, name, actual_enum , STRINGIFY(type), __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
#ifdef DISKSTATS_VAL
|
|
#undef DISKSTATS_VAL
|
|
struct diskstats_result *xtra_diskstats_val (
|
|
int relative_enum,
|
|
const char *typestr,
|
|
const struct diskstats_stack *stack,
|
|
struct diskstats_info *info,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define DISKSTATS_VAL( relative_enum, type, stack, info ) ( { \
|
|
struct diskstats_result *r; \
|
|
r = xtra_diskstats_val(relative_enum, STRINGIFY(type), stack, info, __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
|
|
// --- MEMINFO --------------------------------------------
|
|
#ifdef MEMINFO_GET
|
|
#undef MEMINFO_GET
|
|
struct meminfo_result *xtra_meminfo_get (
|
|
struct meminfo_info *info,
|
|
enum meminfo_item actual_enum,
|
|
const char *typestr,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define MEMINFO_GET( info, actual_enum, type ) ( { \
|
|
struct meminfo_result *r; \
|
|
r = xtra_meminfo_get(info, actual_enum , STRINGIFY(type), __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
#ifdef MEMINFO_VAL
|
|
#undef MEMINFO_VAL
|
|
struct meminfo_result *xtra_meminfo_val (
|
|
int relative_enum,
|
|
const char *typestr,
|
|
const struct meminfo_stack *stack,
|
|
struct meminfo_info *info,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define MEMINFO_VAL( relative_enum, type, stack, info ) ( { \
|
|
struct meminfo_result *r; \
|
|
r = xtra_meminfo_val(relative_enum, STRINGIFY(type), stack, info, __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
|
|
// --- PIDS -----------------------------------------------
|
|
#ifdef PIDS_VAL
|
|
#undef PIDS_VAL
|
|
struct pids_result *xtra_pids_val (
|
|
int relative_enum,
|
|
const char *typestr,
|
|
const struct pids_stack *stack,
|
|
struct pids_info *info,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define PIDS_VAL( relative_enum, type, stack, info ) ( { \
|
|
struct pids_result *r; \
|
|
r = xtra_pids_val(relative_enum, STRINGIFY(type), stack, info, __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
|
|
// --- SLABINFO -------------------------------------------
|
|
#ifdef SLABINFO_GET
|
|
#undef SLABINFO_GET
|
|
struct slabinfo_result *xtra_slabinfo_get (
|
|
struct slabinfo_info *info,
|
|
enum slabinfo_item actual_enum,
|
|
const char *typestr,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define SLABINFO_GET( info, actual_enum, type ) ( { \
|
|
struct slabinfo_result *r; \
|
|
r = xtra_slabinfo_get(info, actual_enum , STRINGIFY(type), __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
#ifdef SLABINFO_VAL
|
|
#undef SLABINFO_VAL
|
|
struct slabinfo_result *xtra_slabinfo_val (
|
|
int relative_enum,
|
|
const char *typestr,
|
|
const struct slabinfo_stack *stack,
|
|
struct slabinfo_info *info,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define SLABINFO_VAL( relative_enum, type, stack, info ) ( { \
|
|
struct slabinfo_result *r; \
|
|
r = xtra_slabinfo_val(relative_enum, STRINGIFY(type), stack, info, __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
|
|
// --- STAT -----------------------------------------------
|
|
#ifdef STAT_GET
|
|
#undef STAT_GET
|
|
struct stat_result *xtra_stat_get (
|
|
struct stat_info *info,
|
|
enum stat_item actual_enum,
|
|
const char *typestr,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define STAT_GET( info, actual_enum, type ) ( { \
|
|
struct stat_result *r; \
|
|
r = xtra_stat_get(info, actual_enum , STRINGIFY(type), __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
#ifdef STAT_VAL
|
|
#undef STAT_VAL
|
|
struct stat_result *xtra_stat_val (
|
|
int relative_enum,
|
|
const char *typestr,
|
|
const struct stat_stack *stack,
|
|
struct stat_info *info,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define STAT_VAL( relative_enum, type, stack, info ) ( { \
|
|
struct stat_result *r; \
|
|
r = xtra_stat_val(relative_enum, STRINGIFY(type), stack, info, __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
|
|
// --- VMSTAT ---------------------------------------------
|
|
#ifdef VMSTAT_GET
|
|
#undef VMSTAT_GET
|
|
struct vmstat_result *xtra_vmstat_get (
|
|
struct vmstat_info *info,
|
|
enum vmstat_item actual_enum,
|
|
const char *typestr,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define VMSTAT_GET( info, actual_enum, type ) ( { \
|
|
struct vmstat_result *r; \
|
|
r = xtra_vmstat_get(info, actual_enum , STRINGIFY(type), __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
#ifdef VMSTAT_VAL
|
|
#undef VMSTAT_VAL
|
|
struct vmstat_result *xtra_vmstat_val (
|
|
int relative_enum,
|
|
const char *typestr,
|
|
const struct vmstat_stack *stack,
|
|
struct vmstat_info *info,
|
|
const char *file,
|
|
int lineno);
|
|
|
|
#define VMSTAT_VAL( relative_enum, type, stack, info ) ( { \
|
|
struct vmstat_result *r; \
|
|
r = xtra_vmstat_val(relative_enum, STRINGIFY(type), stack, info, __FILE__, __LINE__); \
|
|
r ? r->result . type : 0; } )
|
|
#endif // . . . . . . . . . .
|
|
|
|
#endif // end: XTRA_PROCPS_DEBUG_H
|