Deleted Added
full compact
uma_core.c (240045) uma_core.c (242056)
1/*-
2 * Copyright (c) 2002-2005, 2009 Jeffrey Roberson <jeff@FreeBSD.org>
3 * Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
4 * Copyright (c) 2004-2006 Robert N. M. Watson
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 34 unchanged lines hidden (view full) ---

43
44/*
45 * TODO:
46 * - Improve memory usage for large allocations
47 * - Investigate cache size adjustments
48 */
49
50#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002-2005, 2009 Jeffrey Roberson <jeff@FreeBSD.org>
3 * Copyright (c) 2004, 2005 Bosko Milekic <bmilekic@FreeBSD.org>
4 * Copyright (c) 2004-2006 Robert N. M. Watson
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 34 unchanged lines hidden (view full) ---

43
44/*
45 * TODO:
46 * - Improve memory usage for large allocations
47 * - Investigate cache size adjustments
48 */
49
50#include <sys/cdefs.h>
51__FBSDID("$FreeBSD: stable/9/sys/vm/uma_core.c 240045 2012-09-02 18:19:41Z eadler $");
51__FBSDID("$FreeBSD: stable/9/sys/vm/uma_core.c 242056 2012-10-25 03:29:09Z eadler $");
52
53/* I should really use ktr.. */
54/*
55#define UMA_DEBUG 1
56#define UMA_DEBUG_ALLOC 1
57#define UMA_DEBUG_ALLOC_1 1
58*/
59

--- 1319 unchanged lines hidden (view full) ---

1379 panic("UMA slab won't fit.");
1380 }
1381 }
1382
1383 if (keg->uk_flags & UMA_ZONE_HASH)
1384 hash_alloc(&keg->uk_hash);
1385
1386#ifdef UMA_DEBUG
52
53/* I should really use ktr.. */
54/*
55#define UMA_DEBUG 1
56#define UMA_DEBUG_ALLOC 1
57#define UMA_DEBUG_ALLOC_1 1
58*/
59

--- 1319 unchanged lines hidden (view full) ---

1379 panic("UMA slab won't fit.");
1380 }
1381 }
1382
1383 if (keg->uk_flags & UMA_ZONE_HASH)
1384 hash_alloc(&keg->uk_hash);
1385
1386#ifdef UMA_DEBUG
1387 printf("UMA: %s(%p) size %d(%d) flags %d ipers %d ppera %d out %d free %d\n",
1387 printf("UMA: %s(%p) size %d(%d) flags %#x ipers %d ppera %d out %d free %d\n",
1388 zone->uz_name, zone, keg->uk_size, keg->uk_rsize, keg->uk_flags,
1389 keg->uk_ipers, keg->uk_ppera,
1390 (keg->uk_ipers * keg->uk_pages) - keg->uk_free, keg->uk_free);
1391#endif
1392
1393 LIST_INSERT_HEAD(&keg->uk_zones, zone, uz_link);
1394
1395 mtx_lock(&uma_mtx);

--- 1715 unchanged lines hidden (view full) ---

3111 cache->uc_freebucket?cache->uc_freebucket->ub_cnt:0);
3112}
3113
3114static void
3115uma_print_keg(uma_keg_t keg)
3116{
3117 uma_slab_t slab;
3118
1388 zone->uz_name, zone, keg->uk_size, keg->uk_rsize, keg->uk_flags,
1389 keg->uk_ipers, keg->uk_ppera,
1390 (keg->uk_ipers * keg->uk_pages) - keg->uk_free, keg->uk_free);
1391#endif
1392
1393 LIST_INSERT_HEAD(&keg->uk_zones, zone, uz_link);
1394
1395 mtx_lock(&uma_mtx);

--- 1715 unchanged lines hidden (view full) ---

3111 cache->uc_freebucket?cache->uc_freebucket->ub_cnt:0);
3112}
3113
3114static void
3115uma_print_keg(uma_keg_t keg)
3116{
3117 uma_slab_t slab;
3118
3119 printf("keg: %s(%p) size %d(%d) flags %d ipers %d ppera %d "
3119 printf("keg: %s(%p) size %d(%d) flags %#x ipers %d ppera %d "
3120 "out %d free %d limit %d\n",
3121 keg->uk_name, keg, keg->uk_size, keg->uk_rsize, keg->uk_flags,
3122 keg->uk_ipers, keg->uk_ppera,
3123 (keg->uk_ipers * keg->uk_pages) - keg->uk_free, keg->uk_free,
3124 (keg->uk_maxpages / keg->uk_ppera) * keg->uk_ipers);
3125 printf("Part slabs:\n");
3126 LIST_FOREACH(slab, &keg->uk_part_slab, us_link)
3127 slab_print(slab);

--- 7 unchanged lines hidden (view full) ---

3135
3136void
3137uma_print_zone(uma_zone_t zone)
3138{
3139 uma_cache_t cache;
3140 uma_klink_t kl;
3141 int i;
3142
3120 "out %d free %d limit %d\n",
3121 keg->uk_name, keg, keg->uk_size, keg->uk_rsize, keg->uk_flags,
3122 keg->uk_ipers, keg->uk_ppera,
3123 (keg->uk_ipers * keg->uk_pages) - keg->uk_free, keg->uk_free,
3124 (keg->uk_maxpages / keg->uk_ppera) * keg->uk_ipers);
3125 printf("Part slabs:\n");
3126 LIST_FOREACH(slab, &keg->uk_part_slab, us_link)
3127 slab_print(slab);

--- 7 unchanged lines hidden (view full) ---

3135
3136void
3137uma_print_zone(uma_zone_t zone)
3138{
3139 uma_cache_t cache;
3140 uma_klink_t kl;
3141 int i;
3142
3143 printf("zone: %s(%p) size %d flags %d\n",
3143 printf("zone: %s(%p) size %d flags %#x\n",
3144 zone->uz_name, zone, zone->uz_size, zone->uz_flags);
3145 LIST_FOREACH(kl, &zone->uz_kegs, kl_link)
3146 uma_print_keg(kl->kl_keg);
3147 CPU_FOREACH(i) {
3148 cache = &zone->uz_cpu[i];
3149 printf("CPU %d Cache:\n", i);
3150 cache_print(cache);
3151 }

--- 203 unchanged lines hidden ---
3144 zone->uz_name, zone, zone->uz_size, zone->uz_flags);
3145 LIST_FOREACH(kl, &zone->uz_kegs, kl_link)
3146 uma_print_keg(kl->kl_keg);
3147 CPU_FOREACH(i) {
3148 cache = &zone->uz_cpu[i];
3149 printf("CPU %d Cache:\n", i);
3150 cache_print(cache);
3151 }

--- 203 unchanged lines hidden ---