d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the redefinition of MEMSTAT_MAXCPU and just use MAXCPU for that.

Browse Source 
Reviewed by:	sbruno
This commit is contained in:
Attilio Rao 2011-05-02 17:13:40 +00:00
parent 7be8a2de4f
commit 1d221389b2
5 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libmemstat/memstat.c
View File

@ -193,7 +193,7 @@ _memstat_mt_reset_stats(struct memory_type *mtp)
mtp->mt_zonefree = 0;
mtp->mt_kegfree = 0;
for (i = 0; i < MEMSTAT_MAXCPU; i++) {
for (i = 0; i < MAXCPU; i++) {
mtp->mt_percpu_alloc[i].mtp_memalloced = 0;
mtp->mt_percpu_alloc[i].mtp_memfreed = 0;
mtp->mt_percpu_alloc[i].mtp_numallocs = 0;

7
lib/libmemstat/memstat.h
View File

@ -29,13 +29,6 @@
#ifndef _MEMSTAT_H_
#define _MEMSTAT_H_
#include <machine/param.h>
/*
* Number of CPU slots in library-internal data structures.
*/
#define MEMSTAT_MAXCPU MAXCPU
/*
* Amount of caller data to maintain for each caller data slot. Applications
* must not request more than this number of caller save data, or risk

4
lib/libmemstat/memstat_internal.h
View File

@ -100,11 +100,11 @@ struct memory_type {
uint64_t mtp_sizemask; /* Per-CPU mt_sizemask. */
void *mtp_caller_pointer[MEMSTAT_MAXCALLER];
uint64_t mtp_caller_uint64[MEMSTAT_MAXCALLER];
} mt_percpu_alloc[MEMSTAT_MAXCPU];
} mt_percpu_alloc[MAXCPU];
struct {
uint64_t mtp_free; /* Per-CPU cache free items. */
} mt_percpu_cache[MEMSTAT_MAXCPU];
} mt_percpu_cache[MAXCPU];
LIST_ENTRY(memory_type) mt_list; /* List of types. */
};

13
lib/libmemstat/memstat_malloc.c
View File

@ -96,7 +96,7 @@ memstat_sysctl_malloc(struct memory_type_list *list, int flags)
return (-1);
}
if (maxcpus > MEMSTAT_MAXCPU) {
if (maxcpus > MAXCPU) {
list->mtl_error = MEMSTAT_ERROR_TOOMANYCPUS;
return (-1);
}
@ -160,7 +160,7 @@ memstat_sysctl_malloc(struct memory_type_list *list, int flags)
return (-1);
}
if (mtshp->mtsh_maxcpus > MEMSTAT_MAXCPU) {
if (mtshp->mtsh_maxcpus > MAXCPU) {
list->mtl_error = MEMSTAT_ERROR_TOOMANYCPUS;
free(buffer);
return (-1);
@ -295,7 +295,7 @@ memstat_kvm_malloc(struct memory_type_list *list, void *kvm_handle)
void *kmemstatistics;
int hint_dontsearch, j, mp_maxcpus, ret;
char name[MEMTYPE_MAXNAME];
struct malloc_type_stats mts[MEMSTAT_MAXCPU], *mtsp;
struct malloc_type_stats mts[MAXCPU], *mtsp;
struct malloc_type_internal *mtip;
struct malloc_type type, *typep;
kvm_t *kvm;
@ -322,7 +322,7 @@ memstat_kvm_malloc(struct memory_type_list *list, void *kvm_handle)
return (-1);
}
if (mp_maxcpus > MEMSTAT_MAXCPU) {
if (mp_maxcpus > MAXCPU) {
list->mtl_error = MEMSTAT_ERROR_TOOMANYCPUS;
return (-1);
}
@ -348,11 +348,6 @@ memstat_kvm_malloc(struct memory_type_list *list, void *kvm_handle)
list->mtl_error = ret;
return (-1);
}
/*
* Since our compile-time value for MAXCPU may differ from the
* kernel's, we populate our own array.
*/
mtip = type.ks_handle;
ret = kread(kvm, mtip->mti_stats, mts, mp_maxcpus *
sizeof(struct malloc_type_stats), 0);

9
lib/libmemstat/memstat_uma.c
View File

@ -27,6 +27,7 @@
*/
#include <sys/param.h>
#include <sys/cpuset.h>
#include <sys/sysctl.h>
#define LIBMEMSTAT /* Cause vm_page.h not to include opt_vmpage.h */
@ -104,7 +105,7 @@ memstat_sysctl_uma(struct memory_type_list *list, int flags)
return (-1);
}
if (maxcpus > MEMSTAT_MAXCPU) {
if (maxcpus > MAXCPU) {
list->mtl_error = MEMSTAT_ERROR_TOOMANYCPUS;
return (-1);
}
@ -168,7 +169,7 @@ memstat_sysctl_uma(struct memory_type_list *list, int flags)
return (-1);
}
if (ushp->ush_maxcpus > MEMSTAT_MAXCPU) {
if (ushp->ush_maxcpus > MAXCPU) {
list->mtl_error = MEMSTAT_ERROR_TOOMANYCPUS;
free(buffer);
return (-1);
@ -313,7 +314,7 @@ memstat_kvm_uma(struct memory_type_list *list, void *kvm_handle)
struct uma_keg *kzp, kz;
int hint_dontsearch, i, mp_maxid, ret;
char name[MEMTYPE_MAXNAME];
__cpumask_t all_cpus;
cpuset_t all_cpus;
kvm_t *kvm;
kvm = (kvm_t *)kvm_handle;
@ -407,7 +408,7 @@ memstat_kvm_uma(struct memory_type_list *list, void *kvm_handle)
if (kz.uk_flags & UMA_ZFLAG_INTERNAL)
goto skip_percpu;
for (i = 0; i < mp_maxid + 1; i++) {
if ((all_cpus & (1 << i)) == 0)
if (!CPU_ISSET(i, &all_cpus))
continue;
ucp = &ucp_array[i];
mtp->mt_numallocs += ucp->uc_allocs;