You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by st...@apache.org on 2014/02/07 10:59:32 UTC
svn commit: r1565602 - in
/perl/modperl/branches/httpd24threading/xs/tables/current24:
Apache2/StructureTable.pm ModPerl/FunctionTable.pm
Author: stevehay
Date: Fri Feb 7 09:59:32 2014
New Revision: 1565602
URL: http://svn.apache.org/r1565602
Log:
Fix t/modperl/interpreter.t
ModPerl::Interpreter was added to the threading branch by r584377 and r594347 but when I merged those with the httpd24 branch into the httpd24threading branch the merge only went into xs/tables/current; I missed adding them to the new xs/tables/current24 too.
Note: This is a manual update of the xs/tables, just like the original commits on the threading branch appear to have been too judging by the fact that the timestamps at the tops of those files were not updated. I have not run "perl build/source_scan.pl" since it doesn't seem to run properly here on Windows, even after setting $Config{cppstdin}.
Modified:
perl/modperl/branches/httpd24threading/xs/tables/current24/Apache2/StructureTable.pm
perl/modperl/branches/httpd24threading/xs/tables/current24/ModPerl/FunctionTable.pm
Modified: perl/modperl/branches/httpd24threading/xs/tables/current24/Apache2/StructureTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/xs/tables/current24/Apache2/StructureTable.pm?rev=1565602&r1=1565601&r2=1565602&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/xs/tables/current24/Apache2/StructureTable.pm (original)
+++ perl/modperl/branches/httpd24threading/xs/tables/current24/Apache2/StructureTable.pm Fri Feb 7 09:59:32 2014
@@ -5341,6 +5341,126 @@ $Apache2::StructureTable = [
'name' => 'suexec_disabled_reason'
}
]
+ },
+ {
+ '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'
+ }
+ ]
+ },
+ {
+ 'type' => 'modperl_interp_pool_t',
+ 'elts' => [
+ {
+ 'type' => 'server_rec *',
+ 'name' => 'server'
+ },
+ {
+ 'type' => 'modperl_tipool_t *',
+ 'name' => 'tipool'
+ },
+ {
+ 'type' => 'modperl_tipool_config_t *',
+ 'name' => 'tipool_cfg'
+ },
+ {
+ 'type' => 'modperl_interp_t *',
+ 'name' => 'parent'
+ }
+ ]
+ },
+ {
+ 'type' => 'modperl_tipool_t',
+ 'elts' => [
+ {
+ 'type' => 'perl_mutex',
+ 'name' => 'tiplock'
+ },
+ {
+ 'type' => 'perl_cond',
+ 'name' => 'available'
+ },
+ {
+ 'type' => 'modperl_list_t *',
+ 'name' => 'idle'
+ },
+ {
+ 'type' => 'modperl_list_t *',
+ 'name' => 'busy'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'in_use'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'size'
+ },
+ {
+ 'type' => 'void *',
+ 'name' => 'data'
+ },
+ {
+ 'type' => 'modperl_tipool_config_t *',
+ 'name' => 'cfg'
+ },
+ {
+ 'type' => 'modperl_tipool_vtbl_t *',
+ 'name' => 'func'
+ }
+ ]
+ },
+ {
+ 'type' => 'modperl_tipool_config_t',
+ 'elts' => [
+ {
+ 'type' => 'int',
+ 'name' => 'start'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'min_spare'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'max_spare'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'max'
+ },
+ {
+ 'type' => 'int',
+ 'name' => 'max_requests'
+ }
+ ]
}
];
Modified: perl/modperl/branches/httpd24threading/xs/tables/current24/ModPerl/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24threading/xs/tables/current24/ModPerl/FunctionTable.pm?rev=1565602&r1=1565601&r2=1565602&view=diff
==============================================================================
--- perl/modperl/branches/httpd24threading/xs/tables/current24/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/branches/httpd24threading/xs/tables/current24/ModPerl/FunctionTable.pm Fri Feb 7 09:59:32 2014
@@ -8545,6 +8545,24 @@ $ModPerl::FunctionTable = [
'name' => 'func'
}
]
+ },
+ {
+ 'return_type' => 'modperl_interp_t *',
+ 'name' => 'mpxs_ModPerl__Interpreter_current',
+ 'attr' => [
+ 'static',
+ '__inline__'
+ ],
+ 'args' => [
+ {
+ 'type' => 'PerlInterpreter *',
+ 'name' => 'my_perl'
+ },
+ {
+ 'type' => 'SV *',
+ 'name' => 'class'
+ }
+ ]
}
];