rtems/rtems-libbsd
1
0
Fork 0
mirror of https://git.rtems.org/rtems-libbsd/ synced 2025-07-27 09:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added initialization needed by Nics into uma_core.c

Browse Source
This commit is contained in:
Jennifer Averett 2012-05-31 14:49:12 -05:00
parent 569ce6583a
commit b049b40fa9
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
freebsd/vm/uma_core.c
View File

@ -54,10 +54,10 @@ __FBSDID("$FreeBSD$");
/* I should really use ktr.. */ /* I should really use ktr.. */
/* /*
*/
#define UMA_DEBUG 1 #define UMA_DEBUG 1
#define UMA_DEBUG_ALLOC 1 #define UMA_DEBUG_ALLOC 1
#define UMA_DEBUG_ALLOC_1 1 #define UMA_DEBUG_ALLOC_1 1
*/
#include <freebsd/local/opt_ddb.h> #include <freebsd/local/opt_ddb.h>
#include <freebsd/local/opt_param.h> #include <freebsd/local/opt_param.h>
@ -75,9 +75,7 @@ __FBSDID("$FreeBSD$");
#include <freebsd/sys/proc.h> #include <freebsd/sys/proc.h>
#include <freebsd/sys/sbuf.h> #include <freebsd/sys/sbuf.h>
#include <freebsd/sys/smp.h> #include <freebsd/sys/smp.h>
#ifndef __rtems__
#include <freebsd/sys/vmmeter.h> #include <freebsd/sys/vmmeter.h>
#endif /* __rtems__ */
#include <freebsd/vm/vm.h> #include <freebsd/vm/vm.h>
#ifndef __rtems__ #ifndef __rtems__
@ -237,16 +235,12 @@ static void zone_timeout(uma_zone_t zone);
static int hash_alloc(struct uma_hash *); static int hash_alloc(struct uma_hash *);
static int hash_expand(struct uma_hash *, struct uma_hash *); static int hash_expand(struct uma_hash *, struct uma_hash *);
static void hash_free(struct uma_hash *hash); static void hash_free(struct uma_hash *hash);
#ifndef __rtems__
static void uma_timeout(void *); static void uma_timeout(void *);
static void uma_startup3(void); static void uma_startup3(void);
#endif /* __rtems__ */
static void *zone_alloc_item(uma_zone_t, void *, int); static void *zone_alloc_item(uma_zone_t, void *, int);
static void zone_free_item(uma_zone_t, void *, void *, enum zfreeskip, static void zone_free_item(uma_zone_t, void *, void *, enum zfreeskip,
int); int);
#ifndef __rtems__
static void bucket_enable(void); static void bucket_enable(void);
#endif /* __rtems__ */
static void bucket_init(void); static void bucket_init(void);
static uma_bucket_t bucket_alloc(int, int); static uma_bucket_t bucket_alloc(int, int);
static void bucket_free(uma_bucket_t); static void bucket_free(uma_bucket_t);
@ -265,14 +259,17 @@ void uma_print_stats(void);
#ifndef __rtems__ #ifndef __rtems__
static int sysctl_vm_zone_count(SYSCTL_HANDLER_ARGS); static int sysctl_vm_zone_count(SYSCTL_HANDLER_ARGS);
static int sysctl_vm_zone_stats(SYSCTL_HANDLER_ARGS); static int sysctl_vm_zone_stats(SYSCTL_HANDLER_ARGS);
#endif
SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL); SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL);
#ifndef __rtems__
SYSCTL_PROC(_vm, OID_AUTO, zone_count, CTLFLAG_RD|CTLTYPE_INT, SYSCTL_PROC(_vm, OID_AUTO, zone_count, CTLFLAG_RD|CTLTYPE_INT,
0, 0, sysctl_vm_zone_count, "I", "Number of UMA zones"); 0, 0, sysctl_vm_zone_count, "I", "Number of UMA zones");
SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLTYPE_STRUCT, SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLTYPE_STRUCT,
0, 0, sysctl_vm_zone_stats, "s,struct uma_type_header", "Zone Stats"); 0, 0, sysctl_vm_zone_stats, "s,struct uma_type_header", "Zone Stats");
#endif /* __rtems__ */
/* /*
* This routine checks to see whether or not it's safe to enable buckets. * This routine checks to see whether or not it's safe to enable buckets.
@ -281,12 +278,13 @@ SYSCTL_PROC(_vm, OID_AUTO, zone_stats, CTLFLAG_RD|CTLTYPE_STRUCT,
static void static void
bucket_enable(void) bucket_enable(void)
{ {
#ifndef __rtems__
if (cnt.v_free_count < cnt.v_free_min) if (cnt.v_free_count < cnt.v_free_min)
bucketdisable = 1; bucketdisable = 1;
else else
#endif /* __rtems__ */
bucketdisable = 0; bucketdisable = 0;
} }
#endif /* __rtems__ */
/* /*
* Initialize bucket_zones, the array of zones of buckets of various sizes. * Initialize bucket_zones, the array of zones of buckets of various sizes.
@ -392,7 +390,6 @@ zone_foreach_keg(uma_zone_t zone, void (*kegfn)(uma_keg_t))
kegfn(klink->kl_keg); kegfn(klink->kl_keg);
} }
#ifndef __rtems__
/* /*
* Routine called by timeout which is used to fire off some time interval * Routine called by timeout which is used to fire off some time interval
* based calculations. (stats, hash size, etc.) * based calculations. (stats, hash size, etc.)
@ -412,7 +409,6 @@ uma_timeout(void *unused)
/* Reschedule this event */ /* Reschedule this event */
callout_reset(&uma_callout, UMA_TIMEOUT * hz, uma_timeout, NULL); callout_reset(&uma_callout, UMA_TIMEOUT * hz, uma_timeout, NULL);
} }
#endif /* __rtems__ */
/* /*
* Routine to perform timeout driven calculations. This expands the * Routine to perform timeout driven calculations. This expands the
@ -1814,6 +1810,7 @@ uma_startup2(void)
printf("UMA startup2 complete.\n"); printf("UMA startup2 complete.\n");
#endif #endif
} }
#endif /* __rtems__ */
/* /*
* Initialize our callout handle * Initialize our callout handle
@ -1832,7 +1829,6 @@ uma_startup3(void)
printf("UMA startup3 complete.\n"); printf("UMA startup3 complete.\n");
#endif #endif
} }
#endif /* __rtems__ */
static uma_keg_t static uma_keg_t
uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini, uma_kcreate(uma_zone_t zone, size_t size, uma_init uminit, uma_fini fini,