perl-modperl-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tors...@apache.org
Subject svn commit: r985660 - in /perl/modperl/branches/threading: ./ Changes META.yml Makefile.PL src/modules/perl/modperl_handler.c xs/APR/OS/APR__OS.h
Date Sun, 15 Aug 2010 12:23:09 GMT
Author: torsten
Date: Sun Aug 15 12:23:09 2010
New Revision: 985660

URL: http://svn.apache.org/viewvc?rev=985660&view=rev
Log:
Merged revisions 957309,966331,983068,983073 via svnmerge from 
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk

........
  r957309 | phred | 2010-06-23 21:06:12 +0200 (Wed, 23 Jun 2010) | 6 lines
  
  Run tests on bundled pure perl modules.
  
  Written by: Phred, Gozer
  Reviewed by: Adam Prime, Gozer, Phred, Pgollucci
  Tested by: Phred
........
  r966331 | phred | 2010-07-21 19:49:31 +0200 (Wed, 21 Jul 2010) | 7 lines
  
  Don't index bundled pure Perl modules
  
  http://www.gossamer-threads.com/lists/modperl/dev/101734
  
  Suggested by: Gozer
  Implemented by: Phred
........
  r983068 | pgollucci | 2010-08-06 19:50:52 +0200 (Fri, 06 Aug 2010) | 8 lines
  
  Fix on fbsd amd64 where U32 is 4 bytes and pthread_t is 8.
  
   xs/APR/OS/APR__OS.h: In function 'mpxs_APR__OS_current_thread_id':
   xs/APR/OS/APR__OS.h:20: warning: cast from pointer to integer of different size
  
  Consistently cast this to an unsigned long.
........
  r983073 | pgollucci | 2010-08-06 19:57:48 +0200 (Fri, 06 Aug 2010) | 4 lines
  
  Removed unused variable.
  
  Reported by: clang static analyzer
........

Modified:
    perl/modperl/branches/threading/   (props changed)
    perl/modperl/branches/threading/Changes
    perl/modperl/branches/threading/META.yml
    perl/modperl/branches/threading/Makefile.PL
    perl/modperl/branches/threading/src/modules/perl/modperl_handler.c
    perl/modperl/branches/threading/xs/APR/OS/APR__OS.h

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 15 12:23:09 2010
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073

Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Aug 15 12:23:09 2010
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-940291
+/perl/modperl/trunk:1-712967,712969-985297

Modified: perl/modperl/branches/threading/Changes
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=985660&r1=985659&r2=985660&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Sun Aug 15 12:23:09 2010
@@ -31,6 +31,8 @@ Expose modperl_interp_t via ModPerl::Int
 
 =item 2.0.5-dev
 
+Run tests on bundled pure perl Apache::* modules [Gozer, Phred]
+
 Implement a mini-preprocess language for map-files in xs/maps.
 [Torsten Foertsch]
 

Modified: perl/modperl/branches/threading/META.yml
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/META.yml?rev=985660&r1=985659&r2=985660&view=diff
==============================================================================
--- perl/modperl/branches/threading/META.yml (original)
+++ perl/modperl/branches/threading/META.yml Sun Aug 15 12:23:09 2010
@@ -4,8 +4,10 @@ installdirs:  site
 distribution_type: module
 no_index:
     directory:
-          # A-T has its own CPAN distro
+          # A-T and others have their own CPAN distros
         - Apache-Test
+        - Apache-Reload
+        - Apache-SizeLimit
     package:
           # Internally redefined module
         - C::Preprocessed

Modified: perl/modperl/branches/threading/Makefile.PL
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/Makefile.PL?rev=985660&r1=985659&r2=985660&view=diff
==============================================================================
--- perl/modperl/branches/threading/Makefile.PL (original)
+++ perl/modperl/branches/threading/Makefile.PL Sun Aug 15 12:23:09 2010
@@ -785,7 +785,16 @@ run_tests : test_clean
 	$(PASSENV) \
 	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) \
 	t/TEST -bugreport -verbose=$(TEST_VERBOSE) $(TEST_FILES)
-	cd ModPerl-Registry && $(MAKE) test
+	$(MAKE) -k run_subtests
+
+run_subtests ::
+	$(MAKE) -C ModPerl-Registry test
+
+run_subtests ::
+	$(MAKE) -C Apache-Reload test
+
+run_subtests ::
+	$(MAKE) -C Apache-SizeLimit test
 
 test :: pure_all run_tests test_clean
 EOF

Modified: perl/modperl/branches/threading/src/modules/perl/modperl_handler.c
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/src/modules/perl/modperl_handler.c?rev=985660&r1=985659&r2=985660&view=diff
==============================================================================
--- perl/modperl/branches/threading/src/modules/perl/modperl_handler.c (original)
+++ perl/modperl/branches/threading/src/modules/perl/modperl_handler.c Sun Aug 15 12:23:09
2010
@@ -256,7 +256,7 @@ int modperl_handler_equal(modperl_handle
 MpAV *modperl_handler_array_merge(apr_pool_t *p, MpAV *base_a, MpAV *add_a)
 {
     int i, j;
-    modperl_handler_t **base_h, **add_h, **mrg_h;
+    modperl_handler_t **base_h, **add_h;
     MpAV *mrg_a;
 
     if (!add_a) {
@@ -269,7 +269,6 @@ MpAV *modperl_handler_array_merge(apr_po
 
     mrg_a = apr_array_copy(p, base_a);
 
-    mrg_h  = (modperl_handler_t **)mrg_a->elts;
     base_h = (modperl_handler_t **)base_a->elts;
     add_h  = (modperl_handler_t **)add_a->elts;
 

Modified: perl/modperl/branches/threading/xs/APR/OS/APR__OS.h
URL: http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/APR/OS/APR__OS.h?rev=985660&r1=985659&r2=985660&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/APR/OS/APR__OS.h (original)
+++ perl/modperl/branches/threading/xs/APR/OS/APR__OS.h Sun Aug 15 12:23:09 2010
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-static MP_INLINE U32 mpxs_APR__OS_current_thread_id(pTHX)
+static MP_INLINE unsigned long mpxs_APR__OS_current_thread_id(pTHX)
 {
 #if APR_HAS_THREADS
-    return (U32)apr_os_thread_current();
+    return (unsigned long)apr_os_thread_current();
 #else
     return 0;
 #endif



Mime
View raw message