Commita8593a3

committed

Convert MemoryContextSwitchTo() into an inline function when using GCC.

1 parent477a64d commita8593a3Copy full SHA for a8593a3

File tree

+28

-2

lines changed

+28

-2

lines changed

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`*`
`15`	`15`	`*`
`16`	`16`	`* IDENTIFICATION`
`17`		`- * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.53 2004/12/31 22:02:48 pgsql Exp $`
	`17`	`+ * $PostgreSQL: pgsql/src/backend/utils/mmgr/mcxt.c,v 1.54 2005/02/18 21:52:33 tgl Exp $`
`18`	`18`	`*`
`19`	`19`	`*-------------------------------------------------------------------------`
`20`	`20`	`*/`
`@@ -619,7 +619,13 @@ repalloc(void *pointer, Size size)`
`619`	`619`	`/*`
`620`	`620`	`* MemoryContextSwitchTo`
`621`	`621`	`*Returns the current context; installs the given context.`
	`622`	`+ *`
	`623`	`+ * This is inlined when using GCC.`
	`624`	`+ *`
	`625`	`+ * TODO: investigate supporting inlining for some non-GCC compilers.`
`622`	`626`	`*/`
	`627`	`+#ifndef__GNUC__`
	`628`	`+`
`623`	`629`	`MemoryContext`
`624`	`630`	`MemoryContextSwitchTo(MemoryContextcontext)`
`625`	`631`	`{`
`@@ -632,6 +638,8 @@ MemoryContextSwitchTo(MemoryContext context)`
`632`	`638`	`returnold;`
`633`	`639`	`}`
`634`	`640`
	`641`	`+#endif/* ! __GNUC__ */`
	`642`	`+`
`635`	`643`	`/*`
`636`	`644`	`* MemoryContextStrdup`
`637`	`645`	`*Like strdup(), but allocate from the specified context`

Lines changed: 19 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group`
`22`	`22`	`* Portions Copyright (c) 1994, Regents of the University of California`
`23`	`23`	`*`
`24`		`- * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.32 2004/12/31 22:03:46 pgsql Exp $`
	`24`	`+ * $PostgreSQL: pgsql/src/include/utils/palloc.h,v 1.33 2005/02/18 21:52:34 tgl Exp $`
`25`	`25`	`*`
`26`	`26`	`*-------------------------------------------------------------------------`
`27`	`27`	`*/`
`@@ -70,8 +70,26 @@ extern void pfree(void *pointer);`
`70`	`70`
`71`	`71`	`externvoidrepalloc(voidpointer,Sizesize);`
`72`	`72`
	`73`	`+/*`
	`74`	`+ * MemoryContextSwitchTo can't be a macro in standard C compilers.`
	`75`	`+ * But we can make it an inline function when using GCC.`
	`76`	`+ */`
	`77`	`+#ifdef__GNUC__`
	`78`	`+`
	`79`	`+static __inline__MemoryContext`
	`80`	`+MemoryContextSwitchTo(MemoryContextcontext)`
	`81`	`+{`
	`82`	`+MemoryContextold=CurrentMemoryContext;`
	`83`	`+CurrentMemoryContext=context;`
	`84`	`+returnold;`
	`85`	`+}`
	`86`	`+`
	`87`	`+#else`
	`88`	`+`
`73`	`89`	`externMemoryContextMemoryContextSwitchTo(MemoryContextcontext);`
`74`	`90`
	`91`	`+#endif/* __GNUC__ */`
	`92`	`+`
`75`	`93`	`/*`
`76`	`94`	`* These are like standard strdup() except the copied string is`
`77`	`95`	`* allocated in a context, not with malloc().`

Comments

(0)