Changeset 2783 for trunk

Timestamp:

Aug 27, 2006, 9:45:16 AM (19 years ago)

Author:

bird

Message:

Heap performance.

Location:

trunk/libc

Files:

• include/emx/umalloc.h (modified) (3 diffs)
• src/libc/libc.def (modified) (1 diff)
• src/libc/malloc/imisc.c (modified) (1 diff)

trunk/libc/include/emx/umalloc.h

@@ -717 +717 @@
 void _um_default_release (Heap_t, void *, size_t);
 void _um_default_shrink (Heap_t, void *, size_t, size_t *);
-int _um_find_bucket (size_t);
 void _um_free_maybe_lock (void *, int);
 Heap_t _um_init_default_regular_heap (void);
@@ -733 +732 @@
 void _um_lump_unlink_heap (Heap_t, struct _um_lump *);
 int _um_walk_no_lock (Heap_t, _um_callback2 *, void *);
+void _um_abort (const char *, ...)  __attribute__((__noreturn__));
 
 
@@ -808 +808 @@
 
 
-void _um_abort (const char *, ...)  __attribute__((__noreturn__));
+static inline int _um_find_bucket (size_t rsize)
+{
+  int bucket = __fls (rsize) - 1 - _UM_MIN_BUCKET;
+  if (bucket < 0)
+    bucket = 0;
+  else if (bucket >= _UM_BUCKETS)
+    return _UM_BUCKETS - 1;
+#if defined(__LIBC_STRICT) || defined(DEBUG)
+  if (   _UM_BUCKET_SIZE (bucket) > rsize
+      || _UM_BUCKET_SIZE (bucket+1) <= rsize)
+    _um_abort ("_um_find_bucked: rsize=%x\n", rsize);
+#endif
+  return bucket;
+}
+
 
 #if defined (__cplusplus)

trunk/libc/src/libc/libc.def

@@ -1123 +1123 @@
     "__um_default_release" @1136
     "__um_default_shrink" @1137
-    "__um_find_bucket" @1138
+    "__um_find_bucket" = "___nullstub_function" @1138
     "__um_free_maybe_lock" @1139
     "__um_init_default_regular_heap" @1140

trunk/libc/src/libc/malloc/imisc.c

@@ -9 +9 @@
 #include <sys/fmutex.h>
 #include <emx/umalloc.h>
-
-/* Leave FLS undefined if __fls() is not available.  __fls() is
-   similar to ffs(), but finds the last (most significant) bit. */
-
-#define FLS(x)          __fls(x)
-
-
-int _um_find_bucket (size_t rsize)
-{
-  int bucket;
-
-#ifdef FLS
-  bucket = FLS (rsize) - 1 - _UM_MIN_BUCKET;
-  if (bucket < 0)
-    bucket = 0;
-  else if (bucket >= _UM_BUCKETS)
-    return _UM_BUCKETS - 1;
-  assert (_UM_BUCKET_SIZE (bucket) <= rsize);
-  assert (_UM_BUCKET_SIZE (bucket+1) > rsize);
-  return bucket;
-#else
-  for (bucket = _UM_BUCKETS - 1; bucket >= 0; --bucket)
-    if (_UM_BUCKET_SIZE (bucket) <= rsize)
-      return bucket;
-  _um_abort ("_um_find_bucked: rsize=%x\n", rsize); /* RSIZE is probably not rounded! */
-#endif
-}