pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 01:11:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system.

Browse Source
This commit is contained in:
SecretsOTheP 2013-10-10 05:15:38 -07:00
parent c13c039721
commit 6154cfce99
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -1,5 +1,8 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 10/10/2013 ==
Secrets: Fixed zone shutdown (or #reloadqst) reinitalization of Perl. This should allow for Perl 5.14 and later to work on Windows under the new quest system.
== 10/09/2013 == == 10/09/2013 ==
demonstar55: Fixed some more instances of the AA timer being eaten demonstar55: Fixed some more instances of the AA timer being eaten

51
zone/embperl.cpp
View File

@ -43,6 +43,17 @@ EXTERN_C XS(boot_PerlPacket);
XS(XS_EQEmuIO_PRINT); XS(XS_EQEmuIO_PRINT);
#endif //EMBPERL_IO_CAPTURE #endif //EMBPERL_IO_CAPTURE
const char *argv_eqemu[] = { "",
#ifdef EMBPERL_IO_CAPTURE
"-w", "-W",
#endif
"-e", "0;", nullptr };
#ifdef EMBPERL_IO_CAPTURE
int argc = 5;
#else
int argc = 3;
#endif
//so embedded scripts can use xs extensions (ala 'use socket;') //so embedded scripts can use xs extensions (ala 'use socket;')
EXTERN_C void boot_DynaLoader(pTHX_ CV* cv); EXTERN_C void boot_DynaLoader(pTHX_ CV* cv);
EXTERN_C void xs_init(pTHX) EXTERN_C void xs_init(pTHX)
@ -85,38 +96,25 @@ EXTERN_C void xs_init(pTHX)
Embperl::Embperl() Embperl::Embperl()
{ {
char **argv = (char **)argv_eqemu;
char **env = { nullptr };
in_use = true; //in case one of these files generates an event in_use = true; //in case one of these files generates an event
PERL_SYS_INIT3(&argc, &argv, &env);
//setup perl...
my_perl = perl_alloc();
if(!my_perl)
throw "Failed to init Perl (perl_alloc)";
DoInit(); DoInit();
} }
void Embperl::DoInit() { void Embperl::DoInit() {
const char *argv_eqemu[] = { "",
#ifdef EMBPERL_IO_CAPTURE
"-w", "-W",
#endif
"-e", "0;", nullptr };
int argc = 3;
#ifdef EMBPERL_IO_CAPTURE
argc = 5;
#endif
char **argv = (char **)argv_eqemu; char **argv = (char **)argv_eqemu;
char **env = { nullptr }; char **env = { nullptr };
my_perl = perl_alloc();
//setup perl...
if(!my_perl)
throw "Failed to init Perl (perl_alloc)";
PERL_SET_CONTEXT(my_perl);
PERL_SET_INTERP(my_perl);
PL_perl_destruct_level = 1; PL_perl_destruct_level = 1;
perl_construct(my_perl); perl_construct(my_perl);
perl_parse(my_perl, xs_init, argc, argv, nullptr);
PERL_SYS_INIT3(&argc, &argv, &env);
perl_parse(my_perl, xs_init, argc, argv, env);
perl_run(my_perl); perl_run(my_perl);
//a little routine we use a lot. //a little routine we use a lot.
@ -213,12 +211,19 @@ Embperl::~Embperl()
,FALSE); ,FALSE);
#endif #endif
perl_free(my_perl); perl_free(my_perl);
PERL_SYS_TERM();
my_perl = NULL;
} }
void Embperl::Reinit() { void Embperl::Reinit() {
in_use = true; in_use = true;
PERL_SET_CONTEXT(my_perl);
PERL_SET_INTERP(my_perl);
PL_perl_destruct_level = 1; PL_perl_destruct_level = 1;
perl_destruct(my_perl); perl_destruct(my_perl);
perl_free(my_perl);
my_perl = NULL;
//Now reinit...
DoInit(); DoInit();
in_use = false; in_use = false;
} }