geoff 2003/08/28 11:33:32
Modified: xs/APR/Socket APR__Socket.h
xs/maps apr_functions.map
xs/tables/current/Apache FunctionTable.pm
xs/tables/current/ModPerl FunctionTable.pm
Log:
sync apr socket and pool functions
Submitted by: geoff
Reviewed by: stas
Revision Changes Path
1.3 +6 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- APR__Socket.h 15 Apr 2003 08:39:52 -0000 1.2
+++ APR__Socket.h 28 Aug 2003 18:33:32 -0000 1.3
@@ -1,11 +1,11 @@
-static MP_INLINE apr_status_t mpxs_apr_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);
mpxs_sv_grow(sv_buf, len);
- status = apr_recv(socket, SvPVX(sv_buf), &len);
+ status = apr_socket_recv(socket, SvPVX(sv_buf), &len);
mpxs_sv_cur_set(sv_buf, len);
if (!SvREADONLY(sv_len)) {
@@ -15,8 +15,8 @@
return status;
}
-static MP_INLINE apr_status_t mpxs_apr_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;
@@ -26,7 +26,7 @@
buf_len = SvIV(sv_len);
}
- status = apr_send(socket, buffer, &buf_len);
+ status = apr_socket_send(socket, buffer, &buf_len);
if (sv_len && !SvREADONLY(sv_len)) {
sv_setiv(sv_len, buf_len);
1.54 +18 -19 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- apr_functions.map 19 Aug 2003 19:30:33 -0000 1.53
+++ apr_functions.map 28 Aug 2003 18:33:32 -0000 1.54
@@ -42,15 +42,15 @@
apr_array_push
MODULE=APR::Socket
- apr_bind
-!apr_accept
- apr_listen
- apr_connect
- apr_recv | mpxs_ | sock, SV *:buf, SV *:len
- apr_recvfrom
- apr_send | mpxs_ | sock, SV *:buf, SV *:len=Nullsv
- apr_sendto
-!apr_shutdown
+ apr_socket_bind
+!apr_socket_accept
+ apr_socket_listen
+ apr_socket_connect
+ apr_socket_recv | mpxs_ | sock, SV *:buf, SV *:len
+ apr_socket_recvfrom
+ apr_socket_send | mpxs_ | sock, SV *:buf, SV *:len=Nullsv
+ apr_socket_sendto
+!apr_socket_shutdown
-apr_socket_inherit_set
-apr_socket_inherit_unset
@@ -64,8 +64,8 @@
apr_socket_opt_set
apr_socket_timeout_get | mpxs_ | ...
apr_socket_timeout_set
--apr_sendfile
--apr_sendv
+-apr_socket_sendfile
+-apr_socket_sendv
!apr_socket_from_file
MODULE=APR::SockAddr
@@ -176,10 +176,10 @@
-apr_pcalloc
-apr_pmemdup
!apr_pool_child_cleanup_set
-!apr_pool_get_abort
- apr_pool_get_parent
+!apr_pool_abort_get
+ apr_pool_parent_get
apr_pool_is_ancestor
--apr_pool_set_abort
+-apr_pool_abort_set
>apr_pool_initialize
>apr_pool_terminate
apr_pool_tag
@@ -189,11 +189,10 @@
apr_allocator_create
apr_allocator_destroy
apr_allocator_free
- apr_allocator_get_mutex
- apr_allocator_get_mutex
- apr_allocator_get_owner
- apr_allocator_set_mutex
- apr_allocator_set_owner
+ apr_allocator_mutex_get
+ apr_allocator_owner_get
+ apr_allocator_mutex_set
+ apr_allocator_owner_set
-MODULE=APR::Atomic
apr_atomic_add
1.45 +11 -163 modperl-2.0/xs/tables/current/Apache/FunctionTable.pm
Index: FunctionTable.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/tables/current/Apache/FunctionTable.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- FunctionTable.pm 19 Aug 2003 19:30:33 -0000 1.44
+++ FunctionTable.pm 28 Aug 2003 18:33:32 -0000 1.45
@@ -5460,7 +5460,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_accept',
+ 'name' => 'apr_socket_accept',
'args' => [
{
'type' => 'apr_socket_t **',
@@ -5525,26 +5525,6 @@
]
},
{
- 'return_type' => 'apr_thread_mutex_t *',
- 'name' => 'apr_allocator_get_mutex',
- 'args' => [
- {
- 'type' => 'apr_allocator_t *',
- 'name' => 'allocator'
- }
- ]
- },
- {
- 'return_type' => 'apr_pool_t *',
- 'name' => 'apr_allocator_get_owner',
- 'args' => [
- {
- 'type' => 'apr_allocator_t *',
- 'name' => 'allocator'
- }
- ]
- },
- {
'return_type' => 'void',
'name' => 'apr_allocator_max_free_set',
'args' => [
@@ -5607,48 +5587,6 @@
]
},
{
- 'return_type' => 'void',
- 'name' => 'apr_allocator_set_max_free',
- 'args' => [
- {
- 'type' => 'apr_allocator_t *',
- 'name' => 'allocator'
- },
- {
- 'type' => 'apr_size_t',
- 'name' => 'size'
- }
- ]
- },
- {
- 'return_type' => 'void',
- 'name' => 'apr_allocator_set_mutex',
- 'args' => [
- {
- 'type' => 'apr_allocator_t *',
- 'name' => 'allocator'
- },
- {
- 'type' => 'apr_thread_mutex_t *',
- 'name' => 'mutex'
- }
- ]
- },
- {
- 'return_type' => 'void',
- 'name' => 'apr_allocator_set_owner',
- 'args' => [
- {
- 'type' => 'apr_allocator_t *',
- 'name' => 'allocator'
- },
- {
- 'type' => 'apr_pool_t *',
- 'name' => 'pool'
- }
- ]
- },
- {
'return_type' => 'apr_status_t',
'name' => 'apr_app_initialize',
'args' => [
@@ -5944,7 +5882,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_bind',
+ 'name' => 'apr_socket_bind',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -6866,7 +6804,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_connect',
+ 'name' => 'apr_socket_connect',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -8468,24 +8406,6 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_getsocketopt',
- 'args' => [
- {
- 'type' => 'apr_socket_t *',
- 'name' => 'sock'
- },
- {
- 'type' => 'apr_int32_t',
- 'name' => 'opt'
- },
- {
- 'type' => 'apr_int32_t *',
- 'name' => 'on'
- }
- ]
- },
- {
- 'return_type' => 'apr_status_t',
'name' => 'apr_global_mutex_child_init',
'args' => [
{
@@ -8914,7 +8834,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_listen',
+ 'name' => 'apr_socket_listen',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -10193,26 +10113,6 @@
]
},
{
- 'return_type' => 'apr_abortfunc_t',
- 'name' => 'apr_pool_get_abort',
- 'args' => [
- {
- 'type' => 'apr_pool_t *',
- 'name' => 'pool'
- }
- ]
- },
- {
- 'return_type' => 'apr_pool_t *',
- 'name' => 'apr_pool_get_parent',
- 'args' => [
- {
- 'type' => 'apr_pool_t *',
- 'name' => 'pool'
- }
- ]
- },
- {
'return_type' => 'apr_status_t',
'name' => 'apr_pool_initialize',
'args' => []
@@ -10261,20 +10161,6 @@
},
{
'return_type' => 'void',
- 'name' => 'apr_pool_set_abort',
- 'args' => [
- {
- 'type' => 'apr_abortfunc_t',
- 'name' => 'abortfunc'
- },
- {
- 'type' => 'apr_pool_t *',
- 'name' => 'pool'
- }
- ]
- },
- {
- 'return_type' => 'void',
'name' => 'apr_pool_tag',
'args' => [
{
@@ -11010,7 +10896,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_recv',
+ 'name' => 'apr_socket_recv',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -11028,7 +10914,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_recvfrom',
+ 'name' => 'apr_socket_recvfrom',
'args' => [
{
'type' => 'apr_sockaddr_t *',
@@ -11300,7 +11186,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_send',
+ 'name' => 'apr_socket_send',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -11318,7 +11204,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_sendfile',
+ 'name' => 'apr_socket_sendfile',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -11348,7 +11234,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_sendto',
+ 'name' => 'apr_socket_sendto',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -11374,7 +11260,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_sendv',
+ 'name' => 'apr_socket_sendv',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -11396,24 +11282,6 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_setsocketopt',
- 'args' => [
- {
- 'type' => 'apr_socket_t *',
- 'name' => 'sock'
- },
- {
- 'type' => 'apr_int32_t',
- 'name' => 'opt'
- },
- {
- 'type' => 'apr_int32_t',
- 'name' => 'on'
- }
- ]
- },
- {
- 'return_type' => 'apr_status_t',
'name' => 'apr_setup_signal_thread',
'args' => []
},
@@ -11605,7 +11473,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'apr_shutdown',
+ 'name' => 'apr_socket_shutdown',
'args' => [
{
'type' => 'apr_socket_t *',
@@ -11964,16 +11832,6 @@
]
},
{
- 'return_type' => 'void',
- 'name' => 'apr_socket_set_inherit',
- 'args' => [
- {
- 'type' => 'apr_socket_t *',
- 'name' => 'skt'
- }
- ]
- },
- {
'return_type' => 'apr_status_t',
'name' => 'apr_socket_timeout_get',
'args' => [
@@ -11998,16 +11856,6 @@
{
'type' => 'apr_interval_time_t',
'name' => 't'
- }
- ]
- },
- {
- 'return_type' => 'void',
- 'name' => 'apr_socket_unset_inherit',
- 'args' => [
- {
- 'type' => 'apr_socket_t *',
- 'name' => 'skt'
}
]
},
1.120 +2 -2 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.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- FunctionTable.pm 20 Aug 2003 23:20:14 -0000 1.119
+++ FunctionTable.pm 28 Aug 2003 18:33:32 -0000 1.120
@@ -6427,7 +6427,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'mpxs_apr_recv',
+ 'name' => 'mpxs_apr_socket_recv',
'attr' => [
'static',
'__inline__'
@@ -6453,7 +6453,7 @@
},
{
'return_type' => 'apr_status_t',
- 'name' => 'mpxs_apr_send',
+ 'name' => 'mpxs_apr_socket_send',
'attr' => [
'static',
'__inline__'
