perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From steve...@apache.org
Subject svn commit: r1602082 - in /perl/modperl/trunk: ./ t/modperl/ t/response/TestModperl/ xs/ModPerl/Interpreter/ xs/maps/ xs/tables/current/Apache2/ xs/tables/current/ModPerl/
Date Thu, 12 Jun 2014 07:44:01 GMT
Author: stevehay
Date: Thu Jun 12 07:44:00 2014
New Revision: 1602082

URL: http://svn.apache.org/r1602082
Log:
Merged revision(s) 1537484 from perl/modperl/branches/httpd24threading:
Merged revision(s) 584377 from perl/modperl/branches/threading:
Introduce ModPerl::Interpreter, an interface to modperl_interp_t.
Note, this currently does not behave correctly with a non-threaded
Apache

Submitted-By Torsten Foertsch <torsten.foertsch@gmx.net>
Message-Id: <200710101543.33946.torsten.foertsch@gmx.net>
Reviewed-By: gozer

........

........

Added:
    perl/modperl/trunk/t/response/TestModperl/interpreter.pm
      - copied unchanged from r1537484, perl/modperl/branches/httpd24threading/t/response/TestModperl/interpreter.pm
    perl/modperl/trunk/xs/ModPerl/Interpreter/
      - copied from r1537484, perl/modperl/branches/httpd24threading/xs/ModPerl/Interpreter/
    perl/modperl/trunk/xs/maps/modperl_structures.map
      - copied unchanged from r1537484, perl/modperl/branches/httpd24threading/xs/maps/modperl_structures.map
Modified:
    perl/modperl/trunk/   (props changed)
    perl/modperl/trunk/Changes
    perl/modperl/trunk/t/modperl/   (props changed)
    perl/modperl/trunk/xs/maps/modperl_functions.map
    perl/modperl/trunk/xs/maps/modperl_types.map
    perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm
    perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm

Propchange: perl/modperl/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jun 12 07:44:00 2014
@@ -0,0 +1,2 @@
+/perl/modperl/branches/httpd24threading:1537484
+/perl/modperl/branches/threading:584377

Modified: perl/modperl/trunk/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=1602082&r1=1602081&r2=1602082&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Thu Jun 12 07:44:00 2014
@@ -12,6 +12,8 @@ Also refer to the Apache::Test changes l
 
 =item 2.0.9-dev
 
+Expose modperl_interp_t via ModPerl::Interpreter [Torsten Foertsch]
+
 Fix t/compat/apache_file.t on Windows. Apache::File->tmpfile() wants TMPDIR
 or TEMP from the environment, or else defaults to /tmp. The latter is no
 good on Windows, so make sure the environment variables are passed through.

Propchange: perl/modperl/trunk/t/modperl/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Jun 12 07:44:00 2014
@@ -1,6 +1,7 @@
 current_callback.t
 env.t
 endav.t
+interpreter.t
 printf.t
 print.t
 dir_config.t

Modified: perl/modperl/trunk/xs/maps/modperl_functions.map
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/modperl_functions.map?rev=1602082&r1=1602081&r2=1602082&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/modperl_functions.map (original)
+++ perl/modperl/trunk/xs/maps/modperl_functions.map Thu Jun 12 07:44:00 2014
@@ -162,3 +162,6 @@ MODULE=Apache2::MPM    PACKAGE=Apache2::
 
 MODULE=Apache2::Access   PACKAGE=guess
  mpxs_Apache2__RequestRec_allow_override_opts
+
+MODULE=ModPerl::Interpreter
+ mpxs_ModPerl__Interpreter_current

Modified: perl/modperl/trunk/xs/maps/modperl_types.map
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/maps/modperl_types.map?rev=1602082&r1=1602081&r2=1602082&view=diff
==============================================================================
--- perl/modperl/trunk/xs/maps/modperl_types.map (original)
+++ perl/modperl/trunk/xs/maps/modperl_types.map Thu Jun 12 07:44:00 2014
@@ -1,6 +1,9 @@
 ##########  mod_perl types  ##########
 
 struct modperl_filter_t | Apache2::OutputFilter
+struct modperl_interp_t | ModPerl::Interpreter
+modperl_interp_pool_t * | IV
+PerlInterpreter *       | IV
 
 ##########  Perl types  ##########
 

Modified: perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm?rev=1602082&r1=1602081&r2=1602082&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/Apache2/StructureTable.pm Thu Jun 12 07:44:00 2014
@@ -3333,6 +3333,39 @@ $Apache2::StructureTable = [
         'name' => 'suexec_enabled'
       }
     ]
+  },
+  {
+    'type' => 'modperl_interp_t',
+    'elts' => [
+      {
+        'type' => 'modperl_interp_pool_t *',
+        'name' => 'mip'
+      },
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'perl'
+      },
+      {
+        'type' => 'int',
+        'name' => 'num_requests'
+      },
+      {
+        'type' => 'U8',
+        'name' => 'flags'
+      },
+      {
+        'type' => 'modperl_config_con_t *',
+        'name' => 'ccfg'
+      },
+      {
+        'type' => 'int',
+        'name' => 'refcnt'
+      },
+      {
+        'type' => 'unsigned long',
+        'name' => 'tid'
+      }
+    ]
   }
 ];
 

Modified: perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm?rev=1602082&r1=1602081&r2=1602082&view=diff
==============================================================================
--- perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/trunk/xs/tables/current/ModPerl/FunctionTable.pm Thu Jun 12 07:44:00 2014
@@ -8255,6 +8255,20 @@ $ModPerl::FunctionTable = [
         'name' => 'func'
       }
     ]
+  },
+  {
+    'return_type' => 'modperl_interp_t *',
+    'name' => 'mpxs_ModPerl__Interpreter_current',
+    'attr' => [
+      'static',
+      '__inline__'
+    ],
+    'args' => [
+      {
+        'type' => 'PerlInterpreter *',
+        'name' => 'my_perl'
+      }
+    ]
   }
 ];
 



Mime
View raw message