perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
Date Fri, 23 Apr 2004 18:00:32 GMT
stas        2004/04/23 11:00:32

  Modified:    .        Changes
               xs/APR/Socket APR__Socket.h
               xs/maps  apr_functions.map
               xs/tables/current/ModPerl FunctionTable.pm
  Log:
  - APR::Socket::timeout_set now croaks on failure
  - header file cleanup
  
  Revision  Changes    Path
  1.361     +2 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.360
  retrieving revision 1.361
  diff -u -u -r1.360 -r1.361
  --- Changes	22 Apr 2004 23:14:31 -0000	1.360
  +++ Changes	23 Apr 2004 18:00:31 -0000	1.361
  @@ -12,6 +12,8 @@
   
   =item 1.99_14-dev
   
  +APR::Socket::timeout_set now croaks on failure [Stas]
  +
   significantly speedup the startup of threaded mpm test suite, by
   configuring only the minimal number of perl interpreters to start
   [Stas]
  
  
  
  1.7       +21 -8     modperl-2.0/xs/APR/Socket/APR__Socket.h
  
  Index: APR__Socket.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/Socket/APR__Socket.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- APR__Socket.h	22 Apr 2004 23:14:31 -0000	1.6
  +++ APR__Socket.h	23 Apr 2004 18:00:32 -0000	1.7
  @@ -13,8 +13,9 @@
    * limitations under the License.
    */
   
  -static MP_INLINE apr_status_t mpxs_apr_socket_recv(pTHX_ apr_socket_t *socket,
  -                                                   SV *sv_buf, SV *sv_len)
  +static MP_INLINE
  +apr_status_t mpxs_apr_socket_recv(pTHX_ apr_socket_t *socket,
  +                                  SV *sv_buf, SV *sv_len)
   {
       apr_status_t status;
       apr_size_t len = mp_xs_sv2_apr_size_t(sv_len);
  @@ -30,8 +31,9 @@
       return status;
   }
   
  -static MP_INLINE apr_status_t mpxs_apr_socket_send(pTHX_ apr_socket_t *socket,
  -                                                   SV *sv_buf, SV *sv_len)
  +static MP_INLINE
  +apr_status_t mpxs_apr_socket_send(pTHX_ apr_socket_t *socket,
  +                                  SV *sv_buf, SV *sv_len)
   {
       apr_status_t status;
       apr_size_t buf_len;
  @@ -50,8 +52,9 @@
       return status;
   }
   
  -static MP_INLINE apr_interval_time_t
  -mpxs_apr_socket_timeout_get(pTHX_ I32 items, SV **MARK, SV **SP)
  +static MP_INLINE
  +apr_interval_time_t mpxs_apr_socket_timeout_get(pTHX_ I32 items,
  +                                                SV **MARK, SV **SP)
   {
       apr_interval_time_t	t;
       APR__Socket APR__Socket;
  @@ -65,7 +68,17 @@
   }
   
   static MP_INLINE
  -apr_int32_t mpxs_APR__Socket_opt_get(pTHX_ apr_socket_t *socket, apr_int32_t opt)
  +void mpxs_APR__Socket_timeout_set(pTHX_ apr_socket_t *socket,
  +                                 apr_interval_time_t t)
  +{
  +    MP_FAILURE_CROAK(apr_socket_timeout_set(socket, t));
  +}
  +
  +
  +
  +static MP_INLINE
  +apr_int32_t mpxs_APR__Socket_opt_get(pTHX_ apr_socket_t *socket,
  +                                     apr_int32_t opt)
   {
       apr_int32_t val;
       MP_FAILURE_CROAK(apr_socket_opt_get(socket, opt, &val));
  @@ -74,7 +87,7 @@
   
   static MP_INLINE
   void mpxs_APR__Socket_opt_set(pTHX_ apr_socket_t *socket, apr_int32_t opt,
  -                         apr_int32_t val)
  +                              apr_int32_t val)
   {
       MP_FAILURE_CROAK(apr_socket_opt_set(socket, opt, val));
   }
  
  
  
  1.72      +3 -2      modperl-2.0/xs/maps/apr_functions.map
  
  Index: apr_functions.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/apr_functions.map,v
  retrieving revision 1.71
  retrieving revision 1.72
  diff -u -u -r1.71 -r1.72
  --- apr_functions.map	8 Apr 2004 20:47:41 -0000	1.71
  +++ apr_functions.map	23 Apr 2004 18:00:32 -0000	1.72
  @@ -59,11 +59,12 @@
   !apr_socket_data_get
   !apr_socket_data_set
   -apr_socket_opt_get
  --apr_socket_opt_set
    mpxs_APR__Socket_opt_get
  +-apr_socket_opt_set
    mpxs_APR__Socket_opt_set
    apr_socket_timeout_get | mpxs_ | ...
  - apr_socket_timeout_set
  +-apr_socket_timeout_set
  + mpxs_APR__Socket_timeout_set
   -apr_socket_sendfile
   -apr_socket_sendv
   !apr_socket_from_file
  
  
  
  1.153     +20 -10    modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm
  
  Index: FunctionTable.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/tables/current/ModPerl/FunctionTable.pm,v
  retrieving revision 1.152
  retrieving revision 1.153
  diff -u -u -r1.152 -r1.153
  --- FunctionTable.pm	22 Apr 2004 23:14:31 -0000	1.152
  +++ FunctionTable.pm	23 Apr 2004 18:00:32 -0000	1.153
  @@ -2,7 +2,7 @@
   
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   # ! WARNING: generated by ModPerl::ParseSource/0.01
  -# !          Thu Apr 22 13:15:57 2004
  +# !          Thu Apr 22 21:47:52 2004
   # !          do NOT edit, any changes will be lost !
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   
  @@ -5446,6 +5446,24 @@
       ]
     },
     {
  +    'return_type' => 'void',
  +    'name' => 'mpxs_APR__Socket_timeout_set',
  +    'args' => [
  +      {
  +        'type' => 'PerlInterpreter *',
  +        'name' => 'my_perl'
  +      },
  +      {
  +        'type' => 'apr_socket_t *',
  +        'name' => 'socket'
  +      },
  +      {
  +        'type' => 'apr_interval_time_t',
  +        'name' => 't'
  +      }
  +    ]
  +  },
  +  {
       'return_type' => 'SV *',
       'name' => 'mpxs_APR__String_strfsize',
       'args' => [
  @@ -7101,10 +7119,6 @@
     {
       'return_type' => 'apr_status_t',
       'name' => 'mpxs_apr_socket_recv',
  -    'attr' => [
  -      'static',
  -      '__inline__'
  -    ],
       'args' => [
         {
           'type' => 'PerlInterpreter *',
  @@ -7127,10 +7141,6 @@
     {
       'return_type' => 'apr_status_t',
       'name' => 'mpxs_apr_socket_send',
  -    'attr' => [
  -      'static',
  -      '__inline__'
  -    ],
       'args' => [
         {
           'type' => 'PerlInterpreter *',
  @@ -7151,7 +7161,7 @@
       ]
     },
     {
  -    'return_type' => '',
  +    'return_type' => 'apr_interval_time_t',
       'name' => 'mpxs_apr_socket_timeout_get',
       'args' => [
         {
  
  
  

Mime
View raw message