perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From go...@apache.org
Subject cvs commit: modperl-2.0/xs/tables/current/ModPerl FunctionTable.pm
Date Wed, 22 Sep 2004 23:22:07 GMT
gozer       2004/09/22 16:22:07

  Modified:    .        Changes
               t/response/TestAPR os.pm
               todo     release
               xs/APR/OS APR__OS.h
               xs/maps  apr_functions.map apr_types.map
               xs/tables/current/ModPerl FunctionTable.pm
  Log:
  APR::OS::thread_current renamed APR::OS::current_thread_id and
  now returns the actual thread_id instead of an object that
  needed to be dereferenced to get at the thread_id
  
  Revision  Changes    Path
  1.496     +4 -0      modperl-2.0/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/Changes,v
  retrieving revision 1.495
  retrieving revision 1.496
  diff -u -r1.495 -r1.496
  --- Changes	22 Sep 2004 01:29:31 -0000	1.495
  +++ Changes	22 Sep 2004 23:22:06 -0000	1.496
  @@ -12,6 +12,10 @@
   
   =item 1.99_17-dev
   
  +APR::OS::thread_current renamed APR::OS::current_thread_id and
  +now returns the actual thread_id instead of an object that
  +needed to be dereferenced to get at the thread_id [Gozer]
  +
   change a bunch of the APR:: constants to have a better prefix
   (APR::FILETYPE_* and APR::FILEPROT_). libapr will be changed soon too
   [Stas]
  
  
  
  1.5       +3 -5      modperl-2.0/t/response/TestAPR/os.pm
  
  Index: os.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/os.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- os.pm	1 Dec 2003 17:28:36 -0000	1.4
  +++ os.pm	22 Sep 2004 23:22:06 -0000	1.5
  @@ -14,16 +14,14 @@
   sub handler {
       my $r = shift;
   
  -    plan $r, tests => 2;
  +    plan $r, tests => 1;
   
       if (Apache::MPM->is_threaded) {
  -        my $id = APR::OS::thread_current();
  -        ok t_cmp("$id", "$id", "current thread");
  -        ok t_cmp($$id, $$id, "current thread");
  +        my $tid = APR::OS::current_thread_id();
  +        ok t_cmp($tid, $tid, "current thread id: $tid / pid: $$");
       }
       else {
           ok t_cmp($$, $$, "current process id");
  -        ok 1;
       }
   
       Apache::OK;
  
  
  
  1.63      +0 -8      modperl-2.0/todo/release
  
  Index: release
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/todo/release,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- release	22 Sep 2004 01:37:02 -0000	1.62
  +++ release	22 Sep 2004 23:22:06 -0000	1.63
  @@ -4,14 +4,6 @@
   
   -- see also todo/api_status
   
  -* why APR::OS::thread_current returns an object and to get the tid,
  -  you need to dereference it? that doesn't sounds too
  -  intuitive. 
  -  - change it to return the id right away?
  -  - rename it to be current_thread_id
  -  - update docs
  -  owner: gozer
  -
   * $r->log_reason:
     just add to compat
     owner: stas
  
  
  
  1.4       +1 -1      modperl-2.0/xs/APR/OS/APR__OS.h
  
  Index: APR__OS.h
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/APR/OS/APR__OS.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- APR__OS.h	4 Mar 2004 06:01:09 -0000	1.3
  +++ APR__OS.h	22 Sep 2004 23:22:06 -0000	1.4
  @@ -13,7 +13,7 @@
    * limitations under the License.
    */
   
  -static MP_INLINE apr_os_thread_t mpxs_apr_os_thread_current(pTHX)
  +static MP_INLINE U32 mpxs_APR__OS_current_thread_id(pTHX)
   {
   #if APR_HAS_THREADS
       return apr_os_thread_current();
  
  
  
  1.87      +2 -1      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.86
  retrieving revision 1.87
  diff -u -r1.86 -r1.87
  --- apr_functions.map	8 Sep 2004 00:42:02 -0000	1.86
  +++ apr_functions.map	22 Sep 2004 23:22:06 -0000	1.87
  @@ -613,6 +613,7 @@
    apr_xlate_open
   
   MODULE=APR::OS
  + mpxs_APR__OS_current_thread_id
   -apr_os_dir_get
   -apr_os_exp_time_get
   -apr_os_file_get
  @@ -630,7 +631,7 @@
   -apr_os_threadkey_put
   -apr_os_dso_handle_get
   -apr_os_dso_handle_put
  - apr_os_thread_current | mpxs_
  +~apr_os_thread_current
   -apr_os_thread_equal
   -apr_os_global_mutex_get
   -apr_os_proc_mutex_get
  
  
  
  1.23      +1 -1      modperl-2.0/xs/maps/apr_types.map
  
  Index: apr_types.map
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/xs/maps/apr_types.map,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- apr_types.map	21 May 2004 19:25:46 -0000	1.22
  +++ apr_types.map	22 Sep 2004 23:22:07 -0000	1.23
  @@ -95,7 +95,7 @@
   #thread stuff
   struct apr_threadkey_t       | UNDEFINED
   struct apr_os_threadkey_t    | UNDEFINED
  -typedef apr_os_thread_t      | APR::OS::Thread
  +typedef apr_os_thread_t      | UNDEFINED
   struct apr_thread_t          | UNDEFINED
   apr_thread_start_t           | UNDEFINED
   struct apr_threadattr_t      | UNDEFINED
  
  
  
  1.185     +15 -15    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.184
  retrieving revision 1.185
  diff -u -r1.184 -r1.185
  --- FunctionTable.pm	21 Sep 2004 05:42:44 -0000	1.184
  +++ FunctionTable.pm	22 Sep 2004 23:22:07 -0000	1.185
  @@ -2,7 +2,7 @@
   
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   # ! WARNING: generated by ModPerl::ParseSource/0.010
  -# !          Thu Sep 16 16:51:25 2004
  +# !          Wed Sep 22 14:01:12 2004
   # !          do NOT edit, any changes will be lost !
   # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   
  @@ -5499,6 +5499,20 @@
       ]
     },
     {
  +    'return_type' => 'unsigned long',
  +    'name' => 'mpxs_APR__OS_current_thread_id',
  +    'attr' => [
  +      'static',
  +      '__inline__'
  +    ],
  +    'args' => [
  +      {
  +        'type' => 'PerlInterpreter *',
  +        'name' => 'my_perl'
  +      }
  +    ]
  +  },
  +  {
       'return_type' => 'void',
       'name' => 'mpxs_APR__Pool_clear',
       'attr' => [
  @@ -7302,20 +7316,6 @@
         {
           'type' => 'const char *',
           'name' => 'mask_or_numbits'
  -      }
  -    ]
  -  },
  -  {
  -    'return_type' => 'apr_os_thread_t',
  -    'name' => 'mpxs_apr_os_thread_current',
  -    'attr' => [
  -      'static',
  -      '__inline__'
  -    ],
  -    'args' => [
  -      {
  -        'type' => 'PerlInterpreter *',
  -        'name' => 'my_perl'
         }
       ]
     },
  
  
  

Mime
View raw message