[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.1 and 1.8

version 1.1, 2007/11/11 15:54:02 version 1.8, 2013/06/13 05:49:59
Line 1 
Line 1 
 %% $OpenXM$  diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc.c
 %% This patch is based on gc6.5-risa.diff.  --- gc-7.2alpha6.orig/alloc.c   2011-06-01 00:27:11.000000000 +0900
 diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c  +++ gc-7.2alpha6/alloc.c        2012-05-08 01:22:13.000000000 +0900
 --- gc-7.0.orig/alloc.c 2007-06-22 11:40:30.000000000 +0900  @@ -121,6 +121,7 @@
 +++ gc-7.0/alloc.c      2007-11-09 17:29:38.000000000 +0900   #endif
 @@ -100,6 +100,7 @@  
  GC_bool GC_dont_expand = 0;  
   
  word GC_free_space_divisor = 3;   word GC_free_space_divisor = GC_FREE_SPACE_DIVISOR;
 +word GC_free_space_numerator = 1;  +word GC_free_space_numerator = 1;
   
  extern GC_bool GC_collection_in_progress();   GC_INNER int GC_CALLBACK GC_never_stop_func(void)
                 /* Collection is in progress, or was abandoned. */   {
 @@ -160,9 +161,9 @@  @@ -229,9 +230,9 @@
      scan_size = 2 * GC_composite_in_use + GC_atomic_in_use       scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
                 + total_root_size;                  + total_root_size;
      if (TRUE_INCREMENTAL) {       if (GC_incremental) {
 -        return scan_size / (2 * GC_free_space_divisor);  -        return scan_size / (2 * GC_free_space_divisor);
 +        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);  +        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);
      } else {       } else {
 -        return scan_size / GC_free_space_divisor;  -        return scan_size / GC_free_space_divisor;
 +        return scan_size * GC_free_space_numerator / GC_free_space_divisor;  +        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);
      }       }
  }   }
   
 @@ -451,6 +452,7 @@  @@ -597,6 +598,7 @@
  #   if defined(REGISTER_LIBRARIES_EARLY)           GET_TIME(start_time);
          GC_cond_register_dynamic_libraries();  
  #   endif   #   endif
   
 +       GC_timerstart();  +       GC_timerstart();
      STOP_WORLD();       STOP_WORLD();
      IF_THREADS(GC_world_stopped = TRUE);   #   ifdef THREAD_LOCAL_ALLOC
      if (GC_print_stats) {         GC_world_stopped = TRUE;
 @@ -479,6 +481,7 @@  @@ -629,6 +631,7 @@
                     GC_deficit = i; /* Give the mutator a chance. */                 GC_world_stopped = FALSE;
                      IF_THREADS(GC_world_stopped = FALSE);   #           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((ptr_t)(&dummy))) break;
 @@ -503,6 +506,7 @@  @@ -651,6 +654,7 @@
          GC_world_stopped = FALSE;
      IF_THREADS(GC_world_stopped = FALSE);   #   endif
      START_WORLD();       START_WORLD();
 +    GC_timerstop();  +    GC_timerstop();
    #   ifndef SMALL_CONFIG
      if (GC_print_stats) {       if (GC_print_stats) {
        GET_TIME(current_time);           unsigned long time_diff;
        GC_log_printf("World-stopped marking took %lu msecs\n",  @@ -796,6 +800,7 @@
 @@ -603,6 +607,7 @@  
          /* FIXME: Add more checks.                             */           /* FIXME: Add more checks.                             */
          GC_check_tls();           GC_check_tls();
  #   endif   #   endif
 +       GC_timerstart();  +       GC_timerstart();
   
    #   ifndef SMALL_CONFIG
      if (GC_print_stats)       if (GC_print_stats)
        GET_TIME(start_time);  @@ -923,6 +928,7 @@
 @@ -722,6 +727,7 @@  
                       MS_TIME_DIFF(finalize_time,start_time),  
                       MS_TIME_DIFF(done_time,finalize_time));                        MS_TIME_DIFF(done_time,finalize_time));
      }       }
    #   endif
 +    GC_timerstop();  +    GC_timerstop();
  }   }
   
  /* Externally callable routine to invoke full, stop-world collection */   /* If stop_func == 0 then GC_default_stop_func is used instead.         */
 @@ -908,6 +914,9 @@  @@ -1172,6 +1178,9 @@
             GC_heapsize + expansion_slop - 2*MAXHINCR*HBLKSIZE;
          if (GC_collect_at_heapsize < GC_heapsize /* wrapped */)           if (GC_collect_at_heapsize < GC_heapsize /* wrapped */)
           GC_collect_at_heapsize = (word)(-1);            GC_collect_at_heapsize = (word)(-1);
  #     endif  +#if defined(VISUAL)
 +#if defined(VISUAL_LIB)  
 +    SendHeapSize();  +    SendHeapSize();
 +#endif  +#endif
      return(TRUE);       return(TRUE);
  }   }
   
 @@ -991,6 +1000,22 @@  @@ -1281,6 +1290,21 @@
        GC_bool retry = FALSE;
   
      if (gran == 0) return(0);       if (gran == 0) return(0);
   +#if defined(_MSC_VER)
 +#if defined(VISUAL)  
 +    {  +    {
 +#include <signal.h>  +#include <signal.h>
 +        extern int recv_intr;  +        extern int recv_intr;
Line 92  diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c
Line 90  diff -urN gc-7.0.orig/alloc.c gc-7.0/alloc.c
 +        }  +        }
 +    }  +    }
 +#endif  +#endif
 +  
      while (*flh == 0) {       while (*flh == 0) {
        ENTER_GC();         ENTER_GC();
        /* Do our share of marking work */  diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c
 diff -urN gc-7.0.orig/include/private/gc_priv.h gc-7.0/include/private/gc_priv.h  --- gc-7.2alpha6.orig/misc.c    2011-06-01 00:27:11.000000000 +0900
 --- gc-7.0.orig/include/private/gc_priv.h       2007-06-24 11:01:15.000000000 +0900  +++ gc-7.2alpha6/misc.c 2012-05-08 01:17:58.000000000 +0900
 +++ gc-7.0/include/private/gc_priv.h    2007-11-09 17:24:21.000000000 +0900  @@ -141,6 +141,93 @@
 @@ -161,6 +161,10 @@   GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL;
  # define MAX_EXTRA_BYTES 0                           /* Interval between unsuppressed warnings.      */
  #endif  
   
 +/* Added by ohara */  +#include <time.h>
 +# ifndef LARGE_CONFIG  
 +#   define LARGE_CONFIG  
 +# endif  
   
  # ifndef LARGE_CONFIG  
  #   define MINHINCR 16  /* Minimum heap increment, in blocks of HBLKSIZE  */  
 diff -urN gc-7.0.orig/include/private/gcconfig.h gc-7.0/include/private/gcconfig.h  
 --- gc-7.0.orig/include/private/gcconfig.h      2007-06-29 09:00:09.000000000 +0900  
 +++ gc-7.0/include/private/gcconfig.h   2007-11-09 17:24:21.000000000 +0900  
 @@ -62,6 +62,13 @@  
  # endif  
   
  /* Determine the machine type: */  
 +/* T.Saito */  
 +# if defined(FREEBSD) && defined(__amd64__)  
 +#    define X86_64  
 +#    define mach_type_known  
 +# endif  
 +  +
 +/* Determine the machine type: */  +#if defined(_MSC_VER)
  # if defined(__arm__) || defined(__thumb__)  +#include <windows.h>
  #    define ARM32  +
  #    if !defined(LINUX) && !defined(NETBSD)  +static double get_clock()
 @@ -1975,6 +1982,28 @@  +{
  #      endif  +       static int initialized = 0;
  #       define DATAEND  /* not needed */  +       static int is_winnt = 0;
   +       static HANDLE curproc;
   +
   +       if ( !initialized ) {
   +               OSVERSIONINFO vinfo;
   +
   +               curproc = GetCurrentProcess();
   +               vinfo.dwOSVersionInfoSize = sizeof(vinfo);
   +               GetVersionEx(&vinfo);
   +               if ( vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT )
   +                       is_winnt = 1;
   +               else
   +                       is_winnt = 0;
   +       }
   +       if ( is_winnt ) {
   +               FILETIME c,e,k,u;
   +
   +               GetProcessTimes(curproc,&c,&e,&k,&u);
   +               return ((double)k.dwLowDateTime+(double)u.dwLowDateTime
   +                       +4294967296.0*((double)k.dwHighDateTime+(double)u.dwHighDateTime))/10000000.0;
   +       } else
   +//             return (double)clock()/(double)CLOCKS_PER_SEC;
   +               return ((double)GetTickCount())/1000.0;
   +}
   +
   +#elif defined(THINK_C) || defined(__MWERKS__) || defined(MSWIN32)
   +
   +static double get_clock()
   +{
   +       clock_t c;
   +
   +       c = clock();
   +       return (double)c/(double)CLOCKS_PER_SEC;
   +}
   +
   +#elif defined(_PA_RISC1_1) || defined(__svr4__) || defined(__CYGWIN__)
   +
   +#include <sys/times.h>
   +#include <limits.h>
   +
   +static double get_clock()
   +{
   +       struct tms buf;
   +
   +       times(&buf);
   +       return (double)(buf.tms_utime+buf.tms_stime)/(double)CLK_TCK;
   +}
   +
   +#else
   +
   +#include <sys/time.h>
   +#include <sys/resource.h>
   +
   +static double get_clock()
   +{
   +       int tv_sec,tv_usec;
   +       struct rusage ru;
   +
   +       getrusage(RUSAGE_SELF,&ru);
   +       tv_sec = ru.ru_utime.tv_sec + ru.ru_stime.tv_sec;
   +       tv_usec = ru.ru_utime.tv_usec + ru.ru_stime.tv_usec;
   +       return (double)tv_sec+(double)tv_usec/(double)1000000;
   +}
   +#endif
   +
   +static double gctime, gcstart;
   +
   +void GC_timerstart() {
   +       gcstart = get_clock();
   +}
   +
   +void GC_timerstop() {
   +       gctime += get_clock() - gcstart;
   +}
   +
   +double GC_get_gctime() {
   +       return gctime;
   +}
   +
    /*ARGSUSED*/
    STATIC void * GC_CALLBACK GC_default_oom_fn(size_t bytes_requested)
    {
   diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/reclaim.c
   --- gc-7.2alpha6.orig/reclaim.c 2011-06-01 00:27:11.000000000 +0900
   +++ gc-7.2alpha6/reclaim.c      2012-05-08 01:25:00.000000000 +0900
   @@ -590,6 +590,7 @@
   
          if (GC_print_stats == VERBOSE)
            GET_TIME(start_time);
   +      GC_timerstart();
  #   endif   #   endif
 +#   ifdef FREEBSD /* T.Saito */  
 +#       define OS_TYPE "FREEBSD"  
 +#       ifndef GC_FREEBSD_THREADS  
 +#           define MPROTECT_VDB  
 +#       endif  
 +#       define SIG_SUSPEND SIGUSR1  
 +#       define SIG_THR_RESTART SIGUSR2  
 +#       define FREEBSD_STACKBOTTOM  
 +#       ifdef __ELF__  
 +#           define DYNAMIC_LOADING  
 +#       endif  
 +       extern int _etext[];  
 +        extern char etext[];  
 +       extern char edata[];  
 +       extern char end[];  
 +        extern char * GC_FreeBSDGetDataStart();  
 +#      define DATASTART ((ptr_t)((((word) (_etext)) + 0xfff) & ~0xfff))  
 +#      define NEED_FIND_LIMIT  
 +#      define DATAEND (GC_find_limit (DATASTART, TRUE))  
 +#      define DATASTART2 ((ptr_t)(&edata))  
 +#      define DATAEND2 ((ptr_t)(&end))  
 +#   endif /* end T.Saito */  
  # endif  
   
  #if defined(LINUX) && defined(USE_MMAP)  
 diff -urN gc-7.0.orig/reclaim.c gc-7.0/reclaim.c  
 --- gc-7.0.orig/reclaim.c       2007-06-07 09:24:17.000000000 +0900  
 +++ gc-7.0/reclaim.c    2007-11-09 17:32:31.000000000 +0900  
 @@ -577,7 +577,7 @@  
   
      if (GC_print_stats == VERBOSE)  
         GET_TIME(start_time);  
 -  
 +    GC_timerstart();  
      for (kind = 0; kind < GC_n_kinds; kind++) {       for (kind = 0; kind < GC_n_kinds; kind++) {
         ok = &(GC_obj_kinds[kind]);  @@ -614,6 +615,7 @@
         rlp = ok -> ok_reclaim_list;  
 @@ -599,6 +599,7 @@  
              }  
          }           }
      }       }
 +    GC_timerstop();   #   ifndef SMALL_CONFIG
      if (GC_print_stats == VERBOSE) {  +      GC_timerstop();
         GET_TIME(done_time);         if (GC_print_stats == VERBOSE) {
         GC_log_printf("Disposing of reclaim lists took %lu msecs\n",           GET_TIME(done_time);
            GC_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
   --- gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE  2012-05-12 02:09:00.000000000 +0900
   +++ gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE       2013-06-13 14:43:07.000000000 +0900
   @@ -22,13 +22,13 @@
    all: gctest.exe cord\de.exe test_cpp.exe
   
    .c.obj:
   -       $(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
   +       $(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
    # Disable "may not be initialized" warnings.  They're too approximate.
    # Disable crt security warnings, since unfortunately they warn about all sorts
    # of safe uses of strncpy.  It would be nice to leave the rest enabled.
   
    .cpp.obj:
   -       $(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
   +       $(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
   
    $(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
   
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>