Changeset 212fc04 in git for omalloc/omLocal.h

Timestamp:

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

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6ea5825fc0e0bfabf56883aee9dac9b5bbe415fe

Parents:

e6908a0f43ea328a1aa0c3942e8d309db7de26d5

Message:

* as we go along


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

File:

• omalloc/omLocal.h (modified) (6 diffs)

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)
 
 /*******************************************************************