diff options
| author | Gareth Rees | 2013-05-27 10:19:35 +0100 |
|---|---|---|
| committer | Gareth Rees | 2013-05-27 10:19:35 +0100 |
| commit | 4bd6bde6049ab0c90b95b91f465a889facc57e73 (patch) | |
| tree | 42161d32b9cd8afbc642fe5902fe4943c007ab07 /mps/code | |
| parent | b6c356d1d82122e82dfcd900c9d45adf4d32987c (diff) | |
| download | emacs-4bd6bde6049ab0c90b95b91f465a889facc57e73.tar.gz emacs-4bd6bde6049ab0c90b95b91f465a889facc57e73.zip | |
Mfs now rounds unitsize up to unit_min instead of asserting.
Copied from Perforce
Change: 182257
ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
| -rw-r--r-- | mps/code/poolmfs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mps/code/poolmfs.c b/mps/code/poolmfs.c index b26bdc9d05c..3f596c5d251 100644 --- a/mps/code/poolmfs.c +++ b/mps/code/poolmfs.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* poolmfs.c: MANUAL FIXED SMALL UNIT POOL | 1 | /* poolmfs.c: MANUAL FIXED SMALL UNIT POOL |
| 2 | * | 2 | * |
| 3 | * $Id$ | 3 | * $Id$ |
| 4 | * Copyright (c) 2001-2012 Ravenbrook Limited. See end of file for license. | 4 | * Copyright (c) 2001-2013 Ravenbrook Limited. See end of file for license. |
| 5 | * | 5 | * |
| 6 | * This is the implementation of the MFS pool class. | 6 | * This is the implementation of the MFS pool class. |
| 7 | * | 7 | * |
| @@ -111,7 +111,6 @@ static Res MFSInit(Pool pool, ArgList args) | |||
| 111 | extendBy = unitSize; | 111 | extendBy = unitSize; |
| 112 | } | 112 | } |
| 113 | 113 | ||
| 114 | AVER(unitSize >= UNIT_MIN); | ||
| 115 | AVER(extendBy >= unitSize); | 114 | AVER(extendBy >= unitSize); |
| 116 | 115 | ||
| 117 | mfs = PoolPoolMFS(pool); | 116 | mfs = PoolPoolMFS(pool); |
| @@ -119,6 +118,8 @@ static Res MFSInit(Pool pool, ArgList args) | |||
| 119 | 118 | ||
| 120 | mfs->unroundedUnitSize = unitSize; | 119 | mfs->unroundedUnitSize = unitSize; |
| 121 | 120 | ||
| 121 | if (unitSize < UNIT_MIN) | ||
| 122 | unitSize = UNIT_MIN; | ||
| 122 | unitSize = SizeAlignUp(unitSize, MPS_PF_ALIGN); | 123 | unitSize = SizeAlignUp(unitSize, MPS_PF_ALIGN); |
| 123 | extendBy = SizeAlignUp(extendBy, ArenaAlign(arena)); | 124 | extendBy = SizeAlignUp(extendBy, ArenaAlign(arena)); |
| 124 | 125 | ||
| @@ -336,7 +337,7 @@ Bool MFSCheck(MFS mfs) | |||
| 336 | 337 | ||
| 337 | /* C. COPYRIGHT AND LICENSE | 338 | /* C. COPYRIGHT AND LICENSE |
| 338 | * | 339 | * |
| 339 | * Copyright (C) 2001-2012 Ravenbrook Limited <http://www.ravenbrook.com/>. | 340 | * Copyright (C) 2001-2013 Ravenbrook Limited <http://www.ravenbrook.com/>. |
| 340 | * All rights reserved. This is an open source license. Contact | 341 | * All rights reserved. This is an open source license. Contact |
| 341 | * Ravenbrook for commercial licensing options. | 342 | * Ravenbrook for commercial licensing options. |
| 342 | * | 343 | * |