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 do...@apache.org on 2002/05/23 21:49:49 UTC

cvs commit: modperl-2.0/xs/maps apr_types.map

dougm       02/05/23 12:49:49

  Modified:    t/response/TestAPR os.pm
               xs/APR/OS APR__OS.h
               xs/maps  apr_types.map
  Log:
  bless apr_os_thread_current into APR::OS::Thread class
  
  Revision  Changes    Path
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- os.pm	23 May 2002 17:30:26 -0000	1.2
  +++ os.pm	23 May 2002 19:49:49 -0000	1.3
  @@ -13,14 +13,16 @@
   sub handler {
       my $r = shift;
   
  -    plan $r, tests => 1;
  +    plan $r, tests => 2;
   
       if (Apache::MPM_IS_THREADED) {
           my $id = APR::OS::thread_current();
  -        ok t_cmp($id, $id, "current thread id");
  +        ok t_cmp("$id", "$id", "current thread");
  +        ok t_cmp($$id, $$id, "current thread");
       }
       else {
           ok t_cmp($$, $$, "current process id");
  +        ok 1;
       }
   
       Apache::OK;
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- APR__OS.h	22 May 2002 16:30:14 -0000	1.1
  +++ APR__OS.h	23 May 2002 19:49:49 -0000	1.2
  @@ -3,6 +3,6 @@
   #if APR_HAS_THREADS
       return apr_os_thread_current();
   #else
  -    return (void *)0;
  +    return 0;
   #endif
   }
  
  
  
  1.18      +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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- apr_types.map	22 May 2002 16:30:40 -0000	1.17
  +++ apr_types.map	23 May 2002 19:49:49 -0000	1.18
  @@ -96,7 +96,7 @@
   #thread stuff
   struct apr_threadkey_t       | UNDEFINED
   struct apr_os_threadkey_t    | UNDEFINED
  -struct apr_os_thread_t       | PTR
  +typedef apr_os_thread_t      | APR::OS::Thread
   struct apr_thread_t          | UNDEFINED
   apr_thread_start_t           | UNDEFINED
   struct apr_threadattr_t      | UNDEFINED