From 166b2571ce446b4085d4c2067b0d0d36c608f131 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Mon, 16 Oct 2000 23:55:58 +0000
Subject: * Makefile.in: Remove some obsolete stuff. * dcrt0.cc (dll_crt0_1):
 Call signal_fixup_after_exec where appropriate.  Set myself->uid from parent
 version.  Just use ThreadItem Init method.  Close or store hexec_proc as
 appropriate. (_dll_crt0): Store user_data->forkee here so that proper tests
 can be made subsequently. (do_exit): Remove hExeced stuff. * environ.cc
 (environ_init): Accept environ count as well as environ pointer. * environ.h:
 Reflect above change. * pinfo.cc (pinfo_init): Ditto.  Accept environ count.
 (fixup_in_spawned_child): Remove. * spawn.cc (spawn_guts): Move signal code
 to dll_crt0_1.  Don't suspend execing process since it is no longer
 necessary.  Store envc. * exceptions.cc (signal_fixup_after_exec): New
 function. (call_handler): Remove hExeced test. * child_info.h
 (cygheap_exec_info): Store envc as well as envp. (child_info_spawn): Store
 hexec_proc so that it can be closed in child. * path.cc
 (normalize_posix_path): Avoid intermediate use of temporary cwd buf.
 (normalize_win32_path): Ditto. (cwdstuff::get_initial): Always set lock. *
 sigproc.h: Remove hExeced. * strace.cc (strace::vsprntf): Modify to
 accomodate for lack of hExeced. * thread.cc (MTinterface::Init): Merge Init1
 and ClearReent into this method. (MTinterface::Init1): Eliminate.
 (MTinterface::ClearReent): Eliminate. * thread.h: Reflect above changes. *
 include/sys/strace.h (strace): Make microseconds() public.  Make various
 functions 'regparm', throughout. * pinfo.h (_pinfo): Inline simple signal
 manipulation functions.  Requires inclusion of thread.h which was removed
 from .cc files, where appropriate. throughout. * pinfo.cc: Eliminate signal
 manipulation functions. (_pinfo::exit): Calculate total rusage for exiting
 process here. * cygheap.cc (size2bucket): Eliminate. (init_buckets): Ditto.
 (_cmalloc): Calculate size and bits in a loop rather than going through a
 function call. (_crealloc): Use stored array index to calculate allocated
 size. * spawn.cc (spawn_guts): Use _pinfo exit method to exit, calculating
 cpu usage.

---
 winsup/cygwin/cygheap.cc | 46 ++++++++++------------------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

(limited to 'winsup/cygwin/cygheap.cc')

diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 21bde12e1..e583c1efc 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -70,35 +70,6 @@ _csbrk (int sbs)
 
 #define NBUCKETS 32
 char *buckets[NBUCKETS] = {0};
-int bucket2size[NBUCKETS] = {0};
-
-static inline int
-size2bucket (int size)
-{
-  int rv = 0x1f;
-  int bit = ~0x10;
-  int i;
-
-  if (size < 4)
-    size = 4;
-  size = (size + 3) & ~3;
-
-  for (i = 0; i < 5; i++)
-    {
-      if (bucket2size[rv & bit] >= size)
-	rv &= bit;
-      bit >>= 1;
-    }
-  return rv;
-}
-
-static inline void
-init_buckets ()
-{
-  unsigned b;
-  for (b = 0; b < NBUCKETS; b++)
-    bucket2size[b] = (1 << b);
-}
 
 struct _cmalloc_entry
 {
@@ -116,16 +87,19 @@ struct _cmalloc_entry
 #define to_cmalloc(s) ((_cmalloc_entry *) (((char *) (s)) - (int) (N0->data)))
 #define cygheap_chain ((_cmalloc_entry **)cygheap)
 
+static void *_cmalloc (int size) __attribute ((regparm(1)));
+static void *__stdcall _crealloc (void *ptr, int size) __attribute ((regparm(2)));
+
 static void *__stdcall
 _cmalloc (int size)
 {
   _cmalloc_entry *rvc;
-  int b;
+  int b, sz;
 
-  if (bucket2size[0] == 0)
-    init_buckets ();
+  /* Calculate "bit bucket" and size as a power of two. */
+  for (b = 3, sz = 8; sz && sz < (size + 4); b++, sz <<= 1)
+    continue;
 
-  b = size2bucket (size);
   cygheap_protect->acquire ();
   if (buckets[b])
     {
@@ -135,7 +109,7 @@ _cmalloc (int size)
     }
   else
     {
-      size = bucket2size[b] + sizeof (_cmalloc_entry);
+      size = sz + sizeof (_cmalloc_entry);
       rvc = (_cmalloc_entry *) _csbrk (size);
 
       rvc->b = b;
@@ -165,7 +139,7 @@ _crealloc (void *ptr, int size)
     newptr = _cmalloc (size);
   else
     {
-      int oldsize = bucket2size[to_cmalloc (ptr)->b];
+      int oldsize = 1 << to_cmalloc (ptr)->b;
       if (size <= oldsize)
 	return ptr;
       newptr = _cmalloc (size);
@@ -228,7 +202,7 @@ cygheap_fixup_in_child (HANDLE parent, bool execed)
     }
 }
 
-static void *__stdcall
+inline static void *
 creturn (cygheap_types x, cygheap_entry * c, int len)
 {
   if (!c)
-- 
cgit v1.2.3