perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkal...@apache.org
Subject svn commit: r1498355 - in /perl/modperl/branches/httpd24/xs: Apache2/ServerRec/ maps/ tables/current24/Apache2/ tables/current24/ModPerl/
Date Mon, 01 Jul 2013 10:40:29 GMT
Author: jkaluza
Date: Mon Jul  1 10:40:28 2013
New Revision: 1498355

URL: http://svn.apache.org/r1498355
Log:
Wrap server_rec::is_virtual as int (not as char)

Modified:
    perl/modperl/branches/httpd24/xs/Apache2/ServerRec/Apache2__ServerRec.h
    perl/modperl/branches/httpd24/xs/maps/apache2_structures.map
    perl/modperl/branches/httpd24/xs/maps/modperl_functions.map
    perl/modperl/branches/httpd24/xs/tables/current24/Apache2/ConstantsTable.pm
    perl/modperl/branches/httpd24/xs/tables/current24/Apache2/FunctionTable.pm
    perl/modperl/branches/httpd24/xs/tables/current24/Apache2/StructureTable.pm
    perl/modperl/branches/httpd24/xs/tables/current24/ModPerl/FunctionTable.pm

Modified: perl/modperl/branches/httpd24/xs/Apache2/ServerRec/Apache2__ServerRec.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/Apache2/ServerRec/Apache2__ServerRec.h?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/Apache2/ServerRec/Apache2__ServerRec.h (original)
+++ perl/modperl/branches/httpd24/xs/Apache2/ServerRec/Apache2__ServerRec.h Mon Jul  1 10:40:28
2013
@@ -16,4 +16,17 @@
 
 #if AP_SERVER_MAJORVERSION_NUMBER>2 || AP_SERVER_MINORVERSION_NUMBER>=3
 #define loglevel log.level
+
+static MP_INLINE
+int mpxs_Apache2__ServerRec_is_virtual(pTHX_ server_rec *s, SV *val)
+{
+    int retval = s->is_virtual;
+
+    if (val) {
+        s->is_virtual = SvIV(val);
+    }
+
+    return retval;
+}
+
 #endif

Modified: perl/modperl/branches/httpd24/xs/maps/apache2_structures.map
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/maps/apache2_structures.map?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/maps/apache2_structures.map (original)
+++ perl/modperl/branches/httpd24/xs/maps/apache2_structures.map Mon Jul  1 10:40:28 2013
@@ -99,7 +99,7 @@ $  port
 %  error_fname
 $  error_log
 $  loglevel
-<  is_virtual
+~  is_virtual
 <  module_config
 <  lookup_defaults
 <  addrs

Modified: perl/modperl/branches/httpd24/xs/maps/modperl_functions.map
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/maps/modperl_functions.map?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/maps/modperl_functions.map (original)
+++ perl/modperl/branches/httpd24/xs/maps/modperl_functions.map Mon Jul  1 10:40:28 2013
@@ -21,6 +21,9 @@ MODULE=Apache2::RequestRec   PACKAGE=Apa
  mpxs_Apache2__RequestRec_finfo | | r, finfo=NULL
  mpxs_Apache2__RequestRec_handler | | ...
  mpxs_Apache2__RequestRec_content_languages | | r, languages=(SV *)NULL
+,
+MODULE=Apache2::ServerRec   PACKAGE=Apache2::ServerRec
+ mpxs_Apache2__ServerRec_is_virtual       | | server_rec *:s, val=(SV *)NULL
 
 MODULE=Apache2::RequestUtil   PACKAGE=guess
  mpxs_Apache2__RequestRec_push_handlers

Modified: perl/modperl/branches/httpd24/xs/tables/current24/Apache2/ConstantsTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/tables/current24/Apache2/ConstantsTable.pm?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/tables/current24/Apache2/ConstantsTable.pm (original)
+++ perl/modperl/branches/httpd24/xs/tables/current24/Apache2/ConstantsTable.pm Mon Jul  1
10:40:28 2013
@@ -2,7 +2,7 @@ package Apache2::ConstantsTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # ! WARNING: generated by Apache2::ParseSource/0.02
-# !          Wed Feb 20 16:22:03 2013
+# !          Mon Jul  1 12:38:09 2013
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 

Modified: perl/modperl/branches/httpd24/xs/tables/current24/Apache2/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/tables/current24/Apache2/FunctionTable.pm?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/tables/current24/Apache2/FunctionTable.pm (original)
+++ perl/modperl/branches/httpd24/xs/tables/current24/Apache2/FunctionTable.pm Mon Jul  1
10:40:28 2013
@@ -2,7 +2,7 @@ package Apache2::FunctionTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # ! WARNING: generated by Apache2::ParseSource/0.02
-# !          Wed Feb 20 16:22:05 2013
+# !          Mon Jul  1 12:38:14 2013
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -389,6 +389,24 @@ $Apache2::FunctionTable = [
     ]
   },
   {
+    'return_type' => 'void',
+    'name' => 'ap_bin2hex',
+    'args' => [
+      {
+        'type' => 'const void *',
+        'name' => 'src'
+      },
+      {
+        'type' => 'apr_size_t',
+        'name' => 'srclen'
+      },
+      {
+        'type' => 'char *',
+        'name' => 'dest'
+      }
+    ]
+  },
+  {
     'return_type' => 'apr_bucket *',
     'name' => 'ap_bucket_eoc_create',
     'args' => [
@@ -2094,6 +2112,16 @@ $Apache2::FunctionTable = [
     ]
   },
   {
+    'return_type' => 'void',
+    'name' => 'ap_get_loadavg',
+    'args' => [
+      {
+        'type' => 'ap_loadavg_t *',
+        'name' => 'ld'
+      }
+    ]
+  },
+  {
     'return_type' => 'char *',
     'name' => 'ap_get_local_host',
     'args' => [
@@ -2335,6 +2363,16 @@ $Apache2::FunctionTable = [
     'args' => []
   },
   {
+    'return_type' => 'void',
+    'name' => 'ap_get_sload',
+    'args' => [
+      {
+        'type' => 'ap_sload_t *',
+        'name' => 'ld'
+      }
+    ]
+  },
+  {
     'return_type' => 'const char *',
     'name' => 'ap_get_status_line',
     'args' => [

Modified: perl/modperl/branches/httpd24/xs/tables/current24/Apache2/StructureTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/tables/current24/Apache2/StructureTable.pm?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/tables/current24/Apache2/StructureTable.pm (original)
+++ perl/modperl/branches/httpd24/xs/tables/current24/Apache2/StructureTable.pm Mon Jul  1
10:40:28 2013
@@ -2,7 +2,7 @@ package Apache2::StructureTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # ! WARNING: generated by Apache2::ParseSource/0.02
-# !          Wed Feb 20 16:22:05 2013
+# !          Mon Jul  1 12:38:15 2013
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -2128,6 +2128,23 @@ $Apache2::StructureTable = [
     ]
   },
   {
+    'type' => 'ap_loadavg_t',
+    'elts' => [
+      {
+        'type' => 'float',
+        'name' => 'loadavg'
+      },
+      {
+        'type' => 'float',
+        'name' => 'loadavg5'
+      },
+      {
+        'type' => 'float',
+        'name' => 'loadavg15'
+      }
+    ]
+  },
+  {
     'type' => 'ap_method_list_t',
     'elts' => [
       {
@@ -2304,6 +2321,27 @@ $Apache2::StructureTable = [
     'elts' => []
   },
   {
+    'type' => 'ap_sload_t',
+    'elts' => [
+      {
+        'type' => 'int',
+        'name' => 'idle'
+      },
+      {
+        'type' => 'int',
+        'name' => 'busy'
+      },
+      {
+        'type' => 'apr_off_t',
+        'name' => 'bytes_served'
+      },
+      {
+        'type' => 'unsigned long',
+        'name' => 'access_count'
+      }
+    ]
+  },
+  {
     'type' => 'ap_slotmem_callback_fn_t',
     'elts' => []
   },
@@ -2361,6 +2399,10 @@ $Apache2::StructureTable = [
       {
         'type' => 'apr_status_t(*)(ap_slotmem_instance_t *s, unsigned int item_id)',
         'name' => 'release'
+      },
+      {
+        'type' => 'apr_status_t(*)(ap_slotmem_instance_t *s, unsigned int item_id)',
+        'name' => 'fgrab'
       }
     ]
   },
@@ -2609,6 +2651,16 @@ $Apache2::StructureTable = [
     'elts' => []
   },
   {
+    'type' => 'apr_OFN_xml2enc_charset_t
+ ',
+    'elts' => []
+  },
+  {
+    'type' => 'apr_OFN_xml2enc_filter_t
+ ',
+    'elts' => []
+  },
+  {
     'type' => 'apr_abortfunc_t',
     'elts' => []
   },

Modified: perl/modperl/branches/httpd24/xs/tables/current24/ModPerl/FunctionTable.pm
URL: http://svn.apache.org/viewvc/perl/modperl/branches/httpd24/xs/tables/current24/ModPerl/FunctionTable.pm?rev=1498355&r1=1498354&r2=1498355&view=diff
==============================================================================
--- perl/modperl/branches/httpd24/xs/tables/current24/ModPerl/FunctionTable.pm (original)
+++ perl/modperl/branches/httpd24/xs/tables/current24/ModPerl/FunctionTable.pm Mon Jul  1
10:40:28 2013
@@ -2,7 +2,7 @@ package ModPerl::FunctionTable;
 
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 # ! WARNING: generated by ModPerl::ParseSource/0.01
-# !          Wed Feb 20 16:22:07 2013
+# !          Mon Jul  1 12:38:19 2013
 # !          do NOT edit, any changes will be lost !
 # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -7662,6 +7662,24 @@ $ModPerl::FunctionTable = [
   },
   {
     'return_type' => 'int',
+    'name' => 'mpxs_Apache2__ServerRec_is_virtual',
+    'args' => [
+      {
+        'type' => 'PerlInterpreter*',
+        'name' => 'my_perl'
+      },
+      {
+        'type' => 'server_rec *',
+        'name' => 's'
+      },
+      {
+        'type' => 'SV *',
+        'name' => 'val'
+      }
+    ]
+  },
+  {
+    'return_type' => 'int',
     'name' => 'mpxs_Apache2__ServerRec_loglevel',
     'args' => [
       {



Mime
View raw message