- add DLLIMPORT to Dynamic_library_path declaration for Win32

- add pkglib_path[] declaration for Win32 - modify debug code for PROTECT/UNPROTECT - add missing UNPROTECT(1) in spi code -- fix for "stack imbalance" warning
jconway · Jun 12, 2007 · 974dc94 · 974dc94
1 parent 07f8448
commit 974dc94
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 13 deletions.
diff --git a/pg_backend_support.c b/pg_backend_support.c
@@ -37,7 +37,9 @@
 #include "utils/memutils.h"
 
 /* GUC variable */
-extern char *Dynamic_library_path;
+extern DLLIMPORT char *Dynamic_library_path;
+/* Postgres global */
+extern DLLIMPORT char pkglib_path[];
 
 /* compiled function hash table */
 extern HTAB *plr_HashTable;

diff --git a/pg_rsupport.c b/pg_rsupport.c
@@ -142,6 +142,7 @@ plr_SPI_exec(SEXP rsql)
 
 	PROTECT(rsql =  AS_CHARACTER(rsql));
 	sql = CHAR(STRING_ELT(rsql, 0));
+	UNPROTECT(1);
 	if (sql == NULL)
 		error("%s", "cannot exec empty query");
 
@@ -285,6 +286,7 @@ plr_SPI_prepare(SEXP rsql, SEXP rargtypes)
 
 	PROTECT(rsql =  AS_CHARACTER(rsql));
 	sql = CHAR(STRING_ELT(rsql, 0));
+	UNPROTECT(1);
 	if (sql == NULL)
 		error("%s", "cannot prepare empty query");
 
@@ -341,6 +343,8 @@ plr_SPI_prepare(SEXP rsql, SEXP rargtypes)
 	else
 		typeids = NULL;
 
+	UNPROTECT(1);
+
 	/* switch to SPI memory context */
 	oldcontext = MemoryContextSwitchTo(plr_SPI_context);
 
@@ -355,8 +359,6 @@ plr_SPI_prepare(SEXP rsql, SEXP rargtypes)
 	}
 	PLR_PG_CATCH();
 	PLR_PG_END_TRY();
-
-	UNPROTECT(2);
 
 	if (pplan == NULL)
 	{

diff --git a/plr.c b/plr.c
@@ -1524,3 +1524,19 @@ getModulesSql(Oid nspOid)
 
     return sql->data;
 }
+
+#ifdef DEBUGPROTECT
+SEXP
+pg_protect(SEXP s, char *fn, int ln)
+{
+	elog(NOTICE, "\tPROTECT\t1\t%s\t%d", fn, ln);
+	return protect(s);
+}
+
+void
+pg_unprotect(int n, char *fn, int ln)
+{
+	elog(NOTICE, "\tUNPROTECT\t%d\t%s\t%d", n, fn, ln);
+	unprotect(n);
+}
+#endif /* DEBUGPROTECT */
diff --git a/plr.h b/plr.h
@@ -91,17 +91,12 @@
 
 #ifdef DEBUGPROTECT
 #undef PROTECT
-#define PROTECT(s) \
+extern SEXP pg_protect(SEXP s, char *fn, int ln);
-	do { \
+#define PROTECT(s)		pg_protect(s, __FILE__, __LINE__)
-		elog(NOTICE, "\tPROTECT\t1\t%s\t%d", __FILE__, __LINE__); \
+
-		protect(s); \
-	} while (0)
 #undef UNPROTECT
-#define UNPROTECT(n) \
+extern void pg_unprotect(int n, char *fn, int ln);
-	do { \
+#define UNPROTECT(n)	pg_unprotect(n, __FILE__, __LINE__)
-		elog(NOTICE, "\tUNPROTECT\t%d\t%s\t%d", n, __FILE__, __LINE__); \
-		unprotect(n); \
-	} while (0)
 #endif /* DEBUGPROTECT */
 
 #define xpfree(var_) \