X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=miniperlmain.c;h=bb49f5b88f841fdbf766e0e442c5d39c79b46ab1;hb=06c0cc96ebd866767a6d107ed78967600f7e0395;hp=1ac5de4723d52e78a5e5cd823ee046e4cf2fcaa2;hpb=cea2e8a9dd23747fd2b66edc86c58c64e9970321;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/miniperlmain.c b/miniperlmain.c
index 1ac5de4..bb49f5b 100644
--- a/miniperlmain.c
+++ b/miniperlmain.c
@@ -1,9 +1,33 @@
+/*    miniperlmain.c
+ *
+ *    Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
+ *    2004, 2005 by Larry Wall and others
+ *
+ *    You may distribute under the terms of either the GNU General Public
+ *    License or the Artistic License, as specified in the README file.
+ *
+ */
+
 /*
  * "The Road goes ever on and on, down from the door where it began."
  */
 
+/* This file contains the main() function for the perl interpreter.
+ * Note that miniperlmain.c contains main() for the 'miniperl' binary,
+ * while perlmain.c contains main() for the 'perl' binary.
+ *
+ * Miniperl is like perl except that it does not support dynamic loading,
+ * and in fact is used to build the dynamic modules needed for the 'real'
+ * perl executable.
+ */
+
 #ifdef OEMVS
-#pragma runopts(HEAP(1M,32K,ANYWHERE,KEEP,8K,4K))
+#ifdef MYMALLOC
+/* sbrk is limited to first heap segment so make it big */
+#pragma runopts(HEAP(8M,500K,ANYWHERE,KEEP,8K,4K) STACK(,,ANY,) ALL31(ON))
+#else
+#pragma runopts(HEAP(2M,500K,ANYWHERE,KEEP,8K,4K) STACK(,,ANY,) ALL31(ON))
+#endif
 #endif
 
 
@@ -13,7 +37,6 @@
 
 static void xs_init (pTHX);
 static PerlInterpreter *my_perl;
-static struct perl_thread *thr;		/* XXXXXX testing */
 
 #if defined (__MINT__) || defined (atarist)
 /* The Atari operating system doesn't have a dynamic stack.  The
@@ -21,44 +44,75 @@ static struct perl_thread *thr;		/* XXXXXX testing */
 long _stksize = 64 * 1024;
 #endif
 
+#if defined(PERL_GLOBAL_STRUCT_PRIVATE)
+/* The static struct perl_vars* may seem counterproductive since the
+ * whole idea PERL_GLOBAL_STRUCT_PRIVATE was to avoid statics, but note
+ * that this static is not in the shared perl library, the globals PL_Vars
+ * and PL_VarsPtr will stay away. */
+static struct perl_vars* my_plvarsp;
+struct perl_vars* Perl_GetVarsPrivate(void) { return my_plvarsp; }
+#endif
+
 int
 main(int argc, char **argv, char **env)
 {
+    dVAR;
     int exitstatus;
-
 #ifdef PERL_GLOBAL_STRUCT
-#define PERLVAR(var,type) /**/
-#define PERLVARI(var,type,init) PL_Vars.var = init;
-#define PERLVARIC(var,type,init) PL_Vars.var = init;
-#include "perlvars.h"
-#undef PERLVAR
-#undef PERLVARI
-#undef PERLVARIC
+    struct perl_vars *plvarsp = init_global_struct();
+#  ifdef PERL_GLOBAL_STRUCT_PRIVATE
+    my_vars = my_plvarsp = plvarsp;
+#  endif
+#endif /* PERL_GLOBAL_STRUCT */
+    (void)env;
+#ifndef PERL_USE_SAFE_PUTENV
+    PL_use_safe_putenv = 0;
+#endif /* PERL_USE_SAFE_PUTENV */
+
+    /* if user wants control of gprof profiling off by default */
+    /* noop unless Configure is given -Accflags=-DPERL_GPROF_CONTROL */
+    PERL_GPROF_MONCONTROL(0);
+
+    PERL_SYS_INIT3(&argc,&argv,&env);
+
+#if defined(USE_ITHREADS)
+    /* XXX Ideally, this should really be happening in perl_alloc() or
+     * perl_construct() to keep libperl.a transparently fork()-safe.
+     * It is currently done here only because Apache/mod_perl have
+     * problems due to lack of a call to cancel pthread_atfork()
+     * handlers when shared objects that contain the handlers may
+     * be dlclose()d.  This forces applications that embed perl to
+     * call PTHREAD_ATFORK() explicitly, but if and only if it hasn't
+     * been called at least once before in the current process.
+     * --GSAR 2001-07-20 */
+    PTHREAD_ATFORK(Perl_atfork_lock,
+                   Perl_atfork_unlock,
+                   Perl_atfork_unlock);
 #endif
 
-    PERL_SYS_INIT(&argc,&argv);
-
-    init_i18nl10n(1);
-
     if (!PL_do_undump) {
 	my_perl = perl_alloc();
 	if (!my_perl)
 	    exit(1);
-	perl_construct( my_perl );
+	perl_construct(my_perl);
 	PL_perl_destruct_level = 0;
     }
+    PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+    exitstatus = perl_parse(my_perl, xs_init, argc, argv, (char **)NULL);
+    if (!exitstatus)
+        perl_run(my_perl);
+      
+    exitstatus = perl_destruct(my_perl);
 
-    exitstatus = perl_parse( my_perl, xs_init, argc, argv, (char **) NULL );
-    if (!exitstatus) {
-	exitstatus = perl_run( my_perl );
-    }
+    perl_free(my_perl);
 
-    perl_destruct( my_perl );
-    perl_free( my_perl );
+#ifdef PERL_GLOBAL_STRUCT
+    free_global_struct(plvarsp);
+#endif /* PERL_GLOBAL_STRUCT */
 
     PERL_SYS_TERM();
 
-    exit( exitstatus );
+    exit(exitstatus);
     return exitstatus;
 }
 
@@ -69,5 +123,15 @@ main(int argc, char **argv, char **env)
 static void
 xs_init(pTHX)
 {
-  dXSUB_SYS;
+    dXSUB_SYS;
 }
+
+/*
+ * Local variables:
+ * c-indentation-style: bsd
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ *
+ * ex: set ts=8 sts=4 sw=4 noet:
+ */