}
}
-#ifdef PERL_OBJECT
-
EXTERN_C PerlInterpreter*
perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
struct IPerlMem** ppMemParse, struct IPerlEnv** ppEnv,
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;
- }
+ 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) {
+#ifdef PERL_OBJECT
+ CPerlObj* pPerl = (CPerlObj*)my_perl;
+#endif
+ w32_internal_host = pHost;
}
}
- catch(...)
- {
- win32_fprintf(stderr, "%s\n", "Error: Unable to allocate memory");
- my_perl = NULL;
- }
-
return my_perl;
}
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;
- }
+ 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) {
+#ifdef PERL_OBJECT
+ CPerlObj* pPerl = (CPerlObj*)my_perl;
+#endif
+ w32_internal_host = pHost;
}
}
- catch(...)
- {
- win32_fprintf(stderr, "%s\n", "Error: Unable to allocate memory");
- my_perl = NULL;
- }
-
return my_perl;
}
EXTERN_C void
+win32_delete_internal_host(void *h)
+{
+ CPerlHost *host = (CPerlHost*)h;
+ delete host;
+}
+
+#ifdef PERL_OBJECT
+
+EXTERN_C void
perl_construct(PerlInterpreter* my_perl)
{
CPerlObj* pPerl = (CPerlObj*)my_perl;
{
win32_fprintf(stderr, "%s\n",
"Error: Unable to construct data structures");
- CPerlHost* pHost = (CPerlHost*)w32_internal_host;
- Perl_free();
- delete pHost;
- SetPerlInterpreter(NULL);
+ perl_free(my_perl);
}
}
perl_free(PerlInterpreter* my_perl)
{
CPerlObj* pPerl = (CPerlObj*)my_perl;
+ void *host = w32_internal_host;
#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);
+ win32_delete_internal_host(host);
+ PERL_SET_THX(NULL);
}
EXTERN_C int
perl_run(PerlInterpreter* my_perl)
{
CPerlObj* pPerl = (CPerlObj*)my_perl;
+ int retVal;
#ifdef DEBUGGING
- return Perl_run();
+ retVal = Perl_run();
#else
- int retVal;
try
{
retVal = Perl_run();
win32_fprintf(stderr, "Error: Runtime exception\n");
retVal = -1;
}
- return retVal;
#endif
+ return retVal;
}
EXTERN_C int
#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;
- 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) {
- w32_internal_host = pHost;
- }
- }
- 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)
-{
- return TlsSetValue(g_TlsAllocIndex, interp);
-}
-
-EXTERN_C DllExport void*
-GetPerlInterpreter(void)
-{
- return TlsGetValue(g_TlsAllocIndex);
-}
-
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
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);
# 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);
}
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 */
setmode( fileno( stderr ), O_BINARY );
_fmode = O_BINARY;
#endif
- g_TlsAllocIndex = TlsAlloc();
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);
+ EndSockets();
break;
/* The attached process creates a new thread. */
https://perl5.git.perl.org / perl5.git / blobdiff