[BACK]Return to gc-7.0-risa.diff CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000

Diff for /OpenXM_contrib2/asir2000/gc-7.0-risa.diff between version 1.8 and 1.17

version 1.8, 2013/06/13 05:49:59 version 1.17, 2020/11/02 14:13:42
Line 1 
Line 1 
 diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc.c  diff -urN gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
 --- gc-7.2alpha6.orig/alloc.c   2011-06-01 00:27:11.000000000 +0900  --- gc-7.4.2.orig/alloc.c       2014-06-03 15:08:01.000000000 +0900
 +++ gc-7.2alpha6/alloc.c        2012-05-08 01:22:13.000000000 +0900  +++ gc-7.4.2/alloc.c    2015-08-25 16:00:00.000000000 +0900
 @@ -121,6 +121,7 @@  @@ -121,6 +121,7 @@
  #endif   #endif
   
Line 9  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
Line 9  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
   
  GC_INNER int GC_CALLBACK GC_never_stop_func(void)   GC_INNER int GC_CALLBACK GC_never_stop_func(void)
  {   {
 @@ -229,9 +230,9 @@  @@ -227,8 +228,8 @@
        total_root_size = 2 * stack_size + GC_root_size;
      scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4       scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
                 + total_root_size;                   + total_root_size;
      if (GC_incremental) {  -    result = scan_size / GC_free_space_divisor;
 -        return scan_size / (2 * GC_free_space_divisor);  -    if (GC_incremental) {
 +        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);  +    result = scan_size * GC_free_space_numerator / GC_free_space_divisor;
      } else {  +    if (1 || GC_incremental) {
 -        return scan_size / GC_free_space_divisor;         result /= 2;
 +        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);  
      }       }
  }       return result > 0 ? result : 1;
   @@ -603,6 +604,7 @@
 @@ -597,6 +598,7 @@  
          GET_TIME(start_time);           GET_TIME(start_time);
  #   endif   #   endif
   
Line 29  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
Line 28  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
      STOP_WORLD();       STOP_WORLD();
  #   ifdef THREAD_LOCAL_ALLOC   #   ifdef THREAD_LOCAL_ALLOC
        GC_world_stopped = TRUE;         GC_world_stopped = TRUE;
 @@ -629,6 +631,7 @@  @@ -632,6 +634,7 @@
                GC_world_stopped = FALSE;                 GC_world_stopped = FALSE;
  #           endif   #           endif
                     START_WORLD();               START_WORLD();
 +                               GC_timerstop();  +            GC_timerstop();
                     return(FALSE);               return(FALSE);
             }             }
             if (GC_mark_some((ptr_t)(&dummy))) break;             if (GC_mark_some(GC_approx_sp())) break;
 @@ -651,6 +654,7 @@  @@ -653,6 +656,7 @@
        GC_world_stopped = FALSE;         GC_world_stopped = FALSE;
  #   endif   #   endif
      START_WORLD();       START_WORLD();
 +    GC_timerstop();  +    GC_timerstop();
  #   ifndef SMALL_CONFIG   #   ifndef SMALL_CONFIG
      if (GC_print_stats) {         if (GC_PRINT_STATS_FLAG) {
          unsigned long time_diff;           unsigned long time_diff;
 @@ -796,6 +800,7 @@  @@ -836,6 +840,7 @@
          /* FIXME: Add more checks.                             */           /* FIXME: Add more checks.                              */
          GC_check_tls();           GC_check_tls();
  #   endif   #   endif
 +       GC_timerstart();  +       GC_timerstart();
   
  #   ifndef SMALL_CONFIG   #   ifndef SMALL_CONFIG
      if (GC_print_stats)         if (GC_print_stats)
 @@ -923,6 +928,7 @@  @@ -958,6 +963,7 @@
                       MS_TIME_DIFF(done_time,finalize_time));                         MS_TIME_DIFF(done_time,finalize_time));
      }         }
  #   endif   #   endif
 +    GC_timerstop();  +    GC_timerstop();
  }   }
   
  /* If stop_func == 0 then GC_default_stop_func is used instead.         */   /* If stop_func == 0 then GC_default_stop_func is used instead.         */
 @@ -1172,6 +1178,9 @@  @@ -1215,6 +1221,9 @@
           GC_heapsize + expansion_slop - 2*MAXHINCR*HBLKSIZE;       if (GC_on_heap_resize)
          if (GC_collect_at_heapsize < GC_heapsize /* wrapped */)         (*GC_on_heap_resize)(GC_heapsize);
           GC_collect_at_heapsize = (word)(-1);  
 +#if defined(VISUAL)  +#if defined(VISUAL)
 +    SendHeapSize();  +    SendHeapSize();
 +#endif  +#endif
      return(TRUE);       return(TRUE);
  }   }
   
 @@ -1281,6 +1290,21 @@  @@ -1276,7 +1285,7 @@
      GC_bool retry = FALSE;         }
        }
      if (gran == 0) return(0);  
 +#if defined(_MSC_VER)  
 +    {  
 +#include <signal.h>  
 +        extern int recv_intr;  
 +        if ( recv_intr ) {  
 +            if ( recv_intr == 1 ) {  
 +                recv_intr = 0;  
 +                int_handler();  
 +            } else {  
 +                recv_intr = 0;  
 +                ox_usr1_handler(0);  
 +            }  
 +        }  
 +    }  
 +#endif  
   
      while (*flh == 0) {  -    blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor)
        ENTER_GC();  +    blocks_to_get = GC_heapsize * GC_free_space_numerator /(HBLKSIZE*GC_free_space_divisor)
 diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c                           + needed_blocks;
 --- gc-7.2alpha6.orig/misc.c    2011-06-01 00:27:11.000000000 +0900       if (blocks_to_get > MAXHINCR) {
 +++ gc-7.2alpha6/misc.c 2012-05-08 01:17:58.000000000 +0900         word slop;
 @@ -141,6 +141,93 @@  diff -urN gc-7.4.2.orig/misc.c gc-7.4.2/misc.c
   --- gc-7.4.2.orig/misc.c        2014-06-03 15:08:02.000000000 +0900
   +++ gc-7.4.2/misc.c     2015-08-04 14:21:02.000000000 +0900
   @@ -161,6 +161,94 @@
  GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL;   GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL;
                          /* Interval between unsuppressed warnings.      */                           /* Interval between unsuppressed warnings.      */
   
Line 187  diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c
Line 173  diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c
 +       return gctime;  +       return gctime;
 +}  +}
 +  +
  /*ARGSUSED*/  +
  STATIC void * GC_CALLBACK GC_default_oom_fn(size_t bytes_requested)   STATIC void * GC_CALLBACK GC_default_oom_fn(
                                            size_t bytes_requested GC_ATTR_UNUSED)
  {   {
 diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/reclaim.c  diff -urN gc-7.4.2.orig/reclaim.c gc-7.4.2/reclaim.c
 --- gc-7.2alpha6.orig/reclaim.c 2011-06-01 00:27:11.000000000 +0900  --- gc-7.4.2.orig/reclaim.c     2014-06-03 15:08:02.000000000 +0900
 +++ gc-7.2alpha6/reclaim.c      2012-05-08 01:25:00.000000000 +0900  +++ gc-7.4.2/reclaim.c  2015-08-04 14:12:42.000000000 +0900
 @@ -590,6 +590,7 @@  @@ -706,6 +706,7 @@
   
        if (GC_print_stats == VERBOSE)         if (GC_print_stats == VERBOSE)
          GET_TIME(start_time);           GET_TIME(start_time);
Line 201  diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/rec
Line 188  diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/rec
  #   endif   #   endif
   
      for (kind = 0; kind < GC_n_kinds; kind++) {       for (kind = 0; kind < GC_n_kinds; kind++) {
 @@ -614,6 +615,7 @@  @@ -730,6 +731,7 @@
          }           }
      }       }
  #   ifndef SMALL_CONFIG   #   ifndef SMALL_CONFIG
 +      GC_timerstop();  +      GC_timerstop();
        if (GC_print_stats == VERBOSE) {         if (GC_print_stats == VERBOSE) {
          GET_TIME(done_time);           GET_TIME(done_time);
          GC_log_printf("Disposing of reclaim lists took %lu msecs\n",           GC_verbose_log_printf("Disposing of reclaim lists took %lu msecs\n",
 diff -urN gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE  diff -urN gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE
 --- gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE  2012-05-12 02:09:00.000000000 +0900  --- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE        2014-06-03 15:08:01.000000000 +0900
 +++ gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE       2013-06-13 14:43:07.000000000 +0900  +++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE     2015-08-04 14:12:42.000000000 +0900
 @@ -22,13 +22,13 @@  @@ -3,7 +3,10 @@
  all: gctest.exe cord\de.exe test_cpp.exe  
   
  .c.obj:   MY_CPU=AMD64
 -       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj /wd4701   CPU=$(MY_CPU)
 +       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.c /Fo$*.obj /wd4701  -!include <ntwin32.mak>
  # Disable "may not be initialized" warnings.  They're too approximate.  +cc=cl
  # Disable crt security warnings, since unfortunately they warn about all sorts  +cdebug=-Ox -DNDEBUG
  # of safe uses of strncpy.  It would be nice to leave the rest enabled.  +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_AMD64_=1 -DWIN64 -D_WIN64  -DWIN32 -D_WIN32 -D_WINNT -DLARGE_CONFIG
   +cvarsmt= -D_MT -MT
   
  .cpp.obj:   # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
 -       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj   # not earlier versions.  We can deal with either, but not inconsistency.
 +       $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj  diff -urN gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE
   --- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE    2014-06-03 15:08:01.000000000 +0900
   +++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE 2015-08-04 14:12:42.000000000 +0900
   @@ -3,7 +3,10 @@
   
  $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h   MY_CPU=X86
    CPU=$(MY_CPU)
   -!include <ntwin32.mak>
   +cc=cl
   +cdebug=-Ox -DNDEBUG
   +cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_X86_=1  -DWIN32 -D_WIN32 -W3 -D_WINNT -DLARGE_CONFIG
   +cvarsmt= -D_MT -MT
   
    # Make sure that .cc is not viewed as a suffix.  It is for VC++2005, but
    # not earlier versions.  We can deal with either, but not inconsistency.
   diff -urN gc-7.4.2.orig/include/private/gc_priv.h gc-7.4.2/include/private/gc_priv.h
   --- gc-7.4.2.orig/include/private/gc_priv.h     2014-06-03 15:08:02.000000000 +0900
   +++ gc-7.4.2/include/private/gc_priv.h  2020-11-02 22:27:25.000000000 +0900
   @@ -1840,6 +1840,8 @@
                                    /* free list nonempty, and return its   */
                                    /* head.  Sz is in granules.            */
   
   +void GC_timerstart(), GC_timerstop();
   +
    #ifdef GC_ADD_CALLER
      /* GC_DBG_EXTRAS is used by GC debug API functions (unlike GC_EXTRAS  */
      /* used by GC debug API macros) thus GC_RETURN_ADDR_PARENT (pointing  */
Legend:
Removed from v.1.8  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>