[Dotgnu-pnet-commits] CVS: pnet/engine cvmc.c,1.40,1.41 ilrun.c,1.31,1.32 method_cache.c,1.9,1.10 method_cache.h,1.6,1.7 null_coder.c,1.21,1.22 process.c,1.45,1.46

[Gopal.V <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/engine
In directory subversions:/tmp/cvs-serv26031/engine

Modified Files:
        cvmc.c ilrun.c method_cache.c method_cache.h null_coder.c 
        process.c 
Log Message:
Patch #1643 fixing Bug #4041 from Yannis Bres


Index: cvmc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/cvmc.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** cvmc.c      19 Jun 2003 12:19:40 -0000      1.40
--- cvmc.c      22 Jun 2003 17:16:44 -0000      1.41
***************
*** 130,134 ****
   * Create a new CVM coder instance.
   */
! static ILCoder *CVMCoder_Create(ILUInt32 size)
  {
        ILCVMCoder *coder;
--- 130,134 ----
   * Create a new CVM coder instance.
   */
! static ILCoder *CVMCoder_Create(ILUInt32 size, unsigned long cachePageSize)
  {
        ILCVMCoder *coder;
***************
*** 138,142 ****
        }
        coder->coder.classInfo = &_ILCVMCoderClass;
!       if((coder->cache = ILCacheCreate(0)) == 0)
        {
                ILFree(coder);
--- 138,142 ----
        }
        coder->coder.classInfo = &_ILCVMCoderClass;
!       if((coder->cache = ILCacheCreate(0, cachePageSize)) == 0)
        {
                ILFree(coder);

Index: ilrun.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/ilrun.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** ilrun.c     15 May 2003 06:02:07 -0000      1.31
--- ilrun.c     22 Jun 2003 17:16:44 -0000      1.32
***************
*** 64,67 ****
--- 64,71 ----
                "--stack-size value  or -S value",
                "Set the operation stack size to `value' kilobytes."},
+       {"-C", 'C', 1, 0, 0},
+       {"--method-cache-page", 'C', 1, 
+               "--method-cache-page value  or -C value",
+               "Set the method cache page size to `value' kilobytes."},
        {"-L", 'L', 1, 0, 0},
        {"--library-dir", 'L', 1,
***************
*** 112,115 ****
--- 116,120 ----
        unsigned long heapSize = IL_CONFIG_GC_HEAP_SIZE;
        unsigned long stackSize = IL_CONFIG_STACK_SIZE;
+       unsigned long methodCachePageSize = IL_CONFIG_CACHE_PAGE_SIZE;
        char **libraryDirs;
        int numLibraryDirs;
***************
*** 172,175 ****
--- 177,192 ----
                        break;
  
+                       case 'C':
+                       {
+                               methodCachePageSize = 0;
+                               while(*param >= '0' && *param <= '9')
+                               {
+                                       methodCachePageSize = 
methodCachePageSize * 10 + (unsigned long)(*param - '0');
+                                       ++param;
+                               }
+                               methodCachePageSize *= 1024;
+                       }
+                       break;
+ 
                        case 'L':
                        {
***************
*** 263,267 ****
  
        /* Create a process to load the program into */
!       process = ILExecProcessCreate(stackSize);
        if(!process)
        {
--- 280,284 ----
  
        /* Create a process to load the program into */
!       process = ILExecProcessCreate(stackSize, methodCachePageSize);
        if(!process)
        {

Index: method_cache.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/method_cache.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** method_cache.c      18 Oct 2002 07:52:59 -0000      1.9
--- method_cache.c      22 Jun 2003 17:16:44 -0000      1.10
***************
*** 388,392 ****
  }
  
! ILCache *_ILCacheCreate(long limit)
  {
        ILCache *cache;
--- 388,392 ----
  }
  
! ILCache *_ILCacheCreate(long limit, unsigned long cachePageSize)
  {
        ILCache *cache;
***************
*** 403,407 ****
        cache->numPages = 0;
        size = ILPageAllocSize();
!       size = (IL_CONFIG_CACHE_PAGE_SIZE / size) * size;
        if(!size)
        {
--- 403,411 ----
        cache->numPages = 0;
        size = ILPageAllocSize();
!       if (cachePageSize == 0)
!       {
!               cachePageSize= IL_CONFIG_CACHE_PAGE_SIZE;
!       }
!       size = (cachePageSize / size) * size;
        if(!size)
        {

Index: method_cache.h
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/method_cache.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** method_cache.h      3 Jun 2002 04:58:41 -0000       1.6
--- method_cache.h      22 Jun 2003 17:16:44 -0000      1.7
***************
*** 49,53 ****
   * size of the cache in bytes.
   */
! ILCache *_ILCacheCreate(long limit);
  
  /*
--- 49,53 ----
   * size of the cache in bytes.
   */
! ILCache *_ILCacheCreate(long limit,unsigned long cachePageSize);
  
  /*

Index: null_coder.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/null_coder.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** null_coder.c        19 Jun 2003 12:19:40 -0000      1.21
--- null_coder.c        22 Jun 2003 17:16:44 -0000      1.22
***************
*** 29,33 ****
   * Stubs for coder functions.
   */
! static ILCoder *Coder_Create(ILUInt32 size)
  {
        return 0;
--- 29,33 ----
   * Stubs for coder functions.
   */
! static ILCoder *Coder_Create(ILUInt32 size, unsigned long cachePageSize)
  {
        return 0;

Index: process.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/engine/process.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -r1.45 -r1.46
*** process.c   22 Jun 2003 00:56:33 -0000      1.45
--- process.c   22 Jun 2003 17:16:44 -0000      1.46
***************
*** 34,38 ****
  }
  
! ILExecProcess *ILExecProcessCreate(unsigned long stackSize)
  {
        ILExecProcess *process;
--- 34,38 ----
  }
  
! ILExecProcess *ILExecProcessCreate(unsigned long stackSize, unsigned long 
cachePageSize)
  {
        ILExecProcess *process;
***************
*** 88,92 ****
  
        /* Initialize the CVM coder */
!       process->coder = ILCoderCreate(&_ILCVMCoderClass, 100000);
        if(!(process->coder))
        {
--- 88,92 ----
  
        /* Initialize the CVM coder */
!       process->coder = ILCoderCreate(&_ILCVMCoderClass, 100000, 
cachePageSize);
        if(!(process->coder))
        {