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

diff --git a/include/sys/kmem.h b/include/sys/kmem.h
index c355fdc3c9fa7639f85802feff1720ccc53889bb..73965c58b690fa9d4f8fdebb1ddb875e6b0db687 100644 (file)
--- a/include/sys/kmem.h
+++ b/include/sys/kmem.h
@@ -36,25 +36,28 @@ extern int kmem_warning_flag;
                                                                               \
        /* Marked unlikely because we should never be doing this */           \
         if (unlikely((size) > (PAGE_SIZE * 4)) && kmem_warning_flag)          \
-                __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning "                  \
-                              "kmem_alloc(%d, 0x%x) large alloc at %s:%d "   \
-                               "(%ld/%ld)\n", (int)(size), (int)(flags),      \
-                              __FILE__, __LINE__,                            \
+                __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning large "            \
+                              "kmem_alloc(%d, 0x%x) (%ld/%ld)\n",            \
+                              (int)(size), (int)(flags),                     \
                               atomic64_read(&kmem_alloc_used),               \
                               kmem_alloc_max);                               \
                                                                               \
         _ptr_ = (void *)allocator((size), (flags));                           \
         if (_ptr_ == NULL) {                                                  \
                 __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning "                  \
-                              "kmem_alloc(%d, 0x%x) failed at %s:%d "        \
-                              "(%ld/%ld)\n", (int)(size), (int)(flags),      \
-                              __FILE__, __LINE__,                            \
+                              "kmem_alloc(%d, 0x%x) failed (%ld/%ld)\n",     \
+                              (int)(size), (int)(flags),                     \
                               atomic64_read(&kmem_alloc_used),               \
                               kmem_alloc_max);                               \
         } else {                                                              \
                 atomic64_add((size), &kmem_alloc_used);                       \
                 if (unlikely(atomic64_read(&kmem_alloc_used)>kmem_alloc_max)) \
                         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_;                                                                \
@@ -67,6 +70,9 @@ extern int kmem_warning_flag;
 ({                                                                            \
         ASSERT((ptr) || (size > 0));                                          \
         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 */                               \
         kfree(ptr);                                                           \
 })
@@ -81,9 +87,8 @@ extern int kmem_warning_flag;
                                  PAGE_KERNEL);                               \
         if (_ptr_ == NULL) {                                                  \
                 __CDEBUG_LIMIT(S_KMEM, D_WARNING, "Warning "                  \
-                              "vmem_alloc(%d, 0x%x) failed at %s:%d "        \
-                              "(%ld/%ld)\n", (int)(size), (int)(flags),      \
-                              __FILE__, __LINE__,                            \
+                              "vmem_alloc(%d, 0x%x) failed (%ld/%ld)\n",     \
+                              (int)(size), (int)(flags),                     \
                              atomic64_read(&vmem_alloc_used),                \
                              vmem_alloc_max);                                \
         } else {                                                              \
@@ -93,6 +98,11 @@ extern int kmem_warning_flag;
                 atomic64_add((size), &vmem_alloc_used);                       \
                 if (unlikely(atomic64_read(&vmem_alloc_used)>vmem_alloc_max)) \
                         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_;                                                                \
@@ -106,6 +116,9 @@ extern int kmem_warning_flag;
 ({                                                                            \
         ASSERT((ptr) || (size > 0));                                          \
         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 */                               \
         vfree(ptr);                                                           \
 })

diff --git a/scripts/spl.spec b/scripts/spl.spec
index 80d6a170c4469f34a2aa44f5ab825631b6872b9a..f4f1f8a8b84f0bd0093bbad3902adbe9493cc6e3 100644 (file)
--- a/scripts/spl.spec
+++ b/scripts/spl.spec
@@ -1,6 +1,6 @@
 # spl
 %define name    spl 
-%define version 0.2.0
+%define version 0.2.1
 
 Summary: Solaris Porting Layer
 Name: %{name}