From 26e8aecdf20652051c72f79df83cfef028bb524a Mon Sep 17 00:00:00 2001
From: Gareth Rees <gdr@ravenbrook.com>
Date: Wed, 11 Jun 2014 17:33:10 +0100
Subject: [PATCH] Rename grainsizecheck as arenagrainsizecheck.

Copied from Perforce
 Change: 186506
 ServerID: perforce.ravenbrook.com
---
 mps/code/arena.c | 8 ++++----
 mps/code/mpm.h   | 2 +-
 mps/code/vman.c  | 2 +-
 mps/code/vmix.c  | 4 ++--
 mps/code/vmw3.c  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mps/code/arena.c b/mps/code/arena.c
index 2c95a201e2b..e27f8483b68 100644
--- a/mps/code/arena.c
+++ b/mps/code/arena.c
@@ -22,9 +22,9 @@ SRCID(arena, "$Id$");
 #define ArenaFreeLand(arena) (&(arena)->freeLandStruct.landStruct)
 
 
-/* GrainSizeCheck -- check that size is a valid arena grain size */
+/* ArenaGrainSizeCheck -- check that size is a valid arena grain size */
 
-Bool GrainSizeCheck(Size size)
+Bool ArenaGrainSizeCheck(Size size)
 {
   CHECKL(size > 0);
   /* <design/arena/#req.attr.block.align.min> */
@@ -146,7 +146,7 @@ Bool ArenaCheck(Arena arena)
   CHECKL(arena->spareCommitted <= arena->committed);
 
   CHECKL(ShiftCheck(arena->zoneShift));
-  CHECKL(GrainSizeCheck(arena->grainSize));
+  CHECKL(ArenaGrainSizeCheck(arena->grainSize));
 
   /* Stripes can't be smaller than grains. */
   CHECKL(((Size)1 << arena->zoneShift) >= arena->grainSize);
@@ -194,7 +194,7 @@ Res ArenaInit(Arena arena, ArenaClass class, Size grainSize, ArgList args)
 
   AVER(arena != NULL);
   AVERT(ArenaClass, class);
-  AVERT(GrainSize, grainSize);
+  AVERT(ArenaGrainSize, grainSize);
   
   if (ArgPick(&arg, args, MPS_KEY_ARENA_ZONED))
     zoned = arg.val.b;
diff --git a/mps/code/mpm.h b/mps/code/mpm.h
index fc7b2a57f8f..839fec820ef 100644
--- a/mps/code/mpm.h
+++ b/mps/code/mpm.h
@@ -520,7 +520,7 @@ extern Ring GlobalsRememberedSummaryRing(Globals);
 #define ArenaGreyRing(arena, rank) (&(arena)->greyRing[rank])
 #define ArenaPoolRing(arena) (&ArenaGlobals(arena)->poolRing)
 
-extern Bool GrainSizeCheck(Size size);
+extern Bool ArenaGrainSizeCheck(Size size);
 #define AddrArenaGrainUp(addr, arena) AddrAlignUp(addr, ArenaGrainSize(arena))
 #define AddrArenaGrainDown(addr, arena) AddrAlignDown(addr, ArenaGrainSize(arena))
 #define AddrIsArenaGrain(addr, arena) AddrIsAligned(addr, ArenaGrainSize(arena))
diff --git a/mps/code/vman.c b/mps/code/vman.c
index 2bfee6ff784..27a642c4d8d 100644
--- a/mps/code/vman.c
+++ b/mps/code/vman.c
@@ -34,7 +34,7 @@ Bool VMCheck(VM vm)
   CHECKL(vm->base != (Addr)0);
   CHECKL(vm->limit != (Addr)0);
   CHECKL(vm->base < vm->limit);
-  CHECKL(GrainSizeCheck(VMAN_GRAIN_SIZE));
+  CHECKL(ArenaGrainSizeCheck(VMAN_GRAIN_SIZE));
   CHECKL(AddrIsAligned(vm->base, VMAN_GRAIN_SIZE));
   CHECKL(AddrIsAligned(vm->limit, VMAN_GRAIN_SIZE));
   CHECKL(vm->block != NULL);
diff --git a/mps/code/vmix.c b/mps/code/vmix.c
index c10c550ee12..96d601c37cc 100644
--- a/mps/code/vmix.c
+++ b/mps/code/vmix.c
@@ -88,7 +88,7 @@ Bool VMCheck(VM vm)
   CHECKL(vm->limit != 0);
   CHECKL(vm->base < vm->limit);
   CHECKL(vm->mapped <= vm->reserved);
-  CHECKL(GrainSizeCheck(vm->grainSize));
+  CHECKL(ArenaGrainSizeCheck(vm->grainSize));
   CHECKL(AddrIsAligned(vm->base, vm->grainSize));
   CHECKL(AddrIsAligned(vm->limit, vm->grainSize));
   return TRUE;
@@ -126,7 +126,7 @@ Res VMCreate(VM *vmReturn, Size size, void *params)
   size = SizeAlignUp(size, grainSize);
   if((size == 0) || (size > (Size)(size_t)-1))
     return ResRESOURCE;
-  AVERT(GrainSize, grainSize);
+  AVERT(ArenaGrainSize, grainSize);
 
   /* Map in a page to store the descriptor on. */
   addr = mmap(0, (size_t)SizeAlignUp(sizeof(VMStruct), grainSize),
diff --git a/mps/code/vmw3.c b/mps/code/vmw3.c
index 1c287cd3e0f..c255ca80e0b 100644
--- a/mps/code/vmw3.c
+++ b/mps/code/vmw3.c
@@ -84,7 +84,7 @@ Bool VMCheck(VM vm)
   CHECKL(vm->limit != 0);
   CHECKL(vm->base < vm->limit);
   CHECKL(vm->mapped <= vm->reserved);
-  CHECKL(GrainSizeCheck(vm->grainSize));
+  CHECKL(ArenaGrainSizeCheck(vm->grainSize));
   CHECKL(AddrIsAligned(vm->base, vm->grainSize));
   CHECKL(AddrIsAligned(vm->limit, vm->grainSize));
   return TRUE;
@@ -135,7 +135,7 @@ Res VMCreate(VM *vmReturn, Size size, void *params)
   GetSystemInfo(&si);
   grainSize = (Align)si.dwPageSize;
   AVER((DWORD)grainSize == si.dwPageSize); /* check it didn't truncate */
-  AVERT(GrainSize, grainSize);
+  AVERT(ArenaGrainSize, grainSize);
   size = SizeAlignUp(size, grainSize);
   if ((size == 0) || (size > (Size)(SIZE_T)-1))
     return ResRESOURCE;