X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fperllib.c;h=4e4c11396441cff9b35cd82e2998980a9f620910;hb=879fa96f55d904836d80046db7f8557649d93011;hp=717b902e10dbacd37900e3c4a5cfe74b242e7d9c;hpb=7766f1371a6d2b58d0f46fbe6a60785860a39c1e;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/perllib.c b/win32/perllib.c
index 717b902..4e4c113 100644
--- a/win32/perllib.c
+++ b/win32/perllib.c
@@ -1,15 +1,10 @@
 /*
  * "The Road goes ever on and on, down from the door where it began."
  */
-
-
+#define PERLIO_NOT_STDIO 0
 #include "EXTERN.h"
 #include "perl.h"
 
-#ifdef PERL_OBJECT
-#define NO_XSLOCKS
-#endif
-
 #include "XSUB.h"
 
 #ifdef PERL_IMPLICIT_SYS
@@ -24,10 +19,10 @@ char *staticlinkmodules[] = {
     NULL,
 };
 
-EXTERN_C void boot_DynaLoader (pTHXo_ CV* cv);
+EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
 static void
-xs_init(pTHXo)
+xs_init(pTHX)
 {
     char *file = __FILE__;
     dXSUB_SYS;
@@ -38,6 +33,17 @@ xs_init(pTHXo)
 
 #include "perlhost.h"
 
+void
+win32_checkTLS(PerlInterpreter *host_perl)
+{
+    dTHX;
+    if (host_perl != my_perl) {
+	int *nowhere = NULL;
+        *nowhere = 0; 
+	abort();
+    }
+}
+
 EXTERN_C void
 perl_get_host_info(struct IPerlMemInfo* perlMemInfo,
 		   struct IPerlMemInfo* perlMemSharedInfo,
@@ -87,8 +93,6 @@ perl_get_host_info(struct IPerlMemInfo* perlMemInfo,
     }
 }
 
-#ifdef PERL_OBJECT
-
 EXTERN_C PerlInterpreter*
 perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
 		 struct IPerlMem** ppMemParse, struct IPerlEnv** ppEnv,
@@ -97,178 +101,31 @@ perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
 		 struct IPerlProc** ppProc)
 {
     PerlInterpreter *my_perl = NULL;
-    try
-    {
-	CPerlHost* pHost = new CPerlHost(ppMem, ppMemShared, ppMemParse, ppEnv,
-					 ppStdIO, ppLIO, ppDir, ppSock, ppProc);
-
-	if (pHost) {
-	    my_perl = perl_alloc_using(pHost->m_pHostperlMem,
-				       pHost->m_pHostperlMemShared,
-				       pHost->m_pHostperlMemParse,
-				       pHost->m_pHostperlEnv,
-				       pHost->m_pHostperlStdIO,
-				       pHost->m_pHostperlLIO,
-				       pHost->m_pHostperlDir,
-				       pHost->m_pHostperlSock,
-				       pHost->m_pHostperlProc);
-	    if (my_perl) {
-		CPerlObj* pPerl = (CPerlObj*)my_perl;
-		w32_internal_host = pHost;
-	    }
-	}
-    }
-    catch(...)
-    {
-	win32_fprintf(stderr, "%s\n", "Error: Unable to allocate memory");
-	my_perl = NULL;
-    }
+    CPerlHost* pHost = new CPerlHost(ppMem, ppMemShared, ppMemParse, ppEnv,
+				     ppStdIO, ppLIO, ppDir, ppSock, ppProc);
 
-    return my_perl;
-}
-
-EXTERN_C PerlInterpreter*
-perl_alloc(void)
-{
-    PerlInterpreter* my_perl = NULL;
-    try
-    {
-	CPerlHost* pHost = new CPerlHost();
-	if (pHost) {
-	    my_perl = perl_alloc_using(pHost->m_pHostperlMem,
-				       pHost->m_pHostperlMemShared,
-				       pHost->m_pHostperlMemParse,
-				       pHost->m_pHostperlEnv,
-				       pHost->m_pHostperlStdIO,
-				       pHost->m_pHostperlLIO,
-				       pHost->m_pHostperlDir,
-				       pHost->m_pHostperlSock,
-				       pHost->m_pHostperlProc);
-	    if (my_perl) {
-		CPerlObj* pPerl = (CPerlObj*)my_perl;
-		w32_internal_host = pHost;
-	    }
+    if (pHost) {
+	my_perl = perl_alloc_using(pHost->m_pHostperlMem,
+				   pHost->m_pHostperlMemShared,
+				   pHost->m_pHostperlMemParse,
+				   pHost->m_pHostperlEnv,
+				   pHost->m_pHostperlStdIO,
+				   pHost->m_pHostperlLIO,
+				   pHost->m_pHostperlDir,
+				   pHost->m_pHostperlSock,
+				   pHost->m_pHostperlProc);
+	if (my_perl) {
+	    w32_internal_host = pHost;
+	    pHost->host_perl  = my_perl;
 	}
     }
-    catch(...)
-    {
-	win32_fprintf(stderr, "%s\n", "Error: Unable to allocate memory");
-	my_perl = NULL;
-    }
-
     return my_perl;
 }
 
-EXTERN_C void
-perl_construct(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-    try
-    {
-	Perl_construct();
-    }
-    catch(...)
-    {
-	win32_fprintf(stderr, "%s\n",
-		      "Error: Unable to construct data structures");
-	CPerlHost* pHost = (CPerlHost*)w32_internal_host;
-	Perl_free();
-	delete pHost;
-	SetPerlInterpreter(NULL);
-    }
-}
-
-EXTERN_C void
-perl_destruct(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#ifdef DEBUGGING
-    Perl_destruct();
-#else
-    try
-    {
-	Perl_destruct();
-    }
-    catch(...)
-    {
-    }
-#endif
-}
-
-EXTERN_C void
-perl_free(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#ifdef DEBUGGING
-    CPerlHost* pHost = (CPerlHost*)w32_internal_host;
-    Perl_free();
-    delete pHost;
-#else
-    try
-    {
-	CPerlHost* pHost = (CPerlHost*)w32_internal_host;
-	Perl_free();
-	delete pHost;
-    }
-    catch(...)
-    {
-    }
-#endif
-    SetPerlInterpreter(NULL);
-}
-
-EXTERN_C int
-perl_run(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#ifdef DEBUGGING
-    return Perl_run();
-#else
-    int retVal;
-    try
-    {
-	retVal = Perl_run();
-    }
-    catch(...)
-    {
-	win32_fprintf(stderr, "Error: Runtime exception\n");
-	retVal = -1;
-    }
-    return retVal;
-#endif
-}
-
-EXTERN_C int
-perl_parse(PerlInterpreter* my_perl, void (*xsinit)(CPerlObj*), int argc, char** argv, char** env)
-{
-    int retVal;
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#ifdef DEBUGGING
-    retVal = Perl_parse(xsinit, argc, argv, env);
-#else
-    try
-    {
-	retVal = Perl_parse(xsinit, argc, argv, env);
-    }
-    catch(...)
-    {
-	win32_fprintf(stderr, "Error: Parse exception\n");
-	retVal = -1;
-    }
-#endif
-    *win32_errno() = 0;
-    return retVal;
-}
-
-#undef PL_perl_destruct_level
-#define PL_perl_destruct_level int dummy
-
-#else /* !PERL_OBJECT */
-
 EXTERN_C PerlInterpreter*
 perl_alloc(void)
 {
-    PerlInterpreter *my_perl = NULL;
+    PerlInterpreter* my_perl = NULL;
     CPerlHost* pHost = new CPerlHost();
     if (pHost) {
 	my_perl = perl_alloc_using(pHost->m_pHostperlMem,
@@ -281,38 +138,29 @@ perl_alloc(void)
 				   pHost->m_pHostperlSock,
 				   pHost->m_pHostperlProc);
 	if (my_perl) {
-	    CPerlObj* pPerl = (CPerlObj*)my_perl;
 	    w32_internal_host = pHost;
+            pHost->host_perl  = my_perl;
 	}
     }
     return my_perl;
 }
 
-#endif /* PERL_OBJECT */
-#endif /* PERL_IMPLICIT_SYS */
-
-EXTERN_C HANDLE w32_perldll_handle;
-
-static DWORD g_TlsAllocIndex;
-
-EXTERN_C DllExport bool
-SetPerlInterpreter(void *interp)
+EXTERN_C void
+win32_delete_internal_host(void *h)
 {
-    return TlsSetValue(g_TlsAllocIndex, interp);
+    CPerlHost *host = (CPerlHost*)h;
+    delete host;
 }
 
-EXTERN_C DllExport void*
-GetPerlInterpreter(void)
-{
-    return TlsGetValue(g_TlsAllocIndex);
-}
+#endif /* PERL_IMPLICIT_SYS */
+
+EXTERN_C HANDLE w32_perldll_handle;
 
 EXTERN_C DllExport int
 RunPerl(int argc, char **argv, char **env)
 {
     int exitstatus;
     PerlInterpreter *my_perl, *new_perl = NULL;
-    struct perl_thread *thr;
 
 #ifndef __BORLANDC__
     /* XXX this _may_ be a problem on some compilers (e.g. Borland) that
@@ -342,41 +190,25 @@ RunPerl(int argc, char **argv, char **env)
 
     if (!(my_perl = perl_alloc()))
 	return (1);
-    perl_construct( my_perl );
+    perl_construct(my_perl);
     PL_perl_destruct_level = 0;
 
     exitstatus = perl_parse(my_perl, xs_init, argc, argv, env);
     if (!exitstatus) {
 #if defined(TOP_CLONE) && defined(USE_ITHREADS)		/* XXXXXX testing */
-#  ifdef PERL_OBJECT
-	CPerlHost *h = new CPerlHost();
-	new_perl = perl_clone_using(my_perl, 1,
-				    h->m_pHostperlMem,
-				    h->m_pHostperlMemShared,
-				    h->m_pHostperlMemParse,
-				    h->m_pHostperlEnv,
-				    h->m_pHostperlStdIO,
-				    h->m_pHostperlLIO,
-				    h->m_pHostperlDir,
-				    h->m_pHostperlSock,
-				    h->m_pHostperlProc
-				    );
-	CPerlObj *pPerl = (CPerlObj*)new_perl;
-#  else
 	new_perl = perl_clone(my_perl, 1);
-#  endif
-	exitstatus = perl_run( new_perl );
-	SetPerlInterpreter(my_perl);
+	exitstatus = perl_run(new_perl);
+	PERL_SET_THX(my_perl);
 #else
-	exitstatus = perl_run( my_perl );
+	exitstatus = perl_run(my_perl);
 #endif
     }
 
-    perl_destruct( my_perl );
-    perl_free( my_perl );
+    perl_destruct(my_perl);
+    perl_free(my_perl);
 #ifdef USE_ITHREADS
     if (new_perl) {
-	SetPerlInterpreter(new_perl);
+	PERL_SET_THX(new_perl);
 	perl_destruct(new_perl);
 	perl_free(new_perl);
     }
@@ -387,6 +219,16 @@ RunPerl(int argc, char **argv, char **env)
     return (exitstatus);
 }
 
+EXTERN_C void
+set_w32_module_name(void);
+
+EXTERN_C void
+EndSockets(void);
+
+
+#ifdef __MINGW32__
+EXTERN_C		/* GCC in C++ mode mangles the name, otherwise */
+#endif
 BOOL APIENTRY
 DllMain(HANDLE hModule,		/* DLL module handle */
 	DWORD fdwReason,	/* reason called */
@@ -404,16 +246,26 @@ DllMain(HANDLE hModule,		/* DLL module handle */
 	setmode( fileno( stderr ), O_BINARY );
 	_fmode = O_BINARY;
 #endif
-	g_TlsAllocIndex = TlsAlloc();
-	DisableThreadLibraryCalls(hModule);
+	DisableThreadLibraryCalls((HMODULE)hModule);
 	w32_perldll_handle = hModule;
+	set_w32_module_name();
 	break;
 
 	/* The DLL is detaching from a process due to
 	 * process termination or call to FreeLibrary.
 	 */
     case DLL_PROCESS_DETACH:
-	TlsFree(g_TlsAllocIndex);
+        /* As long as we use TerminateProcess()/TerminateThread() etc. for mimicing kill()
+           anything here had better be harmless if:
+            A. Not called at all.
+            B. Called after memory allocation for Heap has been forcibly removed by OS.
+            PerlIO_cleanup() was done here but fails (B).
+         */     
+	EndSockets();
+#if defined(USE_5005THREADS) || defined(USE_ITHREADS)
+	if (PL_curinterp)
+	    FREE_THREAD_KEY;
+#endif
 	break;
 
 	/* The attached process creates a new thread. */
@@ -429,3 +281,27 @@ DllMain(HANDLE hModule,		/* DLL module handle */
     }
     return TRUE;
 }
+
+#if defined(USE_ITHREADS) && defined(PERL_IMPLICIT_SYS)
+EXTERN_C PerlInterpreter *
+perl_clone_host(PerlInterpreter* proto_perl, UV flags) {
+    dTHX;
+    CPerlHost *h;
+    h = new CPerlHost(*(CPerlHost*)PL_sys_intern.internal_host);
+    proto_perl = perl_clone_using(proto_perl, flags,
+                        h->m_pHostperlMem,
+                        h->m_pHostperlMemShared,
+                        h->m_pHostperlMemParse,
+                        h->m_pHostperlEnv,
+                        h->m_pHostperlStdIO,
+                        h->m_pHostperlLIO,
+                        h->m_pHostperlDir,
+                        h->m_pHostperlSock,
+                        h->m_pHostperlProc
+    );
+    proto_perl->Isys_intern.internal_host = h;
+    h->host_perl  = proto_perl;
+    return proto_perl;
+	
+}
+#endif