Update copyrights to 2003.

[pg-rex/syncrep.git] / src / include / utils / palloc.h

diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index 093764d..352108b 100644 (file)
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -18,10 +18,10 @@
  * everything that should be freed.  See utils/mmgr/README for more info.
  *
  *
- * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: palloc.h,v 1.23 2002/11/13 00:37:06 momjian Exp $
+ * $Id: palloc.h,v 1.26 2003/08/04 02:40:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -46,15 +46,25 @@ extern DLLIMPORT MemoryContext CurrentMemoryContext;
  * Fundamental memory-allocation operations (more are in utils/memutils.h)
  */
 extern void *MemoryContextAlloc(MemoryContext context, Size size);
-extern void *MemoryContextAllocPalloc0(MemoryContext context, Size size);
+extern void *MemoryContextAllocZero(MemoryContext context, Size size);
+extern void *MemoryContextAllocZeroAligned(MemoryContext context, Size size);
 
 #define palloc(sz)     MemoryContextAlloc(CurrentMemoryContext, (sz))
 
-/* We assume palloc() is already int-aligned */
-#define palloc0(sz)    \
-       ( MemSetTest(0, (sz)) ? \
-               MemoryContextAllocPalloc0(CurrentMemoryContext, (sz)) : \
-               memset(palloc(sz), 0, (sz)))
+#define palloc0(sz) MemoryContextAllocZero(CurrentMemoryContext, (sz))
+
+/*
+ * The result of palloc() is always word-aligned, so we can skip testing
+ * alignment of the pointer when deciding which MemSet variant to use.
+ * Note that this variant does not offer any advantage, and should not be
+ * used, unless its "sz" argument is a compile-time constant; therefore, the
+ * issue that it evaluates the argument multiple times isn't a problem in
+ * practice.
+ */
+#define palloc0fast(sz) \
+       ( MemSetTest(0, sz) ? \
+               MemoryContextAllocZeroAligned(CurrentMemoryContext, sz) : \
+               MemoryContextAllocZero(CurrentMemoryContext, sz) )
 
 extern void pfree(void *pointer);