Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Update kmem.h to properly use new debug subsystem. 

git-svn-id: https://outreach.scidac.gov/svn/spl/trunk@92 7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c
This commit is contained in:
behlendo 2008-04-24 20:21:07 +00:00
parent 3561541c24
commit 839d8b438e
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/sys/kmem.h
View File

@ -36,25 +36,28 @@ extern int kmem_warning_flag;
\ \
/* Marked unlikely because we should never be doing this */ \ /* Marked unlikely because we should never be doing this */ \
if (unlikely((size) > (PAGE_SIZE * 4)) && kmem_warning_flag) \ if (unlikely((size) > (PAGE_SIZE * 4)) && kmem_warning_flag) \
__CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning " \ __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning large " \
"kmem_alloc(%d, 0x%x) large alloc at %s:%d " \ "kmem_alloc(%d, 0x%x) (%ld/%ld)\n", \
"(%ld/%ld)\n", (int)(size), (int)(flags), \ (int)(size), (int)(flags), \
__FILE__, __LINE__, \
atomic64_read(&kmem_alloc_used), \ atomic64_read(&kmem_alloc_used), \
kmem_alloc_max); \ kmem_alloc_max); \
\ \
_ptr_ = (void *)allocator((size), (flags)); \ _ptr_ = (void *)allocator((size), (flags)); \
if (_ptr_ == NULL) { \ if (_ptr_ == NULL) { \
__CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning " \ __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning " \
"kmem_alloc(%d, 0x%x) failed at %s:%d " \ "kmem_alloc(%d, 0x%x) failed (%ld/%ld)\n", \
"(%ld/%ld)\n", (int)(size), (int)(flags), \ (int)(size), (int)(flags), \
__FILE__, __LINE__, \
atomic64_read(&kmem_alloc_used), \ atomic64_read(&kmem_alloc_used), \
kmem_alloc_max); \ kmem_alloc_max); \
} else { \ } else { \
atomic64_add((size), &kmem_alloc_used); \ atomic64_add((size), &kmem_alloc_used); \
if (unlikely(atomic64_read(&kmem_alloc_used)>kmem_alloc_max)) \ if (unlikely(atomic64_read(&kmem_alloc_used)>kmem_alloc_max)) \
kmem_alloc_max = atomic64_read(&kmem_alloc_used); \ kmem_alloc_max = atomic64_read(&kmem_alloc_used); \
\
__CDEBUG_LIMIT(S_KMEM, D_INFO, "kmem_alloc(%d, 0x%x)'d " \
"(%ld/%ld)\n", (int)(size), (int)(flags), \
atomic64_read(&kmem_alloc_used), \
kmem_alloc_max); \
} \ } \
\ \
_ptr_; \ _ptr_; \
@ -67,6 +70,9 @@ extern int kmem_warning_flag;
({ \ ({ \
ASSERT((ptr) || (size > 0)); \ ASSERT((ptr) || (size > 0)); \
atomic64_sub((size), &kmem_alloc_used); \ atomic64_sub((size), &kmem_alloc_used); \
__CDEBUG_LIMIT(S_KMEM, D_INFO, "kmem_free(%d)'d (%ld/%ld)\n", \
(int)(size), atomic64_read(&kmem_alloc_used), \
kmem_alloc_max); \
memset(ptr, 0x5a, (size)); /* Poison */ \ memset(ptr, 0x5a, (size)); /* Poison */ \
kfree(ptr); \ kfree(ptr); \
}) })
@ -81,9 +87,8 @@ extern int kmem_warning_flag;
PAGE_KERNEL); \ PAGE_KERNEL); \
if (_ptr_ == NULL) { \ if (_ptr_ == NULL) { \
__CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning " \ __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning " \
"vmem_alloc(%d, 0x%x) failed at %s:%d " \ "vmem_alloc(%d, 0x%x) failed (%ld/%ld)\n", \
"(%ld/%ld)\n", (int)(size), (int)(flags), \ (int)(size), (int)(flags), \
__FILE__, __LINE__, \
atomic64_read(&vmem_alloc_used), \ atomic64_read(&vmem_alloc_used), \
vmem_alloc_max); \ vmem_alloc_max); \
} else { \ } else { \
@ -93,6 +98,11 @@ extern int kmem_warning_flag;
atomic64_add((size), &vmem_alloc_used); \ atomic64_add((size), &vmem_alloc_used); \
if (unlikely(atomic64_read(&vmem_alloc_used)>vmem_alloc_max)) \ if (unlikely(atomic64_read(&vmem_alloc_used)>vmem_alloc_max)) \
vmem_alloc_max = atomic64_read(&vmem_alloc_used); \ vmem_alloc_max = atomic64_read(&vmem_alloc_used); \
\
__CDEBUG_LIMIT(S_KMEM, D_INFO, "vmem_alloc(%d, 0x%x)'d " \
"(%ld/%ld)\n", (int)(size), (int)(flags), \
atomic64_read(&vmem_alloc_used), \
vmem_alloc_max); \
} \ } \
\ \
_ptr_; \ _ptr_; \
@ -106,6 +116,9 @@ extern int kmem_warning_flag;
({ \ ({ \
ASSERT((ptr) || (size > 0)); \ ASSERT((ptr) || (size > 0)); \
atomic64_sub((size), &vmem_alloc_used); \ atomic64_sub((size), &vmem_alloc_used); \
__CDEBUG_LIMIT(S_KMEM, D_INFO, "vmem_free(%d)'d (%ld/%ld)\n", \
(int)(size), atomic64_read(&vmem_alloc_used), \
vmem_alloc_max); \
memset(ptr, 0x5a, (size)); /* Poison */ \ memset(ptr, 0x5a, (size)); /* Poison */ \
vfree(ptr); \ vfree(ptr); \
}) })

2
scripts/spl.spec
View File

@ -1,6 +1,6 @@
# spl # spl
%define name spl %define name spl
%define version 0.2.0 %define version 0.2.1
Summary: Solaris Porting Layer Summary: Solaris Porting Layer
Name: %{name} Name: %{name}