Changeset 212fc0 in git

Timestamp:

Nov 22, 1999, 7:13:00 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6ea5825fc0e0bfabf56883aee9dac9b5bbe415fe

Parents:

e6908a0f43ea328a1aa0c3942e8d309db7de26d5

Message:

* as we go along


git-svn-id: file:///usr/local/Singular/svn/trunk@3878 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

omalloc

Files:

• configure (modified) (69 diffs)
• configure.in (modified) (6 diffs)
• omAlloc.c (modified) (27 diffs)
• omConfig.h.in (modified) (2 diffs)
• omDebug.c (modified) (21 diffs)
• omDebug.h (modified) (1 diff)
• omList.c (modified) (2 diffs)
• omLocal.c (modified) (2 diffs)
• omLocal.h (modified) (6 diffs)
• omPrivate.h (modified) (10 diffs)
• omTest.c (modified) (8 diffs)
• omTrack.c (modified) (9 diffs)

omalloc/configure

@@ -13 +13 @@
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-mtrack           use mpr routines for extended memory tracking
-                             -- works only under ix86-Linux"
-ac_help="$ac_help
   --with-align8           only use 8-aligned memory"
 ac_help="$ac_help
   --enable-stat           enable memory statistics"
 ac_help="$ac_help
-  --disable-mtrack        disable memory track"
+  --disable-mtrack        disable backtrace and memory track"
+ac_help="$ac_help
+  --with_return_addr_func=FUNC
+                             use FUNC as function for determening return addr
+                             Default: __bultin_return_address"
+ac_help="$ac_help
+  --with_frame_addr_func=FUNC
+                             use FUNC as function for determening frame addr
+                             Default: __bultin_frame_address"
 
 # Initialize some variables set by options.
@@ -533 +538 @@
 
 
-# Check whether --with-mtrack or --without-mtrack was given.
-if test "${with_mtrack+set}" = set; then
-  withval="$with_mtrack"
-  :
-fi
-
 # Check whether --with-align8 or --without-align8 was given.
 if test "${with_align8+set}" = set; then
@@ -551 +550 @@
 fi
 
-# Check whether --with-mtrack or --without-mtrack was given.
-if test "${with_mtrack+set}" = set; then
-  withval="$with_mtrack"
+# Check whether --enable-mtrack or --disable-mtrack was given.
+if test "${enable_mtrack+set}" = set; then
+  enableval="$enable_mtrack"
   :
 fi
 
+# Check whether --with-return_addr_func or --without-return_addr_func was given.
+if test "${with_return_addr_func+set}" = set; then
+  withval="$with_return_addr_func"
+  :
+fi
+
+# Check whether --with-frame_addr_func or --without-frame_addr_func was given.
+if test "${with_frame_addr_func+set}" = set; then
+  withval="$with_frame_addr_func"
+  :
+fi
+
+
                              
 
 echo $ac_n "checking singuname""... $ac_c" 1>&6
-echo "configure:563: checking singuname" >&5
+echo "configure:575: checking singuname" >&5
 if eval "test \"`echo '$''{'ac_cv_singuname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -591 +603 @@
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:594: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:606: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
@@ -620 +632 @@
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:623: checking for $ac_word" >&5
+echo "configure:635: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -650 +662 @@
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:653: checking for $ac_word" >&5
+echo "configure:665: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -701 +713 @@
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:704: checking for $ac_word" >&5
+echo "configure:716: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -733 +745 @@
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:736: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
@@ -744 +756 @@
 cat > conftest.$ac_ext << EOF
 
-#line 747 "configure"
+#line 759 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
@@ -775 +787 @@
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:778: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:790: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:783: checking whether we are using GNU C" >&5
+echo "configure:795: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -789 +801 @@
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
@@ -808 +820 @@
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:811: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:823: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -840 +852 @@
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:843: checking how to run the C preprocessor" >&5
+echo "configure:855: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -855 +867 @@
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 858 "configure"
+#line 870 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -861 +873 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -872 +884 @@
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 875 "configure"
+#line 887 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -878 +890 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -889 +901 @@
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 892 "configure"
+#line 904 "configure"
 #include "confdefs.h"
 #include <assert.h>
@@ -895 +907 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:910: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -920 +932 @@
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:923: checking for working const" >&5
+echo "configure:935: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 928 "configure"
+#line 940 "configure"
 #include "confdefs.h"
 
@@ -974 +986 @@
 ; return 0; }
 EOF
-if { (eval echo configure:977: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
@@ -995 +1007 @@
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:998: checking for inline" >&5
+echo "configure:1010: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1002 +1014 @@
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1005 "configure"
+#line 1017 "configure"
 #include "confdefs.h"
 
@@ -1009 +1021 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
@@ -1043 +1055 @@
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1046: checking for $ac_word" >&5
+echo "configure:1058: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1073 +1085 @@
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1076: checking for $ac_word" >&5
+echo "configure:1088: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1106 +1118 @@
 set dummy perl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1109: checking for $ac_word" >&5
+echo "configure:1121: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1140 +1152 @@
 set dummy addr2line; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1143: checking for $ac_word" >&5
+echo "configure:1155: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_ADDR2LINE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1176 +1188 @@
 set dummy nm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1179: checking for $ac_word" >&5
+echo "configure:1191: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1212 +1224 @@
 # header file checks
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1215: checking for ANSI C header files" >&5
+echo "configure:1227: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1220 "configure"
+#line 1232 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1225 +1237 @@
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1242 +1254 @@
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1245 "configure"
+#line 1257 "configure"
 #include "confdefs.h"
 #include <string.h>
@@ -1260 +1272 @@
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1263 "configure"
+#line 1275 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
@@ -1281 +1293 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1284 "configure"
+#line 1296 "configure"
 #include "confdefs.h"
 #include <ctype.h>
@@ -1292 +1304 @@
 
 EOF
-if { (eval echo configure:1295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
@@ -1319 +1331 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1322: checking for $ac_hdr" >&5
+echo "configure:1334: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1327 "configure"
+#line 1339 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1360 +1372 @@
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1363: checking for $ac_hdr" >&5
+echo "configure:1375: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1368 "configure"
+#line 1380 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
@@ -1400 +1412 @@
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1403: checking for $ac_func" >&5
+echo "configure:1415: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1408 "configure"
+#line 1420 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
@@ -1428 +1440 @@
 ; return 0; }
 EOF
-if { (eval echo configure:1431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
@@ -1455 +1467 @@
 
 if test "$enable_mtrack" != no; then
-# functions which crawl up the stack from return and frame addr
+
+# get function for return address
+if test "${with_return_addr_func+set}" = set; then
+if test "${with_return_addr_func}" != no; then
+  ac_cv_return_addr_func=$with_return_addr_func
+fi
+else
 if test "${GCC}" = yes; then
-  ac_cv_func_return_addr="__builtin_return_address"
-  cat >> confdefs.h <<EOF
-#define OM_RETURN_ADDR __builtin_return_address
-EOF
-
-  ac_cv_func_frame_addr="__builtin_frame_address"
-  cat >> confdefs.h <<EOF
-#define OM_FRAME_ADDR __builtin_frame_address
-EOF
-
-fi
-
-# test them
-if test "${ac_cv_func_return_addr+set}" = set; then
-# first, check whether return addr 
-echo $ac_n "checking whether $ac_cv_func_return_addr works""... $ac_c" 1>&6
-echo "configure:1476: checking whether $ac_cv_func_return_addr works" >&5
-if eval "test \"`echo '$''{'ac_cv_func_return_addr_works'+set}'`\" = set"; then
+  ac_cv_return_addr_func="__builtin_return_address"
+fi
+fi
+
+# test this function
+if test "${ac_cv_return_addr_func+set}" = set; then
+cat >> confdefs.h <<EOF
+#define OM_RETURN_ADDR $ac_cv_return_addr_func
+EOF
+
+# first, check whether return addr works
+echo $ac_n "checking whether $ac_cv_return_addr_func works""... $ac_c" 1>&6
+echo "configure:1490: checking whether $ac_cv_return_addr_func works" >&5
+if eval "test \"`echo '$''{'ac_cv_return_addr_func_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
-  ac_cv_func_return_addr_works=no
+  ac_cv_return_addr_func_works=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 1484 "configure"
+#line 1498 "configure"
 #include "confdefs.h"
 
 int test_return_addr()
 {
-   if (OM_RETURN_ADDR(1)  != 0 && OM_RETURN_ADDR(0) != 0) return 0;
+   if (OM_RETURN_ADDR(1)  != 0 && OM_RETURN_ADDR(0) != 0 && 
+       OM_RETURN_ADDR(1) != OM_RETURN_ADDR(0)) return 0;
    return 1;
 }
@@ -1496 +1511 @@
 
 EOF
-if { (eval echo configure:1499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
-  ac_cv_func_return_addr_works=yes
+  ac_cv_return_addr_func_works=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -fr conftest*
-  ac_cv_func_return_addr_works=no
+  ac_cv_return_addr_func_works=no
 fi
 rm -fr conftest*
@@ -1510 +1525 @@
 fi
 
-echo "$ac_t""$ac_cv_func_return_addr_works" 1>&6
-
-if test "$ac_cv_func_return_addr_works" = yes; then
+echo "$ac_t""$ac_cv_return_addr_func_works" 1>&6
+
+if test "$ac_cv_return_addr_func_works" = yes; then
+cat >> confdefs.h <<\EOF
+#define OM_RETURN_ADDR_WORKS 1
+EOF
+
+# check whether return addr works with rvalues
+echo $ac_n "checking whether $ac_cv_return_addr_func takes rvalues""... $ac_c" 1>&6
+echo "configure:1537: checking whether $ac_cv_return_addr_func takes rvalues" >&5
+if eval "test \"`echo '$''{'ac_cv_return_addr_func_rvalue'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_return_addr_func_rvalue=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1545 "configure"
+#include "confdefs.h"
+
+int test_return_addr(int f1, int f2)
+{
+   if (OM_RETURN_ADDR(f1)  != 0 && OM_RETURN_ADDR(f0) != 0 &&
+       OM_RETURN_ADDR(f1) != OM_RETURN_ADDR(f0)) return 0;
+   return 1;
+}
+
+int main()
+{
+   return test_return_addr(1, 0);
+}
+
+EOF
+if { (eval echo configure:1561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_return_addr_func_rvalue=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_return_addr_func_rvalue=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_return_addr_func_rvalue" 1>&6
+if test "$ac_cv_return_addr_func_rvalue" = yes; then
+  cat >> confdefs.h <<EOF
+#define OM_RETURN_ADDR_RVALUE 1
+EOF
+
+fi
+fi # "$ac_cv_return_addr_func_works" = yes;
+fi # "${ac_cv_return_addr_func+set}" = set;
+
+# get function for frame address
+if test "${with_frame_addr_func+set}" = set; then
+if test "${with_frame_addr_func}" != no; then
+  ac_cv_frame_addr_func=$with_frame_addr_func
+fi
+else
+if test "${GCC}" = yes; then
+  ac_cv_frame_addr_func="__builtin_frame_address"
+fi
+fi
+
+# test this function
+if test "${ac_cv_frame_addr_func+set}" = set; then
 cat >> confdefs.h <<EOF
-#define OM_RETURN_ADDR_WORKS 1
-EOF
-
-if test "${ac_cv_func_frame_addr+set}" = set; then
-# first, check whether return addr 
-echo $ac_n "checking whether $ac_cv_func_frame_addr works""... $ac_c" 1>&6
-echo "configure:1523: checking whether $ac_cv_func_frame_addr works" >&5
-if eval "test \"`echo '$''{'ac_cv_func_frame_addr_works'+set}'`\" = set"; then
+#define OM_FRAME_ADDR $ac_cv_frame_addr_func
+EOF
+
+# first, check whether frame addr works
+echo $ac_n "checking whether $ac_cv_frame_addr_func works""... $ac_c" 1>&6
+echo "configure:1604: checking whether $ac_cv_frame_addr_func works" >&5
+if eval "test \"`echo '$''{'ac_cv_frame_addr_func_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   if test "$cross_compiling" = yes; then
-  ac_cv_func_frame_addr_works=no
+  ac_cv_frame_addr_func_works=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 1531 "configure"
+#line 1612 "configure"
 #include "confdefs.h"
 
 int test_frame_addr()
 {
-   if (OM_FRAME_ADDR(1)  != 0 && OM_FRAME_ADDR(0) != 0) return 0;
+   if (OM_FRAME_ADDR(1)  != 0 && OM_FRAME_ADDR(0) != 0 && 
+       OM_FRAME_ADDR(1) != OM_FRAME_ADDR(0)) return 0;
    return 1;
 }
@@ -1543 +1625 @@
 
 EOF
-if { (eval echo configure:1546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
-  ac_cv_func_frame_addr_works=yes
+  ac_cv_frame_addr_func_works=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -fr conftest*
-  ac_cv_func_frame_addr_works=no
+  ac_cv_frame_addr_func_works=no
 fi
 rm -fr conftest*
@@ -1557 +1639 @@
 fi
 
-echo "$ac_t""$ac_cv_func_frame_addr_works" 1>&6
-
-if test "$ac_cv_func_frame_addr_works" = yes; then
-cat >> confdefs.h <<EOF
+echo "$ac_t""$ac_cv_frame_addr_func_works" 1>&6
+
+if test "$ac_cv_frame_addr_func_works" = yes; then
+cat >> confdefs.h <<\EOF
 #define OM_FRAME_ADDR_WORKS 1
 EOF
 
-fi
-fi  # "${ac_cv_func_frame_addr+set}" = set
-fi  # "$ac_cv_func_return_addr_works" = yes
-fi  # "${ac_cv_func_return_addr+set}" = set
+# check whether frame addr works with rvalues
+echo $ac_n "checking whether $ac_cv_frame_addr_func takes rvalues""... $ac_c" 1>&6
+echo "configure:1651: checking whether $ac_cv_frame_addr_func takes rvalues" >&5
+if eval "test \"`echo '$''{'ac_cv_frame_addr_func_rvalue'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_frame_addr_func_rvalue=no
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1659 "configure"
+#include "confdefs.h"
+
+int test_frame_addr(int f1, int f2)
+{
+   if (OM_FRAME_ADDR(f1)  != 0 && OM_FRAME_ADDR(f0) != 0 &&
+       OM_FRAME_ADDR(f1) != OM_FRAME_ADDR(f0)) return 0;
+   return 1;
+}
+
+int main()
+{
+   return test_frame_addr(1, 0);
+}
+
+EOF
+if { (eval echo configure:1675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_frame_addr_func_rvalue=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_frame_addr_func_rvalue=no
+fi
+rm -fr conftest*
+fi
+
+fi
+
+echo "$ac_t""$ac_cv_frame_addr_func_rvalue" 1>&6
+if test "$ac_cv_frame_addr_func_rvalue" = yes; then
+  cat >> confdefs.h <<EOF
+#define OM_FRAME_ADDR_RVALUE 1
+EOF
+
+fi
+fi # "$ac_cv_frame_addr_func_works" = yes;
+fi # "${ac_cv_frame_addr_func+set}" = set;
+
 fi  # "$enable_mtrack" != no;
 
@@ -1574 +1702 @@
 # sizes
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:1577: checking size of long" >&5
+echo "configure:1705: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1582 +1710 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1585 "configure"
+#line 1713 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -1593 +1721 @@
 }
 EOF
-if { (eval echo configure:1596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
@@ -1613 +1741 @@
 
 echo $ac_n "checking size of void*""... $ac_c" 1>&6
-echo "configure:1616: checking size of void*" >&5
+echo "configure:1744: checking size of void*" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_voidp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1621 +1749 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1624 "configure"
+#line 1752 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -1632 +1760 @@
 }
 EOF
-if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_voidp=`cat conftestval`
@@ -1652 +1780 @@
 
 echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:1655: checking size of double" >&5
+echo "configure:1783: checking size of double" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1660 +1788 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1663 "configure"
+#line 1791 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -1671 +1799 @@
 }
 EOF
-if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_double=`cat conftestval`
@@ -1698 +1826 @@
 
 echo $ac_n "checking align8""... $ac_c" 1>&6
-echo "configure:1701: checking align8" >&5
+echo "configure:1829: checking align8" >&5
 if test "$with_align8" = yes || test "$ac_cv_sizeof_long" = 8; then
   $ac_cv_align8 = yes
@@ -1709 +1837 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1712 "configure"
+#line 1840 "configure"
 #include "confdefs.h"
  
@@ -1724 +1852 @@
 
 EOF
-if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_align8=no
@@ -1749 +1877 @@
 
 echo $ac_n "checking size of system page""... $ac_c" 1>&6
-echo "configure:1752: checking size of system page" >&5
+echo "configure:1880: checking size of system page" >&5
 if eval "test \"`echo '$''{'ac_cv_pagesize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1757 +1885 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1760 "configure"
+#line 1888 "configure"
 #include "confdefs.h"
 #include <stdio.h>
@@ -1771 +1899 @@
 }
 EOF
-if { (eval echo configure:1774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_pagesize=`cat conftestval`
@@ -1795 +1923 @@
 
 echo $ac_n "checking for page aligned valloc""... $ac_c" 1>&6
-echo "configure:1798: checking for page aligned valloc" >&5
+echo "configure:1926: checking for page aligned valloc" >&5
 if eval "test \"`echo '$''{'ac_cv_have_page_alignment'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1841 +1969 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1844 "configure"
+#line 1972 "configure"
 #include "confdefs.h"
 
@@ -1848 +1976 @@
 
 EOF
-if { (eval echo configure:1851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_usable_pagesize="`cat  conftestval`
@@ -1865 +1993 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1868 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 
@@ -1872 +2000 @@
 
 EOF
-if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_usable_pagesize="`cat  conftestval`
@@ -1892 +2020 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1895 "configure"
+#line 2023 "configure"
 #include "confdefs.h"
 
@@ -1901 +2029 @@
 
 EOF
-if { (eval echo configure:1904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_have_gmalloc=yes; ac_cv_usable_pagesize="`cat  conftestval`
@@ -1918 +2046 @@
 else
   cat > conftest.$ac_ext <<EOF
-#line 1921 "configure"
+#line 2049 "configure"
 #include "confdefs.h"
 
@@ -1927 +2055 @@
 
 EOF
-if { (eval echo configure:1930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_have_page_alignment="ac_cv_have_gmalloc=yes; ac_cv_usable_pagesize="`cat  conftestval`
@@ -1977 +2105 @@
 
 echo $ac_n "checking whether to enable statistics""... $ac_c" 1>&6
-echo "configure:1980: checking whether to enable statistics" >&5
+echo "configure:2108: checking whether to enable statistics" >&5
 if test "$enable_stat" = yes; then
   echo "$ac_t""yes" 1>&6

omalloc/configure.in

@@ -4 +4 @@
 dnl Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
 dnl Created: 11/99
-dnl Version: $Id: configure.in,v 1.1.1.1 1999-11-18 17:45:52 obachman Exp $
+dnl Version: $Id: configure.in,v 1.2 1999-11-22 18:12:57 obachman Exp $
 dnl lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll
 
@@ -13 +13 @@
 dnl help for configure
 dnl
-AC_ARG_WITH(
-  mtrack,
-  [  --with-mtrack           use mpr routines for extended memory tracking
-                             -- works only under ix86-Linux])
 AC_ARG_WITH(
   align8,
@@ -23 +19 @@
   align8,
   [  --enable-stat           enable memory statistics])
+AC_ARG_ENABLE(
+  mtrack,
+  [  --disable-mtrack        disable backtrace and memory track])
 AC_ARG_WITH(
-  mtrack,
-  [  --disable-mtrack        disable memory track])
+  return_addr_func,
+  [  --with_return_addr_func=FUNC
+                             use FUNC as function for determening return addr
+                             Default: __bultin_return_address])
+AC_ARG_WITH(
+  frame_addr_func,
+  [  --with_frame_addr_func=FUNC
+                             use FUNC as function for determening frame addr
+                             Default: __bultin_frame_address])
+
                              
 
@@ -97 +104 @@
 
 if test "$enable_mtrack" != no; then
-# functions which crawl up the stack from return and frame addr
+
+# get function for return address
+if test "${with_return_addr_func+set}" = set; then
+if test "${with_return_addr_func}" != no; then
+  ac_cv_return_addr_func=$with_return_addr_func
+fi
+else
 if test "${GCC}" = yes; then
-  ac_cv_func_return_addr="__builtin_return_address"
-  AC_DEFINE_UNQUOTED(OM_RETURN_ADDR, __builtin_return_address)
-  ac_cv_func_frame_addr="__builtin_frame_address"
-  AC_DEFINE_UNQUOTED(OM_FRAME_ADDR, __builtin_frame_address)
-fi
-
-# test them
-if test "${ac_cv_func_return_addr+set}" = set; then
-# first, check whether return addr 
-AC_MSG_CHECKING(whether $ac_cv_func_return_addr works)
-AC_CACHE_VAL(ac_cv_func_return_addr_works,
+  ac_cv_return_addr_func="__builtin_return_address"
+fi
+fi
+
+# test this function
+if test "${ac_cv_return_addr_func+set}" = set; then
+AC_DEFINE_UNQUOTED(OM_RETURN_ADDR, $ac_cv_return_addr_func)
+# first, check whether return addr works
+AC_MSG_CHECKING(whether $ac_cv_return_addr_func works)
+AC_CACHE_VAL(ac_cv_return_addr_func_works,
 AC_TRY_RUN([
 int test_return_addr()
 {
-   if (OM_RETURN_ADDR(1)  != 0 && OM_RETURN_ADDR(0) != 0) return 0;
+   if (OM_RETURN_ADDR(1)  != 0 && OM_RETURN_ADDR(0) != 0 && 
+       OM_RETURN_ADDR(1) != OM_RETURN_ADDR(0)) return 0;
    return 1;
 }
@@ -121 +134 @@
    return test_return_addr();
 }
-], ac_cv_func_return_addr_works=yes,  
-   ac_cv_func_return_addr_works=no,
-   ac_cv_func_return_addr_works=no))
-AC_MSG_RESULT($ac_cv_func_return_addr_works)
-
-if test "$ac_cv_func_return_addr_works" = yes; then
-AC_DEFINE_UNQUOTED(OM_RETURN_ADDR_WORKS)
-if test "${ac_cv_func_frame_addr+set}" = set; then
-# first, check whether return addr 
-AC_MSG_CHECKING(whether $ac_cv_func_frame_addr works)
-AC_CACHE_VAL(ac_cv_func_frame_addr_works,
+], ac_cv_return_addr_func_works=yes,  
+   ac_cv_return_addr_func_works=no,
+   ac_cv_return_addr_func_works=no))
+AC_MSG_RESULT($ac_cv_return_addr_func_works)
+
+if test "$ac_cv_return_addr_func_works" = yes; then
+AC_DEFINE(OM_RETURN_ADDR_WORKS)
+# check whether return addr works with rvalues
+AC_MSG_CHECKING(whether $ac_cv_return_addr_func takes rvalues)
+AC_CACHE_VAL(ac_cv_return_addr_func_rvalue,
+AC_TRY_RUN([
+int test_return_addr(int f1, int f2)
+{
+   if (OM_RETURN_ADDR(f1)  != 0 && OM_RETURN_ADDR(f0) != 0 &&
+       OM_RETURN_ADDR(f1) != OM_RETURN_ADDR(f0)) return 0;
+   return 1;
+}
+
+int main()
+{
+   return test_return_addr(1, 0);
+}
+], ac_cv_return_addr_func_rvalue=yes,  
+   ac_cv_return_addr_func_rvalue=no,
+   ac_cv_return_addr_func_rvalue=no))
+AC_MSG_RESULT($ac_cv_return_addr_func_rvalue)
+if test "$ac_cv_return_addr_func_rvalue" = yes; then
+  AC_DEFINE_UNQUOTED(OM_RETURN_ADDR_RVALUE)
+fi
+fi # "$ac_cv_return_addr_func_works" = yes;
+fi # "${ac_cv_return_addr_func+set}" = set;
+
+# get function for frame address
+if test "${with_frame_addr_func+set}" = set; then
+if test "${with_frame_addr_func}" != no; then
+  ac_cv_frame_addr_func=$with_frame_addr_func
+fi
+else
+if test "${GCC}" = yes; then
+  ac_cv_frame_addr_func="__builtin_frame_address"
+fi
+fi
+
+# test this function
+if test "${ac_cv_frame_addr_func+set}" = set; then
+AC_DEFINE_UNQUOTED(OM_FRAME_ADDR, $ac_cv_frame_addr_func)
+# first, check whether frame addr works
+AC_MSG_CHECKING(whether $ac_cv_frame_addr_func works)
+AC_CACHE_VAL(ac_cv_frame_addr_func_works,
 AC_TRY_RUN([
 int test_frame_addr()
 {
-   if (OM_FRAME_ADDR(1)  != 0 && OM_FRAME_ADDR(0) != 0) return 0;
+   if (OM_FRAME_ADDR(1)  != 0 && OM_FRAME_ADDR(0) != 0 && 
+       OM_FRAME_ADDR(1) != OM_FRAME_ADDR(0)) return 0;
    return 1;
 }
@@ -143 +195 @@
    return test_frame_addr();
 }
-], ac_cv_func_frame_addr_works=yes,  
-   ac_cv_func_frame_addr_works=no,
-   ac_cv_func_frame_addr_works=no))
-AC_MSG_RESULT($ac_cv_func_frame_addr_works)
-
-if test "$ac_cv_func_frame_addr_works" = yes; then
-AC_DEFINE_UNQUOTED(OM_FRAME_ADDR_WORKS)
-fi
-fi  # "${ac_cv_func_frame_addr+set}" = set
-fi  # "$ac_cv_func_return_addr_works" = yes
-fi  # "${ac_cv_func_return_addr+set}" = set
+], ac_cv_frame_addr_func_works=yes,  
+   ac_cv_frame_addr_func_works=no,
+   ac_cv_frame_addr_func_works=no))
+AC_MSG_RESULT($ac_cv_frame_addr_func_works)
+
+if test "$ac_cv_frame_addr_func_works" = yes; then
+AC_DEFINE(OM_FRAME_ADDR_WORKS)
+# check whether frame addr works with rvalues
+AC_MSG_CHECKING(whether $ac_cv_frame_addr_func takes rvalues)
+AC_CACHE_VAL(ac_cv_frame_addr_func_rvalue,
+AC_TRY_RUN([
+int test_frame_addr(int f1, int f2)
+{
+   if (OM_FRAME_ADDR(f1)  != 0 && OM_FRAME_ADDR(f0) != 0 &&
+       OM_FRAME_ADDR(f1) != OM_FRAME_ADDR(f0)) return 0;
+   return 1;
+}
+
+int main()
+{
+   return test_frame_addr(1, 0);
+}
+], ac_cv_frame_addr_func_rvalue=yes,  
+   ac_cv_frame_addr_func_rvalue=no,
+   ac_cv_frame_addr_func_rvalue=no))
+AC_MSG_RESULT($ac_cv_frame_addr_func_rvalue)
+if test "$ac_cv_frame_addr_func_rvalue" = yes; then
+  AC_DEFINE_UNQUOTED(OM_FRAME_ADDR_RVALUE)
+fi
+fi # "$ac_cv_frame_addr_func_works" = yes;
+fi # "${ac_cv_frame_addr_func+set}" = set;
+
 fi  # "$enable_mtrack" != no;
 

omalloc/omAlloc.c

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omAlloc.c,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omAlloc.c,v 1.2 1999-11-22 18:12:57 obachman Exp $
  *******************************************************************/
 #ifndef OM_ALLOC_C
@@ -25 +25 @@
 
 
-#if 0
-#include "mmemory.h"
-#else
 #include <stdlib.h>
-#define AllocSizeOf(x) malloc(sizeof(x))
-#define FreeSizeOf(addr, x) free(addr)
-#endif
+#define AllocSizeOf(x) _omAllocBlock(sizeof(x))
+#define FreeSizeOf(addr, x) _omFreeBin(addr)
 
 /* Get new page and initialize */
@@ -129 +125 @@
 
 /* bin->current_page is empty, get new bin->current_page, return addr*/
-void* omAllocBinFromFullPage(omBinPage page, omBin bin)
+void* omAllocBinFromFullPage(omBin bin)
 {
   void* addr;
@@ -135 +131 @@
   omAssume(bin->current_page->current == NULL);
   
+  if (bin->current_page != om_ZeroPage)
+  {
+    omAssume(bin->last_page != NULL);
+    bin->current_page->used_blocks = 0;
+  }
+
   if (bin->current_page->next != NULL)
   {
@@ -154 +156 @@
 }
 
-void* omAllocBlockFromFullPage(omBinPage page, omBin bin, 
-                               const size_t size, const int zero)
-{
-  void* addr;
-  
-  if (bin == om_LargeBin)
-  {
-    addr = omMallocFromSystem(size + SIZEOF_OM_ALIGNMENT);
-    if (zero) memset(addr, 0, size);
-    return addr;
-  }
-  else
-  {
-    addr = omAllocBinFromFullPage(page, bin);
-    if (zero) omMemsetW(addr, 0, bin->sizeW);
-    return addr;
-  }
-}
 
 /* page->used_blocks == 0, so, either free page or reallocate to 
@@ -194 +178 @@
   else
   {
-    bin = omBinOfPage(page);
+    bin = omGetBinOfPage(page);
     if (page->current != NULL || bin->max_blocks <= 1)
     {
@@ -277 +261 @@
     s_bin->bin->current_page = om_ZeroPage;
     s_bin->bin->last_page = NULL;
+    s_bin->bin->next = NULL;
     s_bin->bin->sizeW = sizeW;
     s_bin->bin->max_blocks = max_blocks;
@@ -396 +381 @@
 }
 
-static void omPrintBinStat(FILE * fd, omBin bin)
+void omPrintBinStat(FILE * fd, omBin bin)
 {
   int pages = 0, used_blocks = 0, free_blocks = 0;
@@ -432 +417 @@
 }
  
-#if 0   
 /*****************************************************************
  *
@@ -485 +469 @@
 {
   omBin s_bin;
-  omCheckBin(bin);
   s_bin = omGetStickyBin(bin, sticky_tag);
   
@@ -506 +489 @@
 }
 
-void omUnsetStickyBinTag(omBin bin, unsigned long sticky)
+void omUnSetStickyBinTag(omBin bin, unsigned long sticky)
 {
   omAssume(omGetStickyBin(bin, 0) != NULL);
@@ -515 +498 @@
 static void omMergeStickyPages(omBin to_bin, omBin from_bin)
 {
+#ifdef HAVE_OM_ASSUME
+  int length = omGListLength(to_bin->last_page, prev) +
+    omGListLength(from_bin->last_page, prev);
+#endif  
+  
   omBinPage page = from_bin->last_page;
+  omAssume(to_bin->sticky == 0);
+  omAssume(to_bin->sizeW == from_bin->sizeW);
+  omAssume(to_bin != from_bin);
+  omAssume(omIsOnGList(to_bin->next, next, from_bin) 
+           || 
+           omIsOnGList(from_bin->next, next, to_bin));
 
   if (page == NULL) return;
@@ -528 +522 @@
   if (to_bin->last_page == NULL)
   {
+    omAssume(to_bin->current_page == om_ZeroPage);
     to_bin->last_page = from_bin->last_page;
     to_bin->current_page = from_bin->current_page;
@@ -533 +528 @@
   }
   
+  omAssume(to_bin->current_page != om_ZeroPage && 
+           to_bin->current_page != NULL);
+
   if (to_bin->current_page->current != NULL)
   {
@@ -544 +542 @@
     to_bin->current_page = to_bin->current_page->prev;
   }
-  
-  if (to_bin->current_page->prev != NULL)
-  {
-    to_bin->current_page->prev->next = page;
-    page->prev = to_bin->current_page->prev;
-  }
-  from_bin->last_page->next = to_bin->current_page;
-  to_bin->current_page->prev = from_bin->last_page;
+  else
+  {
+    /* need to reset this here, since new current_page is going to be
+       from_bin->current_page, and only for current_page may we have 
+       used_blocks != 0 && current == NULL */
+    to_bin->current_page->used_blocks = 0;
+  }
+  
+
+  omAssume(to_bin->current_page != NULL && 
+           to_bin->current_page->current == NULL &&
+           to_bin->current_page->used_blocks == 0);
+
+  from_bin->last_page->next = to_bin->current_page->next;
+  if (to_bin->current_page->next != NULL) 
+    to_bin->current_page->next->prev =  from_bin->last_page;
+  else
+  {
+    omAssume(to_bin->current_page == to_bin->last_page);
+    to_bin->last_page = from_bin->last_page;
+  }
+  to_bin->current_page->next = page;
+  page->prev = to_bin->current_page;
   to_bin->current_page = from_bin->current_page;
-}
+  
+#ifdef HAVE_OM_ASSUME
+  omAssume(omGListLength(to_bin->last_page, prev) == length);
+#endif
+}
+
+#include "omDebug.h"
   
 void omDeleteStickyBinTag(omBin bin, unsigned long sticky)
@@ -559 +578 @@
   omBin no_sticky_bin = NULL;
   omBin sticky_bin = NULL;
-  
+
+  omdCheckBin(bin, 10);
   if (sticky == 0)
   {
@@ -566 +586 @@
   }
   
-  omCheckBin(bin);
-  
   sticky_bin = omGetStickyBin(bin, sticky);
   if (sticky_bin != NULL)
@@ -575 +593 @@
 
     omMergeStickyPages(no_sticky_bin, sticky_bin);
-    omCheckBin(no_sticky_bin);
 
     if (bin == sticky_bin) 
@@ -585 +602 @@
     FreeSizeOf(sticky_bin, omBin_t);
   }
-  omCheckBin(bin);
+  omdCheckBin(bin, 10);
 }
 
@@ -595 +612 @@
 *
 *****************************************************************/
-
-#ifdef BIN_DEBUG
-static BOOLEAN omIsKnownBin(omBin bin)
-{
-  int i;
-  mem_SpecBin s_bin;
-  
-  for (i=0; i<=MAX_BIN_INDEX; i++)
-  {
-    if (bin == &om_StaticBin[i]) return TRUE;
-  }
-  
-  mem_SpecBin s_bin = om_SpecBins;
-  while (s_bin != NULL) 
-  {
-    if (s_bin->bin == bin) return TRUE;
-    s_bin = s_bin->next;
-  }
-  return FALSE;
-}
-
-static BOOLEAN omDebugCheckAllBins(const char* fn, int l)
-{
-  int i;
-  mem_SpecBin s_bin = om_SpecBins;
-  BOOLEAN return = TRUE;
-  for (i=0; i<=MAX_BIN_INDEX; i++)
-  {
-    ret = ret && omDebugCheckBin(&(om_StaticBin[i]), fn, l);
-  }
-  while (s_bin != NULL) 
-  {
-    ret = ret && omDebugCheckBin(s_bin->bin, fn, l);
-    s_bin = s_bin->next;
-  }
-  return ret;
-}
-#endif
-
-
 unsigned long omGetNewStickyAllBinTag()
 {
@@ -641 +618 @@
   omSpecBin s_bin;
   // first, find new sticky tag
-  for (i=0; i<=MAX_BIN_INDEX; i++)
+  for (i=0; i<=OM_MAX_BIN_INDEX; i++)
   {
     new_sticky = omGetMaxStickyBinTag(&(om_StaticBin[i]));
     if (new_sticky > sticky) sticky = new_sticky;
   }
+  s_bin = om_SpecBin;
   while (s_bin != NULL) 
   {
@@ -655 +633 @@
   {
     sticky++;
-    for (i=0; i<=MAX_BIN_INDEX; i++)
+    for (i=0; i<=OM_MAX_BIN_INDEX; i++)
     {
       omCreateStickyBin(&(om_StaticBin[i]), sticky);
@@ -671 +649 @@
     omBin bin;
     omAssume(sticky == BIT_SIZEOF_LONG - 1);
-    for (i=0; i<=MAX_BIN_INDEX; i++)
+    for (i=0; i<=OM_MAX_BIN_INDEX; i++)
     {
       bin = &om_StaticBin[i];
@@ -692 +670 @@
   omSpecBin s_bin = om_SpecBin;
   int i;
-  for (i=0; i<=MAX_BIN_INDEX; i++)
+  for (i=0; i<=OM_MAX_BIN_INDEX; i++)
   {
     omSetStickyBinTag(&(om_StaticBin[i]), sticky);
@@ -707 +685 @@
   omSpecBin s_bin = om_SpecBin;
   int i;
-  for (i=0; i<=MAX_BIN_INDEX; i++)
+  for (i=0; i<=OM_MAX_BIN_INDEX; i++)
   {
     omUnSetStickyBinTag(&(om_StaticBin[i]), sticky);
@@ -722 +700 @@
   omSpecBin s_bin = om_SpecBin;
   int i;
-  for (i=0; i<=MAX_BIN_INDEX; i++)
+  for (i=0; i<=OM_MAX_BIN_INDEX; i++)
   {
     omDeleteStickyBinTag(&(om_StaticBin[i]), sticky);
@@ -733 +711 @@
 }
 
-#endif                       
-
 #endif /* OM_ALLOC_C */

omalloc/omConfig.h.in

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omConfig.h.in,v 1.1.1.1 1999-11-18 17:45:52 obachman Exp $
+ *  Version: $Id: omConfig.h.in,v 1.2 1999-11-22 18:12:58 obachman Exp $
  *******************************************************************/
 #ifndef OM_CONFIG_H
@@ -61 +61 @@
 #ifndef OM_FRAME_ADDR_WORKS
 #undef OM_FRAME_ADDR_WORKS
+#endif
+/* define if OM_RETURN_ADDR actually rvalue */
+#ifndef OM_RETURN_ADDR_RVALUE
+#undef OM_RETURN_ADDR_RVALUE
+#endif
+/* define if OM_FRAME_ADDR actually rvalue */
+#ifndef OM_FRAME_ADDR_RVALUE
+#undef OM_FRAME_ADDR_RVALUE
 #endif
 /* Define sizeof(long) */

omalloc/omDebug.c

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebug.c,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omDebug.c,v 1.2 1999-11-22 18:12:58 obachman Exp $
  *******************************************************************/
 #include "omConfig.h"
@@ -12 +12 @@
 #include "omDebug.h"
 
-static int omdCheckBinAddrSize(void* addr, omBin bin, size_t size,
-                               int level, const char* fn, const int l);
-static int omdPrintBinError(const char* msg, void* addr, size_t size,omBin bin,
-                            const char* fn, const int l);
-static const char* omdTestBinAddrSize(void* addr, omBin bin, size_t size, 
-                                      int level);
+static int omdCheckBinAddrSize(void* addr, size_t size, int level);
+static int omdPrintBinError(const char* msg, void* addr, size_t size,
+                            omBin bin);
+static const char* omdTestBinAddrSize(void* addr, size_t size, int level, 
+                                      omBin *bin);
 static const char* omdTestBin(omBin bin, int level);
 static const char* omdTestBinPage(omBinPage page, int level);
-static int   omdIsKnownBin(omBin bin);
+static int   omdIsKnownTopBin(omBin bin);
 
 /*******************************************************************
@@ -27 +26 @@
  *  
  *******************************************************************/
-int omdCheckBinAddr(void* addr, omBin bin, int level, 
-                    const char* fn, const int l)
-{
-  if (! omdCheckBinAddrSize(addr, bin, bin->sizeW*SIZEOF_LONG, level, fn, l))
+int omdCheckBinAddr(void* addr, int level)
+{
+  return omdCheckBinAddrSize(addr, 0, level);
+}
+
+int omdCheckBlockAddr(void* addr, size_t size, int level)
+{
+  if (size == 0)
+  {
+    omError("0 size");
     return 0;
-  return omdCheckBins(level - 2, fn, l);
-}
-
-int omdCheckBlockAddr(void* addr, size_t size, int level, 
-                      const char* fn, const int l)
-{
-  omBin bin = omSize2Bin(size);
-  if (bin != om_LargeBin && 
-      ! omdCheckBinAddrSize(addr, bin, size, level, fn, l))
-    return 0;
-  return omdCheckBins(level - 2, fn, l);
-}
-
-int omdCheckChunkAddr(void* addr, int level, const char* fn, const int l)
+  }
+  if (size <= OM_MAX_BLOCK_SIZE)
+    return omdCheckBinAddrSize(addr, size, level);
+  else
+    return 1;
+}
+
+int omdCheckChunkAddr(void* addr, int level)
 {
   omBinPage page;
   addr = addr - SIZEOF_OM_ALIGNMENT;
   page = *((omBinPage*) addr);
-  if (page != om_LargePage &&
-      ! omdCheckBinAddr(addr, omBinOfPage(page), level, fn, l))
-    return 0;
-  return omdCheckBins(level - 2, fn, l);
+  if (page != om_LargePage)
+    return omdCheckBinAddrSize(addr, -1, level);
+  else
+    return 1;
 }
     
@@ -61 +60 @@
  *  
  *******************************************************************/
-static int omdIsKnownBin(omBin bin)
+static int omdIsKnownTopBin(omBin bin)
 {
   int i = 0;
@@ -81 +80 @@
 }
 
-int omdCheckBin(omBin bin, int level, const char* fn, const int l)
+int omdCheckBin(omBin bin, int level)
 {
   const char* msg = omdTestBin(bin, level);
   if (msg != NULL) 
   {
-    if (fn != NULL) omdPrintBinError(msg, NULL, 0, bin, fn, l);
+    omdPrintBinError(msg, NULL, 0, bin);
     return 0;
   }
@@ -92 +91 @@
 }
 
-int omdCheckBins(int level, const char* fn, const int l)
+int omdCheckBins(int level)
 {
   if (level <= 0)
@@ -106 +105 @@
     for (i=0; i<= OM_MAX_BIN_INDEX; i++)
     {
-      if (! omdCheckBin(&om_StaticBin[i], level, fn, l)) return 0;
+      if (! omdCheckBin(&om_StaticBin[i], level)) return 0;
     }
     s_bin = om_SpecBin;
     while (s_bin != NULL)
     {
-      if (! omdCheckBin(s_bin->bin, level, fn, l)) return 0;
+      if (! omdCheckBin(s_bin->bin, level)) return 0;
       s_bin = s_bin->next;
     }
@@ -124 +123 @@
  *******************************************************************/
 
-void* omdCheckAllocBin(omBin bin, const int zero, int level, 
-                       const char* fn, const int l)
+void* omdCheckAllocBin(omBin bin, const int zero, int level)
 {
   void* res;
   
-  omdCheckBins(level-2, fn, l);
+  omdCheckBins(level-2);
 
   if (zero)
@@ -136 +134 @@
     __omTypeAllocBin(void*, res, bin);
 
-  omdCheckBinAddr(res, bin, level-1,fn, l);
-  omdCheckBins(level-2, fn, l);
+  omdCheckBinAddr(res, level-1);
+  omdCheckBins(level-2);
 
   return res;
 }
   
-void  omdCheckFreeBin(void* addr, omBin bin, 
-                      int level, const char* fn, const int l)
-{
-  omdCheckBins(level-2, fn, l);
-
-  if (omdCheckBinAddr(addr, bin, level, fn, l))
+void  omdCheckFreeBin(void* addr, int level)
+{
+  omdCheckBins(level-2);
+
+  if (omdCheckBinAddr(addr, level))
     __omFreeBin(addr);
 
-  omdCheckBin(bin, level - 1, fn, l);
-  omdCheckBins(level - 2, fn, l);
-}
-
-void* omdCheckAllocBlock(size_t size, const int zero, 
-                        int level, const char* fn, const int l)
+  omdCheckBins(level - 2);
+}
+
+void* omdCheckAllocBlock(size_t size, const int zero, int level)
 {
   void* res;
@@ -161 +156 @@
   if (level > 0 && size <= 0) 
   {
-    if (fn != NULL) omdPrintBinError("requested AllocBlock size <= 0", 
-                                     NULL, size, NULL, fn, l);
+    omdPrintBinError("requested AllocBlock size <= 0", 
+                     NULL, size, NULL);
     size = 1;
   }
 
-  omdCheckBins(level-2, fn, l);
+  omdCheckBins(level-2);
 
   if (zero)
@@ -173 +168 @@
     __omTypeAllocBlock(void*, res, size);
   
-  omdCheckBlockAddr(res, size, level - 1, fn, l);
-  omdCheckBins(level - 2, fn, l);
+  omdCheckBlockAddr(res, size, level - 1);
+  omdCheckBins(level - 2);
 
   return res;
 }
 
-void omdCheckFreeBlock(void* addr, size_t size, 
-                       int level, const char* fn, const int l)
-{
-  omdCheckBins(level - 2, fn, l);
-  if (! omdCheckBlockAddr(addr, size, level, fn, l)) return;
+void omdCheckFreeBlock(void* addr, size_t size, int level)
+{
+  omdCheckBins(level - 2);
+  if (! omdCheckBlockAddr(addr, size, level)) return;
   
   __omFreeBlock(addr, size);
   
-  omdCheckBins(level - 2, fn, l);
-}
-
-
-void* omdCheckAllocChunk(size_t size, const int zero, 
-                        int level, const char* fn, const int l)
+  omdCheckBins(level - 2);
+}
+
+
+void* omdCheckAllocChunk(size_t size, const int zero, int level)
 {
   void* res;
@@ -198 +191 @@
   if (level > 0 && size <= 0) 
   {
-    if (fn != NULL) omdPrintBinError("requested AllocBlock size <= 0", 
-                                     NULL, size, NULL, fn, l);
+    omdPrintBinError("requested AllocBlock size <= 0", 
+                     NULL, size, NULL);
     size = 1;
   }
-  omdCheckBins(level - 2, fn, l);
+  omdCheckBins(level - 2);
 
   if (zero)
@@ -209 +202 @@
     __omTypeAllocChunk(void*, res, size);
   
-  omdCheckChunkAddr(res, level - 1, fn, l);
-  omdCheckBins(level - 2, fn, l);
+  omdCheckChunkAddr(res, level - 1);
+  omdCheckBins(level - 2);
 
   return res;
 }
 
-void omdCheckFreeChunk(void* addr, int level, const char* fn, const int l)
-{
-  if (! omdCheckChunkAddr(addr, level, fn, l)) return;
+void omdCheckFreeChunk(void* addr, int level)
+{
+  if (! omdCheckChunkAddr(addr, level)) return;
   
   __omFreeChunk(addr);
   
-  omdCheckBins(level - 2, fn, l);
+  omdCheckBins(level - 2);
 }
 
@@ -230 +223 @@
  *  
  *******************************************************************/
-static int omdPrintBinError(const char* msg, void* addr, size_t size,omBin bin,
-                            const char* fn, const int l)
+static int omdPrintBinError(const char* msg, void* addr, size_t size,omBin bin)
 {
   fprintf(stderr, 
-          "***BinError:
-%s: occured for addr:%p (%d) bin:%p (%ld:%ld) in %s:%d\n",
-          msg, addr, size, (void*) bin, 
+          "for addr:%p (%d) bin:%p (%ld:%ld)\n",
+          addr, size, (void*) bin, 
           (bin != NULL ? bin->max_blocks : 0), 
-          (bin != NULL ? bin->sizeW : 0), fn, l);
+          (bin != NULL ? bin->sizeW : 0));
+  fflush(stderr);
   return 0;
 }
 
-static int omdCheckBinAddrSize(void* addr, omBin bin, size_t size,
-                               int level, const char* fn, const int l)
-{
-  const char* msg = omdTestBinAddrSize(addr, bin, size, level);
+static int omdCheckBinAddrSize(void* addr, size_t size, int level)
+{
+  omBin bin = NULL;
+  const char* msg = omdTestBinAddrSize(addr, size, level, &bin);
   if (msg != NULL)
-    return omdPrintBinError(msg, addr, size, bin, fn, l);
+    return omdPrintBinError(msg, addr, size, bin);
   else
     return 1;
@@ -255 +247 @@
 /* Check that addr is activ (used) adr of bin */
 static const char* 
-omdTestBinAddrSize(void* addr, omBin bin, size_t size, int level)
-{
+omdTestBinAddrSize(void* addr, size_t size, int level, omBin* r_bin)
+{
+  omBin bin;
   omBinPage page;
   omBin h_bin;
   const char* msg;
   
-
   if (level <= 0) return NULL;
   
   if (addr == NULL) return omError("NULL addr");
+
+  if (size > OM_MAX_BLOCK_SIZE) return NULL;
+
+  bin = omGetTopBinOfAddr(addr);
+  
   if (bin == NULL) return omError("NULL Bin");
 
-  if (! omdIsKnownBin(bin))
+  if (! omdIsKnownTopBin(bin))
     return omError("Addr not from Bin (Bin unknown)");
+  *r_bin = bin;
   
   if ((msg = omdTestBin(bin, level - 1)) != NULL) return msg;
 
   // check for right bin
-  if (omIsStaticBin(bin))
-    h_bin = omSize2Bin(size);
-  else
-    h_bin = omGetSpecBin(size);
-  if (bin != h_bin) return omError("size is wrong");
-  if (! omIsStaticBin(bin)) omUnGetSpecBin(&h_bin);
+  if (size > 0)
+  {
+    if (omIsStaticBin(bin))
+      h_bin = omSize2Bin(size);
+    else
+      h_bin = omGetSpecBin(size);
+    if (bin != h_bin) return omError("size is wrong");
+    if (! omIsStaticBin(bin)) omUnGetSpecBin(&h_bin);
+  }
 
   // check page 
@@ -285 +286 @@
   
   // look that page is in queue of pages of this Bin
-  h_bin = omBinOfPage(page);
+  h_bin = omGetBinOfPage(page);
+  *r_bin = h_bin;
   if ( ! omIsOnGList(h_bin->last_page, prev, page))
     return omError("page of addr not from this Bin");
@@ -347 +349 @@
   {
     void* current = page->current;
+    int i = 1;
     if (current != NULL &&
         omListLength(current) != bin->max_blocks - page->used_blocks - 1)
@@ -362 +365 @@
            != 0)
         return omError("current has unaligned adress");
-      current = *((void**) (current + SIZEOF_VOIDP));
+      current = *((void**) current);
+      i++;
     }
   }
@@ -379 +383 @@
   if (bin == NULL) return omError("NULL Bin");
 
-  if (! omdIsKnownBin(bin)) return omError("Bin unknown");
+  if (! omdIsKnownTopBin(bin)) return omError("TopBin unknown");
   
   if (level > 2 && 
@@ -440 +444 @@
         return omError("Sticky of page wrong");
 
-      if (omBinOfPage(page) != bin)
+      if (omGetBinOfPage(page) != bin)
         return omError("Bin of Page wrong");
        
@@ -457 +461 @@
         {
           if (page->current == NULL ||
-              page->used_blocks == 0 ||
+              page->used_blocks < 0 ||
               page->used_blocks == bin->max_blocks - 1)
             return omError("used_blocks and current of upage out of sync");

omalloc/omDebug.h

@@ -4 +4 @@
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omDebug.h,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omDebug.h,v 1.2 1999-11-22 18:12:58 obachman Exp $
  *******************************************************************/
-int omdCheckBinAddr(void* addr, omBin bin, 
-                    int level, const char* fn, const int l);
-int omdCheckBlockAddr(void* addr, size_t size,  
-                      int level, const char* fn, const int l);
-int omCheckChunkAddr(void* adr, const char* fn, const int l);
+int omdCheckBinAddr(void* addr, int level);
+int omdCheckBlockAddr(void* addr, size_t size, int level);
+int omdCheckChunkAddr(void* adr, int level);
 
-int omdCheckBin(omBin bin, int level, const char* fn, const int l);
-int omdCheckBins(int level, const char* fn, const int l);
+int omdCheckBin(omBin bin, int level);
+int omdCheckBins(int level);
 
-void* omdCheckAllocBin(omBin bin, int zero, 
-                       int level, const char* fn, const int l);
-void  omdCheckFreeBin(void* addr,  omBin bin, 
-                      int level, const char* fn, int l);
-void* omdCheckAllocBlock(size_t size, int zero,  
-                         int level, const char* fn, const int l);
-void  omdCheckFreeBlock(void* addr, size_t size,  
-                        int level, const char* fn, const int l);
-void* omdCheckAllocChunk(size_t size, int zero,  
-                         int level, const char* fn, const int l);
-void omdCheckFreeChunk(void* addr, int level, const char* fn, const int l);
+void* omdCheckAllocBin(omBin bin, int zero,int level);
+void  omdCheckFreeBin(void* addr,  int level);
+void* omdCheckAllocBlock(size_t size, int zero, int level);
+void  omdCheckFreeBlock(void* addr, size_t size, int level);
+void* omdCheckAllocChunk(size_t size, int zero, int level);
+void omdCheckFreeChunk(void* addr, int level);
 
 

omalloc/omList.c

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omList.c,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omList.c,v 1.2 1999-11-22 18:12:59 obachman Exp $
  *******************************************************************/
 #ifndef NULL
@@ -157 +157 @@
     void* curr = NEXT(list);
     
-    while (curr != NULL && VALUE(list, long_field) < what)
+    while (curr != NULL && VALUE(curr, long_field) < what)
     {
       prev = curr;

omalloc/omLocal.c

@@ -5 +5 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omLocal.c,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omLocal.c,v 1.2 1999-11-22 18:12:59 obachman Exp $
  *******************************************************************/
 
@@ -13 +13 @@
 #include "omLocal.h"
 #include "omPage.h"
+#include "omTrack.h"
 
-const char* omReportError(const char* msg, const char* file, const int line)
+const char* omReportError(const char* msg)
 {
-  fprintf(stderr, "***Error: %s in %s:%d\n", msg, file, line);
+  fprintf(stderr, "***Error: %s: occured at \n", msg);
+  omPrintCurrentBackTrace(1, 20, stderr);
   return msg;
 }

omalloc/omLocal.h

@@ -5 +5 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omLocal.h,v 1.1.1.1 1999-11-18 17:45:52 obachman Exp $
+ *  Version: $Id: omLocal.h,v 1.2 1999-11-22 18:12:59 obachman Exp $
  *******************************************************************/
 #ifndef OM_LOCAL_H
@@ -44 +44 @@
   (page)->bin_sticky= (void*)((unsigned long)sticky + (unsigned long)bin)
 
+#define omGetTopBinOfAddr(addr) \
+  omGetTopBinOfPage(((omBinPage) omGetPageOfAddr(addr)))
 
 #if defined(OM_INLINE) || defined(OM_ALLOC_C)
-OM_INLINE omBin omBinOfPage(omBinPage page)
+OM_INLINE omBin omGetBinOfPage(omBinPage page)
 {
   unsigned long sticky = omGetStickyOfPage(page);
@@ -57 +59 @@
   return bin;
 }
+OM_INLINE omBin omGetBinOfAddr(void* addr)
+{
+  return omGetBinOfPage(omGetPageOfAddr(addr));
+}
 #else
-extern omBin omBinOfPage(omBinPage page);
+extern omBin omGetBinOfPage(omBinPage page);
+extern omBin omGetBinOfAddr(void* addr);
 #endif /* defined(OM_INLINE) || defined(OM_ALLOC_C) */
 
@@ -69 +76 @@
 extern int omIsStaticBin(omBin bin);
 extern void omPrintBinStats(FILE* fd);
+extern void omPrintBinStat(FILE * fd, omBin bin);
 
 /*******************************************************************
@@ -77 +85 @@
 #ifndef HAVE_OM_ASSUME
 
-#define omError(msg)    (msg)
 #define omAssume(x) ((void) 0)
 
 #else /* ! HAVE_OM_ASSUME */
 
-extern const char* omReportError(const char* msg, 
-                                 const char* file, const int line);
-
-#define omError(msg)  omReportError(msg, __FILE__, __LINE__)
-#define omAssume(x)   _omAssume(x, __FILE__, __LINE__)  
-
-#define _omAssume(x, f, l)                      \
+#define omAssume(x)                             \
 do                                              \
 {                                               \
   if (! (x))                                    \
   {                                             \
-    omReportError("omAssume violation", f, l);  \
+    omReportError("omAssume violation");        \
   }                                             \
 }                                               \
@@ -99 +100 @@
 
 #endif /* HAVE_OM_ASSUME */
+
+extern const char* omReportError(const char* msg);
+#define omError(msg)  omReportError(msg)
 
 /*******************************************************************

omalloc/omPrivate.h

@@ -5 +5 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omPrivate.h,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omPrivate.h,v 1.2 1999-11-22 18:12:59 obachman Exp $
  *******************************************************************/
 #ifndef OM_PRIVATE_H
@@ -11 +11 @@
 
 #include <stdlib.h>
+#include <string.h>
+
 /*******************************************************************
  *  
@@ -100 +102 @@
  
 
-#define omSize2Bin(size) \
-  ((size) <= OM_MAX_BLOCK_SIZE ? \
-   om_Size2Bin[((size) -1) >> LOG_SIZEOF_OM_ALIGNMENT] : \
-   om_LargeBin) 
 
 /*******************************************************************
@@ -110 +108 @@
  *  
  *******************************************************************/
-extern void* omAllocBinFromFullPage(omBinPage page, omBin bin);
-extern void* omAllocBlockFromFullPage(omBinPage page, omBin bin, 
-                                      const size_t size, const int zero);
+extern void* omAllocBinFromFullPage(omBin bin);
 extern void  omFreeToPageFault(omBinPage page, void* addr);
 
@@ -133 +129 @@
 do                                              \
 {                                               \
-  if ((page)->used_blocks > 0)                 \
+  if ((page)->used_blocks > 0)                  \
   {                                             \
     *((void**)addr) = (page)->current;          \
@@ -148 +144 @@
 
 /*******************************************************************/
-/* Bin                                                            */
-#define __omTypeAllocBin(type, addr, bin)             \
+/* Bin                                                             */
+#define __omTypeAllocBin(type, addr, bin)               \
 do                                                      \
 {                                                       \
-  register omBinPage __om_page = (bin)->current_page; \
+  register omBinPage __om_page = (bin)->current_page;   \
   if (__om_page->current != NULL)                       \
     __omTypeAllocFromPage(type, addr, __om_page);       \
   else                                                  \
-    addr = (type) omAllocBinFromFullPage(__om_page, bin); \
+    addr = (type) omAllocBinFromFullPage(bin);          \
 }                                                       \
 while (0)
 
-#define __omTypeAlloc0Bin(type, addr, bin)    \
-do                                              \
-{                                               \
-  __omTypeAllocBin(type, addr, bin);          \
-  omMemsetW(addr, 0, (bin)->sizeW);            \
-}                                               \
-while (0)
-
-#define __omFreeBin(addr)                                      \
+#define __omTypeAlloc0Bin(type, addr, bin)      \
+do                                              \
+{                                               \
+  __omTypeAllocBin(type, addr, bin);            \
+  omMemsetW(addr, 0, (bin)->sizeW);             \
+}                                               \
+while (0)
+
+#define __omFreeBin(addr)                                       \
 do                                                              \
 {                                                               \
   register void* __om_addr = (void*) (addr);                    \
-  register omBinPage __om_page = omGetPageOfAddr(__om_addr);   \
+  register omBinPage __om_page = omGetPageOfAddr(__om_addr);    \
   __omFreeToPage(__om_addr, __om_page);                         \
 }                                                               \
@@ -180 +176 @@
 /*******************************************************************/
 /* Block                                                           */
-#define ___omTypeAllocBlock(type, addr, size, init, action_zero, action_init)   \
-do                                                                              \
-{                                                                               \
-  omBin ___om_bin = omSize2Bin(size);                                           \
-  register omBinPage ___om_page = ___om_bin->current_page;                      \
-  if (___om_page->current != NULL)                                              \
-  {                                                                             \
-    __omTypeAllocFromPage(type, addr, ___om_page);                              \
-    action_zero                                                                 \
-  }                                                                             \
-  else                                                                          \
-  {                                                                             \
-    addr = (type) omAllocBlockFromFullPage(___om_page, ___om_bin, size, init);  \
-  }                                                                             \
-  action_init                                                                   \
-}                                                                               \
-while (0)
+#define omSmallSize2Bin(size) om_Size2Bin[((size) -1) >> LOG_SIZEOF_OM_ALIGNMENT]
+#define omSize2Bin(size) ((size) <= OM_MAX_BLOCK_SIZE ? omSmallSize2Bin(size) : om_LargeBin)
+
+#define omAllocLargeBlock(size)       OM_MALLOC(size)
+#define omFreeLargeBlock(addr, size)  OM_FREE(addr)
 
 #define __omTypeAllocBlock(type, addr, size)    \
 do                                              \
 {                                               \
-  ___omTypeAllocBlock(type, addr, size, 0, ,);   \
-}                                               \
-while (0)
-
-#define __omTypeAlloc0Block(type, addr, size)                   \
-do                                                              \
-{                                                               \
-  ___omTypeAllocBlock(type, addr, size, 1,                      \
-                      omMemsetW(addr, 0, ___om_bin->sizeW);, );   \
-}                                                               \
+  if (size <= OM_MAX_BLOCK_SIZE)                \
+  {                                             \
+    omBin __om_bin = omSmallSize2Bin(size);     \
+    __omTypeAllocBin(type, addr, __om_bin);     \
+  }                                             \
+  else                                          \
+  {                                             \
+    addr = (type) omAllocLargeBlock(size);      \
+  }                                             \
+}                                               \
+while(0)
+
+#define __omTypeAlloc0Block(type, addr, size)   \
+do                                              \
+{                                               \
+  if (size <= OM_MAX_BLOCK_SIZE)                \
+  {                                             \
+    omBin __om_bin = omSmallSize2Bin(size);     \
+    __omTypeAlloc0Bin(type, addr, __om_bin);    \
+  }                                             \
+  else                                          \
+  {                                             \
+    addr = (type) omAllocLargeBlock(size);      \
+    memset(addr, 0, size);                      \
+  }                                             \
+}                                               \
 while (0)
 
@@ -216 +216 @@
 do                                              \
 {                                               \
-  omBin _om_bin = omSize2Bin(size);          \
-  omBinPage _om_page = _om_bin->current_page; \
-  __omFreeToPage(addr, _om_page);               \
-}                                               \
-while (0)
-
+  if (size <= OM_MAX_BLOCK_SIZE)                \
+  {                                             \
+    __omFreeBin(addr);                          \
+  }                                             \
+  else                                          \
+  {                                             \
+    omFreeLargeBlock(addr, size);               \
+  }                                             \
+}                                               \
+while (0)
 
 /*******************************************************************/
 /* Chunk                                                           */
-#define ___omTypeAllocChunk(type, addr, size, init, action_init)                    \
-do                                                                                  \
-{                                                                                   \
-  void* ___om_addr;                                                                 \
-  size_t ___om_size = (size) + SIZEOF_OM_ALIGNMENT;                                 \
-  ___omTypeAllocBlock(void*, ___om_addr, ___om_size, init,                          \
-                      action_init,                                                  \
-                      *((void**) ___om_addr) = (void*) ___om_bin->current_page;);   \
-  addr = (type) (___om_addr + SIZEOF_OM_ALIGNMENT);                                 \
-}                                                                                   \
-while (0)
-
-#define __omTypeAllocChunk(type, addr, size) \
-  ___omTypeAllocChunk(type, addr, size, 0,)
-
-#define __omTypeAlloc0Chunk(type, addr, size) \
-  ___omTypeAllocChunk(type, addr, size, 1, omMemsetW(___om_addr, 0, ___om_bin->sizeW);)
+#define omAllocLargeChunk(size)  OM_MALLOC(size)
+#define omFreeLargeChunk(addr)   OM_FREE(addr)
+ 
+#define __omTypeAllocChunk(type, addr, size)                \
+do                                                          \
+{                                                           \
+  void* __om_addr;                                          \
+  size_t __om_size = (size) + SIZEOF_OM_ALIGNMENT;          \
+  if (__om_size <= OM_MAX_BLOCK_SIZE)                       \
+  {                                                         \
+    omBin __om_bin = omSmallSize2Bin(__om_size);                 \
+    __omTypeAllocBin(void*, __om_addr, __om_bin);           \
+    *((void**) __om_addr) = (void*) __om_bin->current_page; \
+  }                                                         \
+  else                                                      \
+  {                                                         \
+    __om_addr = omAllocLargeChunk(__om_size);               \
+    *((void**) __om_addr) = om_LargePage;                   \
+  }                                                         \
+  addr = (type) (__om_addr + SIZEOF_OM_ALIGNMENT);          \
+}                                                           \
+while (0)
+
+#define __omTypeAlloc0Chunk(type, addr, size)               \
+do                                                          \
+{                                                           \
+  void* __om_addr;                                          \
+  size_t __om_size = (size) + SIZEOF_OM_ALIGNMENT;          \
+  if (__om_size <= OM_MAX_BLOCK_SIZE)                       \
+  {                                                         \
+    omBin __om_bin = omSmallSize2Bin(__om_size);            \
+    __omTypeAlloc0Bin(void*, __om_addr, __om_bin);          \
+    *((void**) __om_addr) = (void*) __om_bin->current_page; \
+  }                                                         \
+  else                                                      \
+  {                                                         \
+    __om_addr = omAllocLargeChunk(__om_size);               \
+    memset(__om_addr, 0, __om_size);                        \
+    *((void**) __om_addr) = om_LargePage;                   \
+  }                                                         \
+  addr = (type) (__om_addr + SIZEOF_OM_ALIGNMENT);          \
+}                                                           \
+while (0)
 
 #define __omFreeChunk(addr)                                 \
@@ -247 +277 @@
 {                                                           \
   void* __addr = ((void*) (addr)) - SIZEOF_OM_ALIGNMENT;    \
-  omBinPage __om_page = *((omBinPage*) __addr);               \
+  omBinPage __om_page = *((omBinPage*) __addr);             \
   __omFreeToPage(__addr, __om_page);                        \
 }                                                           \
@@ -314 +344 @@
 omBin omGetSpecBin(size_t size);
 void  omUnGetSpecBin(omBin *bin);
+unsigned long omGetNewStickyAllBinTag();
+void omSetStickyAllBinTag(unsigned long sticky);
+void omUnSetStickyAllBinTag(unsigned long sticky);
+void omDeleteStickyAllBinTag(unsigned long sticky);
 
 #endif /* ! OM_GENERATE_INC */

omalloc/omTest.c

@@ -7 +7 @@
 #include "omFindExec.h"
 
+#define MAX_SIZE 1024
+#define D_LEVEL 10
+
 struct TestAddr_s;
 typedef struct TestAddr_s TestAddr_t;
@@ -17 +20 @@
 };
 
-#define D_LEVEL 10
-TestAddr bin_addr_list = NULL;
-TestAddr block_addr_list = NULL;
-TestAddr chunk_addr_list = NULL;
-
+TestAddr bin_addr_list[MAX_SIZE >> 2];
+TestAddr block_addr_list[MAX_SIZE >> 2];
+TestAddr chunk_addr_list[MAX_SIZE >> 2];
+omBin    bin_list[MAX_SIZE >> 2];
+
+void InitLists()
+{
+  int i;
+  for (i=0; i<MAX_SIZE >> 2; i++)
+  {
+    bin_addr_list[i] = NULL;
+    block_addr_list[i] = NULL;
+    chunk_addr_list[i] = NULL;
+/*    bin_list[i] = omGetSpecHeap(i*4); */
+  }
+}
+  
+#if D_LEVEL == 0
+#define ALLOC_CHUNK(size)       _omAllocChunk(size)
+#define ALLOC_BLOCK(size)       _omAllocBlock(size)
+#define ALLOC_BIN(size)         _omAllocBin(omGetSpecBin(size))
+#define FREE_BIN(addr)          _omFreeBin(addr)
+#define FREE_BLOCK(addr, size)  _omFreeBlock(addr, size)
+#define FREE_CHUNK(addr)        _omFreeChunk(addr)
+#define omPrintBinStats(fd)     ((void)0)
+#elif D_LEVEL > 0
+#define ALLOC_CHUNK(size)       omdCheckAllocChunk(size, 0, D_LEVEL)
+#define ALLOC_BLOCK(size)       omdCheckAllocBlock(size, 0, D_LEVEL)
+#define ALLOC_BIN(size)         omdCheckAllocBin(omGetSpecBin(size), 0, D_LEVEL)
+#define FREE_BIN(addr)          omdCheckFreeBin(addr, D_LEVEL)
+#define FREE_BLOCK(addr, size)  omdCheckFreeBlock(addr, size, D_LEVEL)
+#define FREE_CHUNK(addr)        omdCheckFreeChunk(addr, D_LEVEL)
+#else
+#define ALLOC_CHUNK(size)       malloc(size)
+#define ALLOC_BLOCK(size)       malloc(size)
+#define ALLOC_BIN(size)         malloc(size)
+#define FREE_BIN(addr)          free(addr)
+#define FREE_BLOCK(addr, size)  free(addr)
+#define FREE_CHUNK(addr)        free(addr)
+#define omPrintBinStats(fd)     ((void)0)
+#endif
+
+#if 0
+void TestAddrs()
+{
+  TestAddr addr;
+  
+  addr = bin_addr_list;
+  while (addr != NULL)
+  {
+    omdCheckBinAddr(addr, omGetSpecBin(addr->size), 2);
+    if (omIsOnList(addr->next, addr)) omError("addr on own list");
+    if (omIsOnList(block_addr_list, addr)) omError("addr on block_list");
+    if (omIsOnList(chunk_addr_list, addr)) omError("addr on chunck_list");
+    addr = addr->next;
+  }
+  addr = block_addr_list;
+  while (addr != NULL)
+  {
+    omdCheckBlockAddr(addr, addr->size, 2);
+    if (omIsOnList(addr->next, addr)) omError("addr on own list");
+    if (omIsOnList(chunk_addr_list, addr)) omError("addr on chunck_list");
+    addr = addr->next;
+  }
+  addr = chunk_addr_list;
+  while (addr != NULL)
+  {
+    omdCheckChunkAddr(addr, 2);
+    if (omIsOnList(addr->next, addr)) omError("addr on own list");
+    addr = addr->next;
+  }
+}
+#else
+#define TestAddrs() ((void)0)
+#endif
+  
+  
 void TestAllocChunk(size_t size)
 {
   TestAddr addr = 
-    (TestAddr) omdCheckAllocChunk(size, 0, D_LEVEL, __FILE__, __LINE__);
+    (TestAddr) ALLOC_CHUNK(size);
   addr->size = size;
-  chunk_addr_list = omInsertInSortedList(chunk_addr_list, size, addr);
+  addr->next = chunk_addr_list[size >> 2];
+  chunk_addr_list[size >> 2] = addr;
 }
 
 void TestFreeChunk(size_t size)
 {
-  TestAddr addr = omFindInSortedList(chunk_addr_list, size, size);
+  TestAddr addr = chunk_addr_list[size >> 2];
+  TestAddr a2;
   if (addr != NULL) 
-    chunk_addr_list = omRemoveFromList(chunk_addr_list, addr);
-  omdCheckFreeChunk(addr, D_LEVEL, __FILE__, __LINE__);
+  {
+    if (addr->next != NULL)
+    {
+      while (addr->next->next != NULL) addr = addr->next;
+      a2 = addr->next;
+      addr->next = NULL;
+      FREE_CHUNK((void*)a2);
+    }
+    else
+    {
+      FREE_CHUNK(addr);
+      chunk_addr_list[size >> 2] = NULL;
+    }
+  }
 }
 
 void FreeAllChunk()
 {
+  int i;
+  for (i=0; i<MAX_SIZE >> 2; i++)
+  {
+    while (chunk_addr_list[i] != NULL) TestFreeChunk(i*4);
+  }
+}
+
+void TestAllAddrs()
+{
+  int i;
   TestAddr addr;
-  while (chunk_addr_list != NULL)
-  {
-    addr = chunk_addr_list;
-    chunk_addr_list = chunk_addr_list->next;
-    omdCheckFreeChunk(addr, D_LEVEL, __FILE__, __LINE__);
-  }
-}
-
+  for (i=0; i<MAX_SIZE >> 2; i++)
+  {
+    addr = chunk_addr_list[i];
+    while (addr != NULL)
+    {
+      omdCheckChunkAddr(addr, D_LEVEL);
+      addr = addr->next;
+    }
+  }
+}
+  
+  
+#if 0
 void TestAllocBlock(size_t size)
 {
   TestAddr addr = 
-    (TestAddr) omdCheckAllocBlock(size, 0, D_LEVEL, __FILE__, __LINE__);
+    (TestAddr) ALLOC_BLOCK(size);
   addr->size = size;
   block_addr_list = omInsertInSortedList(block_addr_list, size, addr);
@@ -61 +165 @@
   TestAddr addr = omFindInSortedList(block_addr_list, size, size);
   if (addr != NULL) 
+  {
     block_addr_list = omRemoveFromList(block_addr_list, addr);
-  omdCheckFreeBlock(addr, addr->size,D_LEVEL, __FILE__, __LINE__);
+    FREE_BLOCK(addr, addr->size);
+  }
 }
 
@@ -72 +178 @@
     addr = block_addr_list;
     block_addr_list = block_addr_list->next;
-    omdCheckFreeBlock(addr, addr->size, D_LEVEL, __FILE__, __LINE__);
+    FREE_BLOCK(addr, addr->size);
   }
 }
@@ -78 +184 @@
 void TestAllocBin(size_t size)
 {
-  omBin bin = omGetSpecBin(size<5?5:size);
   TestAddr addr = 
-    (TestAddr) omdCheckAllocBin(bin, 0, D_LEVEL, __FILE__, __LINE__);
+    (TestAddr) ALLOC_BIN(size);
   addr->size = size;
   bin_addr_list = omInsertInSortedList(bin_addr_list, size, addr);
@@ -87 +192 @@
 void TestFreeBin(size_t size)
 {
-  omBin bin;
   TestAddr addr = omFindInSortedList(bin_addr_list, size, size);
   if (addr != NULL) 
+  {
     bin_addr_list = omRemoveFromList(bin_addr_list, addr);
-  bin = omGetSpecBin(addr->size);
-  omdCheckFreeBin(addr, bin, D_LEVEL, __FILE__, __LINE__);
+    FREE_BIN(addr);
+  }
 }
   
@@ -98 +203 @@
 {
   TestAddr addr;
-  omBin bin;
   while (bin_addr_list != NULL)
   {
     addr = bin_addr_list;
     bin_addr_list = bin_addr_list->next;
-    bin = omGetSpecBin(addr->size);
-    omdCheckFreeBin(addr, bin, D_LEVEL, __FILE__, __LINE__);
-  }
-}
-
-int count = 0;
+    FREE_BIN(addr);
+  }
+}
+#else
+#define TestAllocBin(p) TestAllocChunk(p)
+#define TestFreeBin(p)  TestFreeChunk(p)
+#define FreeAllBin() FreeAllChunk()
+
+#define TestAllocBlock(p) TestAllocChunk(p)
+#define TestFreeBlock(p)  TestFreeChunk(p)
+#define FreeAllBlock() FreeAllChunk()
+#endif 
+
+
 int InitSizeGen(int i)
 {
-  return 0;
+  int size;
+  srand(1);
+  size = 1 + (int) ( ((double) MAX_SIZE)* rand()/(RAND_MAX + 1.0));
+  if (size < 8) return 8;
+  return size;
 }
 
 int NextSizeGen(int prev)
 {
-  return ++count % 1024;
+  int size;
+  size = 1 + (int) ( ((double) MAX_SIZE) * rand()/(RAND_MAX + 1.0));
+#if D_LEVEL > 4
+  printf("%d:", size);
+#endif
+  fflush(stdout);
+  if (size < 8) return 8;
+  return size;
 }
 
 void PrintTest()
 {
-  omPrintCurrentBackTrace(0, 10, stdout);
+  omError("sub");
 }
 
 int main(int argc, char* argv[])
 {
-  int limit, i, size;
+  int limit, i, size, free_all;
   omInitTrack(argv[0]);
-  
-  omPrintCurrentBackTrace(0, 10, stdout);
-  PrintTest();
-  return 0;
-  
+#if 0
+  void *a1, *a2, *a3, *a4, *a5;
+  omBin bin = omGetSpecBin(5000);
+  
+  
+  a1 = omdCheckAllocBin(bin, 0, D_LEVEL);
+  a2 = omdCheckAllocBin(bin, 0, D_LEVEL);
+  a3 = omdCheckAllocBin(bin, 0, D_LEVEL);
+  a4 = omdCheckAllocBin(bin, 0, D_LEVEL);
+  a5 = omdCheckAllocBin(bin, 0, D_LEVEL);
+  
+  omPrintBinStats(stdout);
+  omdCheckFreeBin(a1, bin, D_LEVEL);
+  omPrintBinStats(stdout);
+  omdCheckFreeBin(a5, bin, D_LEVEL);
+  omPrintBinStats(stdout);
+  omdCheckFreeBin(a2, bin, D_LEVEL);
+  omPrintBinStats(stdout);
+  omdCheckFreeBin(a3, bin, D_LEVEL);
+  omPrintBinStats(stdout);
+  omdCheckFreeBin(a4, bin, D_LEVEL);
+  omPrintBinStats(stdout);
+
+  return(0);
+#endif
+  InitLists();
   if (argc > 1) 
     sscanf(argv[1], "%d", &limit);
   else
     limit = 200;
+
+  if (argc > 2)
+    sscanf(argv[2], "%d", &free_all);
+  else
+    free_all = 10000;
   
   size = InitSizeGen(limit);
   i = 0;
   
-  for (i=0; i<= limit; i++)
+  for (i=1; i<= limit; i++)
   {
     size = NextSizeGen(size);
     TestAllocBin(size);
+    TestAddrs();
     TestAllocBlock(size);
+    TestAddrs();
     TestAllocChunk(size);
+    TestAddrs();
     size = NextSizeGen(size);
     TestAllocBin(size);
+    TestAddrs();
     TestAllocBlock(size);
+    TestAddrs();
     TestAllocChunk(size);
+    TestAddrs();
     TestFreeBin(size);
+    TestAddrs();
     TestFreeBlock(size);
+    TestAddrs();
     TestFreeChunk(size);
+    TestAddrs();
+    
+    if (i % 300 == 0)
+    {
+      omdCheckBins(D_LEVEL);
+      TestAllAddrs();
+      omDeleteStickyAllBinTag(1);
+      printf("DeleteSticky\n");
+      omdCheckBins(D_LEVEL);
+      TestAllAddrs();
+    }
+    else if (i % 200 == 0)
+    {
+      omdCheckBins(D_LEVEL);
+      TestAllAddrs();
+      omUnSetStickyAllBinTag(1);
+      printf("UnSetSticky");
+      TestAllAddrs();
+      omdCheckBins(D_LEVEL);
+    }
+    else if (i % 100 == 0)
+    {
+      omdCheckBins(D_LEVEL);
+      TestAllAddrs();
+      omSetStickyAllBinTag(1);
+      printf("SetSticky");
+      omdCheckBins(D_LEVEL);
+      TestAllAddrs();
+    }
     
     if (i % 100 == 0)
@@ -159 +345 @@
       printf("i=%d\n",i);
       omPrintBinStats(stdout);
-    }
-  }
+      if (i % free_all == 0)
+      {
+        printf("\nFreeAllChunk\n");
+        FreeAllChunk();
+#if 0
+        omPrintBinStats(stdout);
+        if (i % 20000 == 0)
+        {
+          printf("\nFreeAllBlock\n");
+          FreeAllBlock();
+          omPrintBinStats(stdout);
+          if (i % 40000 == 0)
+          {
+            printf("\nFreeAllBin\n");
+            FreeAllBin();
+            omPrintBinStats(stdout);
+          }
+        }
+#endif
+      }
+    }
+  }
+  omPrintBinStats(stdout);
+  FreeAllBlock();
+  omPrintBinStats(stdout);
+  FreeAllChunk();
   omPrintBinStats(stdout);
   FreeAllBin();
   omPrintBinStats(stdout);
-  FreeAllBlock();
-  omPrintBinStats(stdout);
-  FreeAllChunk();
-  omPrintBinStats(stdout);
   return 0;
 }

omalloc/omTrack.c

@@ -4 +4 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 11/99
- *  Version: $Id: omTrack.c,v 1.1.1.1 1999-11-18 17:45:53 obachman Exp $
+ *  Version: $Id: omTrack.c,v 1.2 1999-11-22 18:13:00 obachman Exp $
  *******************************************************************/
 #include <limits.h>
@@ -16 +16 @@
 #endif
 
-static char* om_this_prog = NULL;
-static void* om_this_main_frame_addr = NULL;
-static void* om_this_prog_min_return_addr = ((void*) 1023);
-static void* om_this_prog_max_return_addr = ((void*) ULONG_MAX -1);
-
-
-void omInitTrack(const char* argv0)
-{
-  char buf[MAXPATHLEN];
-  
-  if (argv0 != NULL && omFindExec(argv0, buf))
-  {
-    __omTypeAllocChunk(char*, om_this_prog, strlen(buf));
-    strcpy(om_this_prog, buf);
-  }
-#if defined(OM_FRAME_ADDR_WORKS) 
-  om_this_main_frame_addr = OM_FRAME_ADDR(1);
-#endif
-#if defined(OM_PROG_NM) && defined(HAVE_POPEN)
-  if (om_this_prog != NULL)
-  {
-    char command[MAXPATHLEN + 30];
-    FILE *pipe;
-    sprintf(command, "%s -n %s", OM_PROG_NM, om_this_prog);
-    
-    pipe = popen(command, "r");
-    if (pipe != NULL)
-    {
-      /* serach for first address */
-      int c;
-      void* nm_addr;
-      while ( (c=fgetc(pipe)) !=  EOF)
-      {
-        if (c == '\n')
-        {
-          if (fscanf(pipe, "%p", &nm_addr) && 
-              (unsigned long) nm_addr > 
-              (unsigned long) om_this_prog_min_return_addr)
-          {
-            om_this_prog_min_return_addr = nm_addr;
-            break;
-          }
-        }
-      }
-      om_this_prog_max_return_addr = nm_addr;
-      while ( (c=fgetc(pipe)) !=  EOF)
-      {
-        if (c == '\n')
-        {
-          if (fscanf(pipe, "%p", &nm_addr) && nm_addr != NULL &&
-              (unsigned long) nm_addr  > 
-              (unsigned long) om_this_prog_max_return_addr)
-          {
-            om_this_prog_max_return_addr = nm_addr;
-          }
-        }
-      }
-      pclose(pipe);
-    }
-  }
-#endif /* defined(OM_NM) && defined(HAVE_POPEN) */
-}
-
-#define OM_MAX_TRACK_FRAMES 11
+/* This is for nice alignment of omPrintBackTrace */
+#define OM_MAX_PROC_NAME_LENGTH 20
+/* if you make this larger than 11, extend OM_GET_RETURN_ADDR and 
+   OM_GET_FRAME_ADDR */
+#define OM_MAX_BT_FRAMES 11
+
+#ifdef OM_RETURN_ADDR_RVALUE
+#define OM_GET_RETURN_ADDR OM_RETURN_ADDR
+#else
 #define OM_GET_RETURN_ADDR(addr, i)             \
 switch(i)                                       \
@@ -108 +53 @@
       addr = NULL;                              \
 }
-
+#endif /* OM_RETURN_ADDR_RVALUE */
+
+#ifdef OM_FRAME_ADDR_RVALUE
+#define OM_GET_FRAME_ADDR OM_FRAME_ADDR
+#else
 #define OM_GET_FRAME_ADDR(addr, i)              \
 switch(i)                                       \
@@ -137 +86 @@
       addr = NULL;                              \
 }
+#endif /* OM_FRAME_ADDR_RVALUE */
+
+static char* om_this_prog = NULL;
+static void* om_this_main_frame_addr = NULL;
+static void* om_this_prog_min_return_addr = ((void*) 1023);
+static void* om_this_prog_max_return_addr = ((void*) ULONG_MAX -1);
+
+
+void omInitTrack(const char* argv0)
+{
+  char buf[MAXPATHLEN];
+  
+  if (argv0 != NULL && omFindExec(argv0, buf))
+  {
+    __omTypeAllocChunk(char*, om_this_prog, strlen(buf));
+    strcpy(om_this_prog, buf);
+  }
+#if defined(OM_FRAME_ADDR_WORKS) 
+  om_this_main_frame_addr = OM_FRAME_ADDR(1);
+#endif
+#if defined(OM_PROG_NM) && defined(HAVE_POPEN)
+  if (om_this_prog != NULL)
+  {
+    char command[MAXPATHLEN + 30];
+    FILE *pipe;
+    sprintf(command, "%s -n %s", OM_PROG_NM, om_this_prog);
+    
+    pipe = popen(command, "r");
+    if (pipe != NULL)
+    {
+      /* serach for first address */
+      int c;
+      void* nm_addr;
+      while ( (c=fgetc(pipe)) !=  EOF)
+      {
+        if (c == '\n')
+        {
+          if (fscanf(pipe, "%p", &nm_addr) && 
+              (unsigned long) nm_addr > 
+              (unsigned long) om_this_prog_min_return_addr)
+          {
+            om_this_prog_min_return_addr = nm_addr;
+            break;
+          }
+        }
+      }
+      om_this_prog_max_return_addr = nm_addr;
+      while ( (c=fgetc(pipe)) !=  EOF)
+      {
+        if (c == '\n')
+        {
+          if (fscanf(pipe, "%p", &nm_addr) && nm_addr != NULL &&
+              (unsigned long) nm_addr  > 
+              (unsigned long) om_this_prog_max_return_addr)
+          {
+            om_this_prog_max_return_addr = nm_addr;
+          }
+        }
+      }
+      pclose(pipe);
+    }
+  }
+#endif /* defined(OM_NM) && defined(HAVE_POPEN) */
+}
 
 
 int omGetCurrentBackTrace(void** addr, int max_frames)
 {
+  int i = 0;
 #if defined(OM_RETURN_ADDR_WORKS)
 #if defined(OM_FRAME_ADDR_WORKS)
@@ -150 +164 @@
     {
 #endif /* ! defined(OM_RETURN_ADDR_WORKS) */
-      int i;
       void* r_addr;
+      if (max_frames > OM_MAX_BT_FRAMES) max_frames = OM_MAX_BT_FRAMES;
       for (i=0; i< max_frames; i++)
       {
@@ -178 +192 @@
 #endif /* OM_FRAME_ADDR_WORKS */
   }
-  return max_frames;
 #endif /* defined(OM_RETURN_ADDR_WORKS) */
-  return 0;
+  return i;
 }
 
@@ -186 +199 @@
 {
   int i = 0;
+  if (max_frames > OM_MAX_BT_FRAMES) max_frames = OM_MAX_BT_FRAMES;
 #if defined(HAVE_POPEN) && defined(OM_PROG_ADDR2LINE)
   if (om_this_prog != NULL)
   {
-    char command[2*MAXPATHLEN + 15 + OM_MAX_TRACK_FRAMES*(2*SIZEOF_VOIDP + 4)];
+    char command[2*MAXPATHLEN + 15 + OM_MAX_BT_FRAMES*(2*SIZEOF_VOIDP + 4)];
     FILE *pipe;
     int l;
-
     l = sprintf(command, "%s -s -C -f -e %s", 
                      OM_PROG_ADDR2LINE, om_this_prog);
@@ -202 +215 @@
     }
     
-    if (i==0) return 0;
-    pipe = popen(command, "r");
-    if (pipe != NULL)
-    {
-      int nl = '@';
-      while ((l=fgetc(pipe)) != EOF)
-      {
-        if (l == '\n')
-        {
-          l =fgetc(pipe);
-          if (l == EOF) break;
-          fputc(nl, fd);
-          if (nl == '@') nl = '#';
-          else nl = '@';
-        }
-        fputc(l, fd);
-      }
-      pclose(pipe);
-      if (i > 0)
-      {
-        fprintf(fd, "%d", i);
-        fputc('\n', fd);
+    if (i > 0)
+    {
+      pipe = popen(command, "r");
+      if (pipe != NULL)
+      {
+        int nl = 0;
+        int j = 0;
+        int k=0;
+        while ((l=fgetc(pipe)) != EOF)
+        {
+          if (nl == 0) 
+          {
+            fprintf(fd, "  #%d %p in ", j, addr[j]);
+            nl = 1;
+            j++;
+            k=0;
+          }
+          if (l == '\n')
+          {
+            if (nl == 1)
+            {
+              while (k<OM_MAX_PROC_NAME_LENGTH)
+              {
+                fprintf(fd, " ");
+                k++;
+              }
+              fprintf(fd, " at ");
+              nl = 2;
+            }
+            else
+            {
+              fputc('\n', fd);
+              nl = 0;
+            }
+          }
+          else
+          {
+            k++;
+            fputc(l, fd);
+          }
+        }
+        pclose(pipe);
         fflush(fd);
-      }
-      return i;
-    }
-    i=0;
-  }
-#endif
+        return i;
+      }
+      i=0;
+    }
+  }
+#endif
+#if OM_RETURN_ADDR_WORKS
   while (i<max_frames && addr[i] != NULL)
   {
-    fprintf(fd, "%p#", addr[i]);
+    fprintf(fd, "  #%d %p in ??\n", i, addr[i]);
     i++;
   }
-  if (i > 0)
-  {
+#endif
+  if (i == 0) 
+  {
+    fprintf(fd, "??");
     fputc('\n', fd);
-    fflush(fd);
-  }
+  }
+  fflush(fd);
   return i;
 }
@@ -246 +282 @@
 int omPrintCurrentBackTrace(int from_frame, int max_frames, FILE *fd)
 {
-#if defined(OM_RETURN_ADDR_WORKS)
-  if (from_frame >= 0)
-  {
-    void* addr[OM_MAX_TRACK_FRAMES];
-    int got_frames = omGetCurrentBackTrace(addr, from_frame + max_frames + 1);
-    return omPrintBackTrace(&addr[from_frame + 1], got_frames, fd);
-  }
-#endif
-  return 0;
+  void* addr[OM_MAX_BT_FRAMES];
+  int got_frames = omGetCurrentBackTrace(addr, from_frame + max_frames + 1);
+  return omPrintBackTrace(&addr[from_frame + 1], 
+                          got_frames - from_frame + 1, fd);
 }