From 3189ccfc9be2f8e791017f051668dd8ca704ea99 Mon Sep 17 00:00:00 2001 From: Richard Brooksby Date: Thu, 9 May 2013 00:06:07 +0100 Subject: [PATCH] Consolidating common pool keywords. Copied from Perforce Change: 181649 ServerID: perforce.ravenbrook.com --- mps/code/arg.c | 7 +++++++ mps/code/cbs.c | 2 +- mps/code/dbgpool.c | 2 +- mps/code/mps.h | 15 +++++++++++++-- mps/code/mps.xcodeproj/project.pbxproj | 8 ++++---- mps/code/mpscmfs.h | 2 -- mps/code/mpscmv.h | 7 ------- mps/code/mpscmvff.h | 6 ------ mps/code/mpscmvt.h | 6 ------ mps/code/pool.c | 5 +++++ mps/code/poolmfs.c | 5 ++--- mps/code/poolmv.c | 20 ++++++++------------ mps/code/poolmv2.c | 12 ++++++------ mps/code/poolmvff.c | 15 ++++++--------- 14 files changed, 53 insertions(+), 59 deletions(-) diff --git a/mps/code/arg.c b/mps/code/arg.c index d65de21a9e8..0338e22405d 100644 --- a/mps/code/arg.c +++ b/mps/code/arg.c @@ -23,6 +23,12 @@ Bool ArgCheckCant(Arg arg) { return TRUE; } +static Bool ArgCheckShouldnt(Arg arg) { + UNUSED(arg); + NOTREACHED; + return FALSE; +} + Bool ArgCheckFormat(Arg arg) { CHECKD(Format, arg->val.format); return TRUE; @@ -69,6 +75,7 @@ Bool ArgCheckCount(Arg arg) { } +ARG_DEFINE_KEY(args_end, Shouldnt); ArgStruct mps_args_none[] = {{MPS_KEY_ARGS_END}}; diff --git a/mps/code/cbs.c b/mps/code/cbs.c index 4c48c690cc3..23a66699333 100644 --- a/mps/code/cbs.c +++ b/mps/code/cbs.c @@ -289,7 +289,7 @@ Res CBSInit(Arena arena, CBS cbs, void *owner, fastFind ? &cbsUpdateNode : NULL); args[0].key = MPS_KEY_MFS_UNIT_SIZE; args[0].val.size = sizeof(CBSBlockStruct); - args[1].key = MPS_KEY_MFS_EXTEND_BY; + args[1].key = MPS_KEY_EXTEND_BY; args[1].val.size = sizeof(CBSBlockStruct) * 64; args[2].key = MPS_KEY_ARGS_END; res = PoolCreate(&(cbs->blockPool), arena, PoolClassMFS(), args); diff --git a/mps/code/dbgpool.c b/mps/code/dbgpool.c index 877695481b1..591a7ce39de 100644 --- a/mps/code/dbgpool.c +++ b/mps/code/dbgpool.c @@ -189,7 +189,7 @@ static Res DebugPoolInit(Pool pool, ArgList args) debug->tagSize = tagSize + sizeof(tagStruct) - 1; /* This pool has to be like the arena control pool: the blocks */ /* allocated must be accessible using void*. */ - pcArgs[0].key = MPS_KEY_MFS_EXTEND_BY; + pcArgs[0].key = MPS_KEY_EXTEND_BY; pcArgs[0].val.size = debug->tagSize; /* FIXME: Really? */ pcArgs[1].key = MPS_KEY_MFS_UNIT_SIZE; pcArgs[1].val.size = debug->tagSize; diff --git a/mps/code/mps.h b/mps/code/mps.h index 75461373c74..5f320e63c51 100644 --- a/mps/code/mps.h +++ b/mps/code/mps.h @@ -115,7 +115,9 @@ typedef struct mps_arg_s { } val; } mps_arg_s; -#define MPS_KEY_ARGS_END NULL +extern const struct mps_key_s _mps_key_args_end; +#define MPS_KEY_ARGS_END (&_mps_key_args_end) +extern mps_arg_s mps_args_none[]; /* FIXME: This shouldn't be here */ extern const struct mps_key_s _mps_key_vmw3_top_down; @@ -128,7 +130,16 @@ extern const struct mps_key_s _mps_key_format; extern const struct mps_key_s _mps_key_chain; #define MPS_KEY_CHAIN (&_mps_key_chain) -extern mps_arg_s mps_args_none[]; +extern const struct mps_key_s _mps_key_extend_by; +#define MPS_KEY_EXTEND_BY (&_mps_key_extend_by) +extern const struct mps_key_s _mps_key_min_size; +#define MPS_KEY_MIN_SIZE (&_mps_key_min_size) +extern const struct mps_key_s _mps_key_mean_size; +#define MPS_KEY_MEAN_SIZE (&_mps_key_mean_size) +extern const struct mps_key_s _mps_key_max_size; +#define MPS_KEY_MAX_SIZE (&_mps_key_max_size) +extern const struct mps_key_s _mps_key_align; +#define MPS_KEY_ALIGN (&_mps_key_align) /* Keep in sync with diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj index fd6b652ae19..3dbaac15900 100644 --- a/mps/code/mps.xcodeproj/project.pbxproj +++ b/mps/code/mps.xcodeproj/project.pbxproj @@ -1031,7 +1031,7 @@ 3114A66C156E95EB001E0AA3 /* btcv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = btcv.c; sourceTree = ""; }; 3114A67C156E9668001E0AA3 /* mv2test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mv2test; sourceTree = BUILT_PRODUCTS_DIR; }; 3114A686156E9674001E0AA3 /* mv2test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mv2test.c; sourceTree = ""; }; - 3114A68E156E96B6001E0AA3 /* poolmv2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolmv2.c; sourceTree = ""; }; + 3114A68E156E96B6001E0AA3 /* poolmv2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = poolmv2.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 3114A695156E971B001E0AA3 /* messtest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = messtest; sourceTree = BUILT_PRODUCTS_DIR; }; 3114A69F156E9725001E0AA3 /* messtest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = messtest.c; sourceTree = ""; }; 3114A6AC156E9759001E0AA3 /* walkt0 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = walkt0; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1059,7 +1059,7 @@ 311F2F6117398B0E00C15B6A /* mpm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpm.h; sourceTree = ""; }; 311F2F6217398B1A00C15B6A /* mpmst.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpmst.h; sourceTree = ""; }; 311F2F6317398B1A00C15B6A /* mpmtypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpmtypes.h; sourceTree = ""; }; - 311F2F6417398B1A00C15B6A /* mps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mps.h; sourceTree = ""; }; + 311F2F6417398B1A00C15B6A /* mps.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = mps.h; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 311F2F6517398B3B00C15B6A /* mpsacl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpsacl.h; sourceTree = ""; }; 311F2F6617398B3B00C15B6A /* mpsavm.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpsavm.h; sourceTree = ""; }; 311F2F6717398B3B00C15B6A /* mpsio.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpsio.h; sourceTree = ""; }; @@ -1145,7 +1145,7 @@ 31EEAC2C156AB2F200714D05 /* message.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = message.c; sourceTree = ""; }; 31EEAC2D156AB2F200714D05 /* poolmfs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolmfs.c; sourceTree = ""; }; 31EEAC2E156AB2F200714D05 /* poolmrg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolmrg.c; sourceTree = ""; }; - 31EEAC2F156AB2F200714D05 /* poolmv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolmv.c; sourceTree = ""; }; + 31EEAC2F156AB2F200714D05 /* poolmv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = poolmv.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 31EEAC30156AB2F200714D05 /* ring.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ring.c; sourceTree = ""; }; 31EEAC31156AB2F200714D05 /* sac.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sac.c; sourceTree = ""; }; 31EEAC32156AB2F200714D05 /* shield.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shield.c; sourceTree = ""; }; @@ -1163,7 +1163,7 @@ 31EEAC53156AB3E300714D05 /* vmix.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vmix.c; sourceTree = ""; }; 31EEAC5B156AB41900714D05 /* poolamc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolamc.c; sourceTree = ""; }; 31EEAC5D156AB43F00714D05 /* poolsnc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolsnc.c; sourceTree = ""; }; - 31EEAC5F156AB44D00714D05 /* poolmvff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = poolmvff.c; sourceTree = ""; }; + 31EEAC5F156AB44D00714D05 /* poolmvff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; lineEnding = 0; path = poolmvff.c; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.c; }; 31EEAC65156AB52600714D05 /* mpmss */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = mpmss; sourceTree = BUILT_PRODUCTS_DIR; }; 31EEAC70156AB56000714D05 /* mpsioan.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpsioan.c; sourceTree = ""; }; 31EEAC71156AB56000714D05 /* mpsliban.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = mpsliban.c; sourceTree = ""; }; diff --git a/mps/code/mpscmfs.h b/mps/code/mpscmfs.h index a193cf507e9..734fa766d14 100644 --- a/mps/code/mpscmfs.h +++ b/mps/code/mpscmfs.h @@ -9,8 +9,6 @@ #include "mps.h" -extern const struct mps_key_s _mps_key_mfs_extend_by; -#define MPS_KEY_MFS_EXTEND_BY (&_mps_key_mfs_extend_by) extern const struct mps_key_s _mps_key_mfs_unit_size; #define MPS_KEY_MFS_UNIT_SIZE (&_mps_key_mfs_unit_size) diff --git a/mps/code/mpscmv.h b/mps/code/mpscmv.h index 779c8b6d8e7..805db19b8af 100644 --- a/mps/code/mpscmv.h +++ b/mps/code/mpscmv.h @@ -9,13 +9,6 @@ #include "mps.h" -extern const struct mps_key_s _mps_key_mv_extend_by; -#define MPS_KEY_MV_EXTEND_BY (&_mps_key_mv_extend_by) -extern const struct mps_key_s _mps_key_mv_avg_size; -#define MPS_KEY_MV_AVG_SIZE (&_mps_key_mv_avg_size) -extern const struct mps_key_s _mps_key_mv_max_size; -#define MPS_KEY_MV_MAX_SIZE (&_mps_key_mv_max_size) - extern size_t mps_mv_free_size(mps_pool_t mps_pool); extern size_t mps_mv_size(mps_pool_t mps_pool); extern mps_class_t mps_class_mv(void); diff --git a/mps/code/mpscmvff.h b/mps/code/mpscmvff.h index b0660b8579c..6b13af35a22 100644 --- a/mps/code/mpscmvff.h +++ b/mps/code/mpscmvff.h @@ -9,12 +9,6 @@ #include "mps.h" -extern const struct mps_key_s _mps_key_mvff_extend_by; -#define MPS_KEY_MVFF_EXTEND_BY (&_mps_key_mvff_extend_by) -extern const struct mps_key_s _mps_key_mvff_avg_size; -#define MPS_KEY_MVFF_AVG_SIZE (&_mps_key_mvff_avg_size) -extern const struct mps_key_s _mps_key_mvff_align; -#define MPS_KEY_MVFF_ALIGN (&_mps_key_mvff_align) extern const struct mps_key_s _mps_key_mvff_slot_high; #define MPS_KEY_MVFF_SLOT_HIGH (&_mps_key_mvff_slot_high) extern const struct mps_key_s _mps_key_mvff_arena_high; diff --git a/mps/code/mpscmvt.h b/mps/code/mpscmvt.h index efc52b98e9e..b02c6173fb1 100644 --- a/mps/code/mpscmvt.h +++ b/mps/code/mpscmvt.h @@ -9,12 +9,6 @@ #include "mps.h" -extern const struct mps_key_s _mps_key_mvt_min_size; -#define MPS_KEY_MVT_MIN_SIZE (&_mps_key_mvt_min_size) -extern const struct mps_key_s _mps_key_mvt_mean_size; -#define MPS_KEY_MVT_MEAN_SIZE (&_mps_key_mvt_mean_size) -extern const struct mps_key_s _mps_key_mvt_max_size; -#define MPS_KEY_MVT_MAX_SIZE (&_mps_key_mvt_max_size) extern const struct mps_key_s _mps_key_mvt_reserve_depth; #define MPS_KEY_MVT_RESERVE_DEPTH (&_mps_key_mvt_reserve_depth) extern const struct mps_key_s _mps_key_mvt_frag_limit; diff --git a/mps/code/pool.c b/mps/code/pool.c index 70bc3e41548..ff31b09a8af 100644 --- a/mps/code/pool.c +++ b/mps/code/pool.c @@ -110,6 +110,11 @@ Bool PoolCheck(Pool pool) ARG_DEFINE_KEY(format, Format); ARG_DEFINE_KEY(chain, Chain); +ARG_DEFINE_KEY(extend_by, Size); +ARG_DEFINE_KEY(min_size, Size); +ARG_DEFINE_KEY(mean_size, Size); +ARG_DEFINE_KEY(max_size, Size); +ARG_DEFINE_KEY(align, Align); /* PoolInit -- initialize a pool diff --git a/mps/code/poolmfs.c b/mps/code/poolmfs.c index e4a9e15c7fc..4a33ed050a1 100644 --- a/mps/code/poolmfs.c +++ b/mps/code/poolmfs.c @@ -81,7 +81,7 @@ Pool (MFSPool)(MFS mfs) static void MFSVarargs(ArgStruct args[], va_list varargs) { - args[0].key = MPS_KEY_MFS_EXTEND_BY; + args[0].key = MPS_KEY_EXTEND_BY; args[0].val.size = va_arg(varargs, Size); args[1].key = MPS_KEY_MFS_UNIT_SIZE; args[1].val.size = va_arg(varargs, Size); @@ -89,7 +89,6 @@ static void MFSVarargs(ArgStruct args[], va_list varargs) AVER(ArgListCheck(args)); } -ARG_DEFINE_KEY(mfs_extend_by, Size); ARG_DEFINE_KEY(mfs_unit_size, Size); static Res MFSInit(Pool pool, ArgList args) @@ -109,7 +108,7 @@ static Res MFSInit(Pool pool, ArgList args) res = ResPARAM; goto failParam; } - if (ArgPick(&arg, args, MPS_KEY_MFS_EXTEND_BY)) + if (ArgPick(&arg, args, MPS_KEY_EXTEND_BY)) extendBy = arg.val.size; else { extendBy = MFS_EXTEND_BY_DEFAULT; diff --git a/mps/code/poolmv.c b/mps/code/poolmv.c index da2ce8d2e1b..50af068f4ed 100644 --- a/mps/code/poolmv.c +++ b/mps/code/poolmv.c @@ -186,11 +186,11 @@ static Bool MVSpanCheck(MVSpan span) static void MVVarargs(ArgStruct args[], va_list varargs) { - args[0].key = MPS_KEY_MV_EXTEND_BY; + args[0].key = MPS_KEY_EXTEND_BY; args[0].val.size = va_arg(varargs, Size); - args[1].key = MPS_KEY_MV_AVG_SIZE; + args[1].key = MPS_KEY_MEAN_SIZE; args[1].val.size = va_arg(varargs, Size); - args[2].key = MPS_KEY_MV_MAX_SIZE; + args[2].key = MPS_KEY_MAX_SIZE; args[2].val.size = va_arg(varargs, Size); args[3].key = MPS_KEY_ARGS_END; AVER(ArgListCheck(args)); @@ -206,10 +206,6 @@ static void MVDebugVarargs(ArgStruct args[], va_list varargs) /* MVInit -- init method for class MV */ -ARG_DEFINE_KEY(mv_extend_by, Size); -ARG_DEFINE_KEY(mv_avg_size, Size); -ARG_DEFINE_KEY(mv_max_size, Size); - static Res MVInit(Pool pool, ArgList args) { Size extendBy = MV_EXTEND_BY_DEFAULT; @@ -222,11 +218,11 @@ static Res MVInit(Pool pool, ArgList args) ArgStruct arg; ArgStruct piArgs[3]; - if (ArgPick(&arg, args, MPS_KEY_MV_EXTEND_BY)) + if (ArgPick(&arg, args, MPS_KEY_EXTEND_BY)) extendBy = arg.val.size; - if (ArgPick(&arg, args, MPS_KEY_MV_AVG_SIZE)) + if (ArgPick(&arg, args, MPS_KEY_MEAN_SIZE)) avgSize = arg.val.size; - if (ArgPick(&arg, args, MPS_KEY_MV_MAX_SIZE)) + if (ArgPick(&arg, args, MPS_KEY_MAX_SIZE)) maxSize = arg.val.size; AVER(extendBy > 0); @@ -245,7 +241,7 @@ static Res MVInit(Pool pool, ArgList args) blockExtendBy = sizeof(MVBlockStruct); } - piArgs[0].key = MPS_KEY_MFS_EXTEND_BY; + piArgs[0].key = MPS_KEY_EXTEND_BY; piArgs[0].val.size = blockExtendBy; piArgs[1].key = MPS_KEY_MFS_UNIT_SIZE; piArgs[1].val.size = sizeof(MVBlockStruct); @@ -256,7 +252,7 @@ static Res MVInit(Pool pool, ArgList args) spanExtendBy = sizeof(MVSpanStruct) * (maxSize/extendBy); - piArgs[0].key = MPS_KEY_MFS_EXTEND_BY; + piArgs[0].key = MPS_KEY_EXTEND_BY; piArgs[0].val.size = spanExtendBy; piArgs[1].key = MPS_KEY_MFS_UNIT_SIZE; piArgs[1].val.size = sizeof(MVSpanStruct); diff --git a/mps/code/poolmv2.c b/mps/code/poolmv2.c index 186ee728b2c..203bf5a8e36 100644 --- a/mps/code/poolmv2.c +++ b/mps/code/poolmv2.c @@ -195,11 +195,11 @@ static SegPref MVTSegPref(MVT mvt) static void MVTVarargs(ArgStruct args[], va_list varargs) { - args[0].key = MPS_KEY_MVT_MIN_SIZE; + args[0].key = MPS_KEY_MIN_SIZE; args[0].val.size = va_arg(varargs, Size); - args[1].key = MPS_KEY_MVT_MEAN_SIZE; + args[1].key = MPS_KEY_MEAN_SIZE; args[1].val.size = va_arg(varargs, Size); - args[2].key = MPS_KEY_MVT_MAX_SIZE; + args[2].key = MPS_KEY_MAX_SIZE; args[2].val.size = va_arg(varargs, Size); args[3].key = MPS_KEY_MVT_RESERVE_DEPTH; args[3].val.count = va_arg(varargs, Count); @@ -245,17 +245,17 @@ static Res MVTInit(Pool pool, ArgList args) /* FIXME: Inconsistent reporting of bad arguments. Elsewhere we assert or return ResPARAM. */ /* --- Should there be a ResBADARG ? */ - if (ArgPick(&arg, args, MPS_KEY_MVT_MIN_SIZE)) { + if (ArgPick(&arg, args, MPS_KEY_MIN_SIZE)) { minSize = arg.val.size; unless (minSize > 0) return ResLIMIT; } - if (ArgPick(&arg, args, MPS_KEY_MVT_MEAN_SIZE)) { + if (ArgPick(&arg, args, MPS_KEY_MEAN_SIZE)) { meanSize = arg.val.size; unless (meanSize >= minSize) return ResLIMIT; } - if (ArgPick(&arg, args, MPS_KEY_MVT_MAX_SIZE)) { + if (ArgPick(&arg, args, MPS_KEY_MAX_SIZE)) { maxSize = arg.val.size; unless (maxSize >= meanSize) return ResLIMIT; diff --git a/mps/code/poolmvff.c b/mps/code/poolmvff.c index f8792bab783..ce6bf9cc9ae 100644 --- a/mps/code/poolmvff.c +++ b/mps/code/poolmvff.c @@ -411,11 +411,11 @@ static void MVFFBufferEmpty(Pool pool, Buffer buffer, static void MVFFVarargs(ArgStruct args[], va_list varargs) { - args[0].key = MPS_KEY_MVFF_EXTEND_BY; + args[0].key = MPS_KEY_EXTEND_BY; args[0].val.size = va_arg(varargs, Size); - args[1].key = MPS_KEY_MVFF_AVG_SIZE; + args[1].key = MPS_KEY_MEAN_SIZE; args[1].val.size = va_arg(varargs, Size); - args[2].key = MPS_KEY_MVFF_ALIGN; + args[2].key = MPS_KEY_ALIGN; args[2].val.align = va_arg(varargs, Size); /* promoted type */ args[3].key = MPS_KEY_MVFF_SLOT_HIGH; args[3].val.b = va_arg(varargs, Bool); @@ -437,9 +437,6 @@ static void MVFFDebugVarargs(ArgStruct args[], va_list varargs) /* MVFFInit -- initialize method for MVFF */ -ARG_DEFINE_KEY(mvff_extend_by, Size); -ARG_DEFINE_KEY(mvff_avg_size, Size); -ARG_DEFINE_KEY(mvff_align, Align); ARG_DEFINE_KEY(mvff_slot_high, Bool); ARG_DEFINE_KEY(mvff_arena_high, Bool); ARG_DEFINE_KEY(mvff_first_fit, Bool); @@ -468,13 +465,13 @@ static Res MVFFInit(Pool pool, ArgList args) /* .arg.check: we do the same checks here and in MVFFCheck */ /* except for arenaHigh, which is stored only in the segPref. */ - if (ArgPick(&arg, args, MPS_KEY_MVFF_EXTEND_BY)) + if (ArgPick(&arg, args, MPS_KEY_EXTEND_BY)) extendBy = arg.val.size; - if (ArgPick(&arg, args, MPS_KEY_MVFF_AVG_SIZE)) + if (ArgPick(&arg, args, MPS_KEY_MEAN_SIZE)) avgSize = arg.val.size; - if (ArgPick(&arg, args, MPS_KEY_MVFF_ALIGN)) + if (ArgPick(&arg, args, MPS_KEY_ALIGN)) align = arg.val.align; if (ArgPick(&arg, args, MPS_KEY_MVFF_SLOT_HIGH))