Add a feature for automatic initialization and finalization of dynamically

loaded libraries: call functions _PG_init() and _PG_fini() if the library
defines such symbols.  Hence we no longer need to specify an initialization
function in preload_libraries: we can assume that the library used the
_PG_init() convention, instead.  This removes one source of pilot error
in use of preloaded libraries.  Original patch by Ralf Engelschall,
preload_libraries changes by me.

1 files changed, 10 insertions, 50 deletions

diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 35d9da2a08a..b238aaec5ce 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.155 2006/07/14 14:52:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.156 2006/08/08 19:15:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1097,14 +1097,14 @@ ValidatePgVersion(const char *path)
  *-------------------------------------------------------------------------
  */
 
-typedef void (*func_ptr) ();
+/* GUC variable: list of library names to be preloaded */
+char	   *preload_libraries_string = NULL;
 
 /*
- * process any libraries that should be preloaded and
- * optionally pre-initialized
+ * process any libraries that should be preloaded at postmaster start
  */
 void
-process_preload_libraries(char *preload_libraries_string)
+process_preload_libraries(void)
 {
 	char	   *rawstring;
 	List	   *elemlist;
@@ -1131,54 +1131,14 @@ process_preload_libraries(char *preload_libraries_string)
 	foreach(l, elemlist)
 	{
 		char	   *tok = (char *) lfirst(l);
-		char	   *sep = strstr(tok, ":");
-		char	   *filename = NULL;
-		char	   *funcname = NULL;
-		func_ptr	initfunc;
-
-		if (sep)
-		{
-			/*
-			 * a colon separator implies there is an initialization function
-			 * that we need to run in addition to loading the library
-			 */
-			size_t		filename_len = sep - tok;
-			size_t		funcname_len = strlen(tok) - filename_len - 1;
-
-			filename = (char *) palloc(filename_len + 1);
-			memcpy(filename, tok, filename_len);
-			filename[filename_len] = '\0';
-
-			funcname = (char *) palloc(funcname_len + 1);
-			strcpy(funcname, sep + 1);
-		}
-		else
-		{
-			/*
-			 * no separator -- just load the library
-			 */
-			filename = pstrdup(tok);
-			funcname = NULL;
-		}
+		char	   *filename;
 
+		filename = pstrdup(tok);
 		canonicalize_path(filename);
-		initfunc = (func_ptr) load_external_function(filename, funcname,
-													 true, NULL);
-		if (initfunc)
-			(*initfunc) ();
-
-		if (funcname)
-			ereport(LOG,
-					(errmsg("preloaded library \"%s\" with initialization function \"%s\"",
-							filename, funcname)));
-		else
-			ereport(LOG,
-					(errmsg("preloaded library \"%s\"",
-							filename)));
-
+		(void) load_external_function(filename, NULL, true, NULL);
+		ereport(LOG,
+				(errmsg("preloaded library \"%s\"", filename)));
 		pfree(filename);
-		if (funcname)
-			pfree(funcname);
 	}
 
 	pfree(rawstring);