[Dotgnu-pnet-commits] CVS: pnet/libgc/tests test.c,1.2,1.3 test_cpp.cc,1.2,1.3

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/libgc/tests
In directory subversions:/tmp/cvs-serv32390/libgc/tests

Modified Files:
        test.c test_cpp.cc 
Log Message:


Update the libgc library using gc6.2alpha3 from the libgc ftp site.


Index: test.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libgc/tests/test.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test.c      8 Apr 2002 23:36:50 -0000       1.2
--- test.c      6 Feb 2003 01:35:46 -0000       1.3
***************
*** 377,380 ****
--- 377,383 ----
  sexpr x;
  {
+ #   ifdef TEST_WITH_SYSTEM_MALLOC
+       malloc(100000);
+ #   endif
      return( reverse1(x, nil) );
  }
***************
*** 530,534 ****
  #ifdef THREADS
  
! # ifdef GC_WIN32_THREADS
      unsigned __stdcall tiny_reverse_test(void * arg)
  # else
--- 533,537 ----
  #ifdef THREADS
  
! # if defined(GC_WIN32_THREADS) && !defined(CYGWIN32)
      unsigned __stdcall tiny_reverse_test(void * arg)
  # else
***************
*** 749,755 ****
      static pthread_mutex_t incr_lock = PTHREAD_MUTEX_INITIALIZER;
      pthread_mutex_lock(&incr_lock);
! # endif
! # ifdef GC_WIN32_THREADS
!     EnterCriticalSection(&incr_cs);
  # endif
    if ((int)(GC_word)client_data != t -> level) {
--- 752,759 ----
      static pthread_mutex_t incr_lock = PTHREAD_MUTEX_INITIALIZER;
      pthread_mutex_lock(&incr_lock);
! # else
! #   ifdef GC_WIN32_THREADS
!       EnterCriticalSection(&incr_cs);
! #   endif
  # endif
    if ((int)(GC_word)client_data != t -> level) {
***************
*** 766,772 ****
  # if defined(GC_PTHREADS)
      pthread_mutex_unlock(&incr_lock);
! # endif
! # ifdef GC_WIN32_THREADS
!     LeaveCriticalSection(&incr_cs);
  # endif
  }
--- 770,777 ----
  # if defined(GC_PTHREADS)
      pthread_mutex_unlock(&incr_lock);
! # else
! #   ifdef GC_WIN32_THREADS
!       LeaveCriticalSection(&incr_cs);
! #   endif
  # endif
  }
***************
*** 840,846 ****
              static pthread_mutex_t incr_lock = PTHREAD_MUTEX_INITIALIZER;
              pthread_mutex_lock(&incr_lock);
! #         endif
! #         ifdef GC_WIN32_THREADS
!             EnterCriticalSection(&incr_cs);
  #         endif
                /* Losing a count here causes erroneous report of failure. */
--- 845,852 ----
              static pthread_mutex_t incr_lock = PTHREAD_MUTEX_INITIALIZER;
              pthread_mutex_lock(&incr_lock);
! #         else
! #           ifdef GC_WIN32_THREADS
!               EnterCriticalSection(&incr_cs);
! #           endif
  #         endif
                /* Losing a count here causes erroneous report of failure. */
***************
*** 855,861 ****
  #       if defined(GC_PTHREADS)
            pthread_mutex_unlock(&incr_lock);
! #       endif
! #         ifdef GC_WIN32_THREADS
!             LeaveCriticalSection(&incr_cs);
  #         endif
        }
--- 861,868 ----
  #       if defined(GC_PTHREADS)
            pthread_mutex_unlock(&incr_lock);
! #       else
! #           ifdef GC_WIN32_THREADS
!               LeaveCriticalSection(&incr_cs);
! #           endif
  #         endif
        }
***************
*** 1242,1245 ****
--- 1249,1265 ----
        FAIL;
        }
+ #     if defined(__STDC__) && !defined(MSWIN32) && !defined(MSWINCE)
+         /* Harder to test under Windows without a gc.h declaration.  */
+         {
+         size_t i;
+         extern void *GC_memalign();
+ 
+         GC_malloc(17);
+         for (i = sizeof(GC_word); i < 512; i *= 2) {
+           GC_word result = (GC_word) GC_memalign(i, 17);
+           if (result % i != 0 || result == 0 || *(int *)result != 0) FAIL;
+         } 
+       }
+ #     endif
  #     ifndef ALL_INTERIOR_POINTERS
  #      if defined(RS6000) || defined(POWERPC)
***************
*** 1481,1485 ****
  # endif
  
! #ifdef GC_WIN32_THREADS
  
  unsigned __stdcall thr_run_one_test(void *arg)
--- 1501,1505 ----
  # endif
  
! #if defined(GC_WIN32_THREADS) && !defined(CYGWIN32)
  
  unsigned __stdcall thr_run_one_test(void *arg)

Index: test_cpp.cc
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/libgc/tests/test_cpp.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** test_cpp.cc 8 Apr 2002 23:36:50 -0000       1.2
--- test_cpp.cc 6 Feb 2003 01:35:46 -0000       1.3
***************
*** 215,220 ****
  #   endif
      if (argc != 2 || (0 >= (n = atoi( argv[ 1 ] )))) {
!         GC_printf0( "usage: test_cpp number-of-iterations\n" );
!         exit( 1 );}
          
      for (iters = 1; iters <= n; iters++) {
--- 215,220 ----
  #   endif
      if (argc != 2 || (0 >= (n = atoi( argv[ 1 ] )))) {
!         GC_printf0( "usage: test_cpp number-of-iterations\nAssuming 10 
iters\n" );
!         n = 10;}
          
      for (iters = 1; iters <= n; iters++) {