X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FDynaLoader%2Fdlutils.c;h=620d31b21ee4ad3f5f48a077a849db8248046425;hb=e53790c1de51b5453ccdee177a995225bf5154c2;hp=0ce082182c33432b9c321fa891a3675f9e2c1ded;hpb=a0d0e21ea6ea90a22318550944fe6cb09ae10cda;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/DynaLoader/dlutils.c b/ext/DynaLoader/dlutils.c
index 0ce0821..620d31b 100644
--- a/ext/DynaLoader/dlutils.c
+++ b/ext/DynaLoader/dlutils.c
@@ -3,83 +3,140 @@
  * Currently this file is simply #included into dl_*.xs/.c files.
  * It should really be split into a dlutils.h and dlutils.c
  *
+ * Modified:
+ * 29th Feburary 2000 - Alan Burlison: Added functionality to close dlopen'd
+ *                      files when the interpreter exits
  */
 
+#ifndef XS_VERSION
+#  define XS_VERSION "0"
+#endif
+#define MY_CXT_KEY "DynaLoader::_guts" XS_VERSION
+
+typedef struct {
+    char *	x_dl_last_error;	/* pointer to allocated memory for
+					   last error message */
+    int		x_dl_nonlazy;		/* flag for immediate rather than lazy
+					   linking (spots unresolved symbol) */
+#ifdef DL_LOADONCEONLY
+    HV *	x_dl_loaded_files;	/* only needed on a few systems */
+#endif
+#ifdef DL_CXT_EXTRA
+    my_cxtx_t	x_dl_cxtx;		/* extra platform-specific data */
+#endif
+#ifdef DEBUGGING
+    int		x_dl_debug;	/* value copied from $DynaLoader::dl_debug */
+#endif
+} my_cxt_t;
 
-/* pointer to allocated memory for last error message */
-static char *LastError  = (char*)NULL;
-
+START_MY_CXT
 
+#define dl_last_error	(MY_CXT.x_dl_last_error)
+#define dl_nonlazy	(MY_CXT.x_dl_nonlazy)
+#ifdef DL_LOADONCEONLY
+#define dl_loaded_files	(MY_CXT.x_dl_loaded_files)
+#endif
+#ifdef DL_CXT_EXTRA
+#define dl_cxtx		(MY_CXT.x_dl_cxtx)
+#endif
+#ifdef DEBUGGING
+#define dl_debug	(MY_CXT.x_dl_debug)
+#endif
 
 #ifdef DEBUGGING
-/* currently not connected to $DynaLoader::dl_error but should be */
-static int dl_debug = 0;
-#define DLDEBUG(level,code)	if(dl_debug>=level){ code; }
+#define DLDEBUG(level,code) \
+    STMT_START {					\
+	dMY_CXT;					\
+	if (dl_debug>=level) { code; }			\
+    } STMT_END
 #else
-#define DLDEBUG(level,code)
+#define DLDEBUG(level,code)	NOOP
 #endif
 
+#ifdef DL_UNLOAD_ALL_AT_EXIT
+/* Close all dlopen'd files */
+static void
+dl_unload_all_files(pTHX_ void *unused)
+{
+    CV *sub;
+    AV *dl_librefs;
+    SV *dl_libref;
+
+    if ((sub = get_cv("DynaLoader::dl_unload_file", FALSE)) != NULL) {
+        dl_librefs = get_av("DynaLoader::dl_librefs", FALSE);
+        while ((dl_libref = av_pop(dl_librefs)) != &PL_sv_undef) {
+           dSP;
+           ENTER;
+           SAVETMPS;
+           PUSHMARK(SP);
+           XPUSHs(sv_2mortal(dl_libref));
+           PUTBACK;
+           call_sv((SV*)sub, G_DISCARD | G_NODEBUG);
+           FREETMPS;
+           LEAVE;
+        }
+    }
+}
+#endif
 
 static void
-dl_generic_private_init()	/* called by dl_*.xs dl_private_init() */
+dl_generic_private_init(pTHX)	/* called by dl_*.xs dl_private_init() */
 {
+    char *perl_dl_nonlazy;
+    MY_CXT_INIT;
+
+    dl_last_error = NULL;
+    dl_nonlazy = 0;
+#ifdef DL_LOADONCEONLY
+    dl_loaded_files = Nullhv;
+#endif
 #ifdef DEBUGGING
-    char *perl_dl_debug = getenv("PERL_DL_DEBUG");
-    if (perl_dl_debug)
-	dl_debug = atoi(perl_dl_debug);
+    {
+	SV *sv = get_sv("DynaLoader::dl_debug", 0);
+	dl_debug = sv ? SvIV(sv) : 0;
+    }
+#endif
+    if ( (perl_dl_nonlazy = getenv("PERL_DL_NONLAZY")) != NULL )
+	dl_nonlazy = atoi(perl_dl_nonlazy);
+    if (dl_nonlazy)
+	DLDEBUG(1,PerlIO_printf(Perl_debug_log, "DynaLoader bind mode is 'non-lazy'\n"));
+#ifdef DL_LOADONCEONLY
+    if (!dl_loaded_files)
+	dl_loaded_files = newHV(); /* provide cache for dl_*.xs if needed */
+#endif
+#ifdef DL_UNLOAD_ALL_AT_EXIT
+    call_atexit(&dl_unload_all_files, (void*)0);
 #endif
 }
 
 
-/* SaveError() takes printf style args and saves the result in LastError */
-#ifdef STANDARD_C
+/* SaveError() takes printf style args and saves the result in dl_last_error */
 static void
-SaveError(char* pat, ...)
-#else
-/*VARARGS0*/
-static void
-SaveError(pat, va_alist)
-    char *pat;
-    va_dcl
-#endif
+SaveError(pTHX_ char* pat, ...)
 {
+    dMY_CXT;
     va_list args;
+    SV *msv;
     char *message;
-    int len;
+    STRLEN len;
 
-    /* This code is based on croak/warn but I'm not sure where mess() */
-    /* gets its buffer space from! */
+    /* This code is based on croak/warn, see mess() in util.c */
 
-#ifdef I_STDARG
     va_start(args, pat);
-#else
-    va_start(args);
-#endif
-    message = mess(pat, &args);
+    msv = vmess(pat, &args);
     va_end(args);
 
-    len = strlen(message) + 1 ;	/* include terminating null char */
+    message = SvPV(msv,len);
+    len++;		/* include terminating null char */
 
     /* Allocate some memory for the error message */
-    if (LastError)
-        LastError = (char*)saferealloc(LastError, len) ;
+    if (dl_last_error)
+        dl_last_error = (char*)saferealloc(dl_last_error, len);
     else
-        LastError = safemalloc(len) ;
-
-    /* Copy message into LastError (including terminating null char)	*/
-    strncpy(LastError, message, len) ;
-    DLDEBUG(2,fprintf(stderr,"DynaLoader: stored error msg '%s'\n",LastError));
-}
-
+        dl_last_error = (char*)safemalloc(len);
 
-/* prepend underscore to s. write into buf. return buf. */
-char *
-dl_add_underscore(s, buf)
-char *s;
-char *buf;
-{
-    *buf = '_';
-    (void)strcpy(buf + 1, s);
-    return buf;
+    /* Copy message into dl_last_error (including terminating null char) */
+    strncpy(dl_last_error, message, len) ;
+    DLDEBUG(2,PerlIO_printf(Perl_debug_log, "DynaLoader: stored error msg '%s'\n",dl_last_error));
 }