From 967b61398dfd1042dad9502db90edd7f69b8c8e3 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 2 Aug 2018 14:20:23 +0100 Subject: [PATCH] Replace mv debug with mvff debug. Remove some remaining occurrences of mpscvm.h. Copied from Perforce Change: 194865 --- mps/code/apss.c | 1 - mps/code/mpmss.c | 1 - mps/code/mps.xcodeproj/project.pbxproj | 4 ---- mps/code/poolmvff.c | 1 - mps/code/sacss.c | 1 - mps/code/sncss.c | 1 - mps/manual/source/code-index.rst | 1 - mps/test/argerr/36.c | 6 +++--- mps/test/conerr/10.c | 1 - mps/test/conerr/11.c | 1 - mps/test/conerr/5.c | 1 - mps/test/conerr/6.c | 1 - mps/test/conerr/7.c | 1 - mps/test/conerr/8.c | 1 - mps/test/conerr/9.c | 1 - mps/test/function/160.c | 13 +++++++------ mps/test/function/161.c | 12 +++++++----- mps/test/function/162.c | 13 +++++++------ 18 files changed, 24 insertions(+), 37 deletions(-) diff --git a/mps/code/apss.c b/mps/code/apss.c index ed74ae99806..05890ed2605 100644 --- a/mps/code/apss.c +++ b/mps/code/apss.c @@ -6,7 +6,6 @@ */ -#include "mpscmv.h" #include "mpscmvff.h" #include "mpscmvt.h" #include "mpslib.h" diff --git a/mps/code/mpmss.c b/mps/code/mpmss.c index cc3e3e526a4..792c2e0ff4a 100644 --- a/mps/code/mpmss.c +++ b/mps/code/mpmss.c @@ -9,7 +9,6 @@ #include "mps.h" #include "mpsavm.h" #include "mpscmfs.h" -#include "mpscmv.h" #include "mpscmvff.h" #include "mpslib.h" #include "mpslib.h" diff --git a/mps/code/mps.xcodeproj/project.pbxproj b/mps/code/mps.xcodeproj/project.pbxproj index a2611176ff0..0980991ffa2 100644 --- a/mps/code/mps.xcodeproj/project.pbxproj +++ b/mps/code/mps.xcodeproj/project.pbxproj @@ -1713,7 +1713,6 @@ 311F2F5817398AE900C15B6A /* event.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = event.h; sourceTree = ""; }; 311F2F5917398AE900C15B6A /* eventcom.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = eventcom.h; sourceTree = ""; }; 311F2F5A17398AE900C15B6A /* eventdef.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = eventdef.h; sourceTree = ""; }; - 311F2F5C17398AE900C15B6A /* eventrep.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = eventrep.h; sourceTree = ""; }; 311F2F5E17398B0E00C15B6A /* lock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lock.h; sourceTree = ""; }; 311F2F5F17398B0E00C15B6A /* meter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = meter.h; sourceTree = ""; }; 311F2F6017398B0E00C15B6A /* misc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = misc.h; sourceTree = ""; }; @@ -1737,7 +1736,6 @@ 311F2F7817398B8E00C15B6A /* th.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = th.h; sourceTree = ""; }; 311F2F7A17398B8E00C15B6A /* tract.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = tract.h; sourceTree = ""; }; 311F2F7B17398E7600C15B6A /* poolmvff.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = poolmvff.h; sourceTree = ""; }; - 311F2F7C17398E9A00C15B6A /* mpscmv.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mpscmv.h; sourceTree = ""; }; 3124CAB8156BE3EC00753214 /* awlut */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = awlut; sourceTree = BUILT_PRODUCTS_DIR; }; 3124CAC2156BE40100753214 /* awlut.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = awlut.c; sourceTree = ""; }; 3124CAC6156BE48D00753214 /* fmtdy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fmtdy.c; sourceTree = ""; }; @@ -2552,7 +2550,6 @@ 311F2F5817398AE900C15B6A /* event.h */, 311F2F5917398AE900C15B6A /* eventcom.h */, 311F2F5A17398AE900C15B6A /* eventdef.h */, - 311F2F5C17398AE900C15B6A /* eventrep.h */, 22C5C99A18EC6AEC004C63D4 /* failover.c */, 22C5C99B18EC6AEC004C63D4 /* failover.h */, 31EEAC1A156AB2B200714D05 /* format.c */, @@ -2576,7 +2573,6 @@ 311F2F6517398B3B00C15B6A /* mpsacl.h */, 311F2F6617398B3B00C15B6A /* mpsavm.h */, 22FACEDB188808D5000FDBC1 /* mpscmfs.h */, - 311F2F7C17398E9A00C15B6A /* mpscmv.h */, 31EEABF5156AAF7C00714D05 /* mpsi.c */, 311F2F6717398B3B00C15B6A /* mpsio.h */, 311F2F6817398B3B00C15B6A /* mpslib.h */, diff --git a/mps/code/poolmvff.c b/mps/code/poolmvff.c index eedad5dbbb7..8f1f3e7cb89 100644 --- a/mps/code/poolmvff.c +++ b/mps/code/poolmvff.c @@ -26,7 +26,6 @@ #include "mpscmvff.h" #include "poolmvff.h" #include "mpscmfs.h" -#include "mpscmv.h" #include "poolmfs.h" SRCID(poolmvff, "$Id$"); diff --git a/mps/code/sacss.c b/mps/code/sacss.c index 08e2c654930..037d134fe55 100644 --- a/mps/code/sacss.c +++ b/mps/code/sacss.c @@ -5,7 +5,6 @@ * Portions copyright (C) 2002 Global Graphics Software. */ -#include "mpscmv.h" #include "mpscmvff.h" #include "mpscmfs.h" #include "mpslib.h" diff --git a/mps/code/sncss.c b/mps/code/sncss.c index 4b292911fe7..8756baf2b19 100644 --- a/mps/code/sncss.c +++ b/mps/code/sncss.c @@ -5,7 +5,6 @@ */ #include "mpm.h" -#include "mpscmv.h" #include "mpscmvt.h" #include "mpscmvff.h" #include "mpscsnc.h" diff --git a/mps/manual/source/code-index.rst b/mps/manual/source/code-index.rst index 05a657415e5..170227b3e73 100644 --- a/mps/manual/source/code-index.rst +++ b/mps/manual/source/code-index.rst @@ -23,7 +23,6 @@ mpscams.h :ref:`pool-ams` pool class external interface. mpscawl.h :ref:`pool-awl` pool class external interface. mpsclo.h :ref:`pool-lo` pool class external interface. mpscmfs.h :ref:`pool-mfs` pool class external interface. -mpscmv.h Deprecated MV (Manual Variable) pool class external interface. mpscmv2.h Former (deprecated) :ref:`pool-mvt` pool class interface. mpscmvff.h :ref:`pool-mvff` pool class external interface. mpscmvt.h :ref:`pool-mvt` pool class external interface. diff --git a/mps/test/argerr/36.c b/mps/test/argerr/36.c index ac35d796cac..a45812ecfda 100644 --- a/mps/test/argerr/36.c +++ b/mps/test/argerr/36.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = wrong size_t to free (MV) + summary = wrong size_t to free (MVFF debug) language = c link = testlib.o OUTPUT_SPEC @@ -12,7 +12,7 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" +#include "mpscmvff.h" #include "arg.h" void *stackpointer; @@ -29,7 +29,7 @@ static void test(void) cdie(mps_thread_reg(&thread, arena), "register thread"); - cdie(mps_pool_create_k(&pool, arena, mps_class_mv_debug(), mps_args_none), + cdie(mps_pool_create_k(&pool, arena, mps_class_mvff_debug(), mps_args_none), "create pool"); die(mps_alloc(&a, pool, 8), diff --git a/mps/test/conerr/10.c b/mps/test/conerr/10.c index ff28d34649c..14b1c9cd8ed 100644 --- a/mps/test/conerr/10.c +++ b/mps/test/conerr/10.c @@ -12,7 +12,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" static void test(void) { diff --git a/mps/test/conerr/11.c b/mps/test/conerr/11.c index f3fe41f91c7..300ae95a388 100644 --- a/mps/test/conerr/11.c +++ b/mps/test/conerr/11.c @@ -12,7 +12,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" static void test(void) { diff --git a/mps/test/conerr/5.c b/mps/test/conerr/5.c index f6559c4824e..43252ffdfad 100644 --- a/mps/test/conerr/5.c +++ b/mps/test/conerr/5.c @@ -12,7 +12,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" static void test(void) { diff --git a/mps/test/conerr/6.c b/mps/test/conerr/6.c index bfc417aa9f2..33d7b5baf7a 100644 --- a/mps/test/conerr/6.c +++ b/mps/test/conerr/6.c @@ -12,7 +12,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" void *stackpointer; diff --git a/mps/test/conerr/7.c b/mps/test/conerr/7.c index 7c5bdab31a2..9ead1898641 100644 --- a/mps/test/conerr/7.c +++ b/mps/test/conerr/7.c @@ -12,7 +12,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" void *stackpointer; diff --git a/mps/test/conerr/8.c b/mps/test/conerr/8.c index 63bfc1577e7..f43543cb2cb 100644 --- a/mps/test/conerr/8.c +++ b/mps/test/conerr/8.c @@ -12,7 +12,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" static void test(void) { diff --git a/mps/test/conerr/9.c b/mps/test/conerr/9.c index 47779320f8f..bbab451086c 100644 --- a/mps/test/conerr/9.c +++ b/mps/test/conerr/9.c @@ -10,7 +10,6 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" static void test(void) { diff --git a/mps/test/function/160.c b/mps/test/function/160.c index af5b017e2a7..13659970748 100644 --- a/mps/test/function/160.c +++ b/mps/test/function/160.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = MV fenceposting check + summary = MVFF debug fenceposting check language = c link = testlib.o OUTPUT_SPEC @@ -11,7 +11,7 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" +#include "mpscmvff.h" #include "mpsavm.h" void *stackpointer; @@ -29,10 +29,11 @@ static void test(void) { (size_t) (1024*1024*50)), "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - die(mps_pool_create(&pool, arena, mps_class_mv_debug(), &debugOpts, - (size_t)8192, (size_t)8, (size_t)65536), - "create MV pool"); - + MPS_ARGS_BEGIN(args) { + MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &debugOpts); + die(mps_pool_create_k(&pool, arena, mps_class_mvff_debug(), args), + "create MVFF pool"); + } MPS_ARGS_END(args); die(mps_alloc(&a, pool, 64), "alloc a"); c = a; diff --git a/mps/test/function/161.c b/mps/test/function/161.c index 23a0fb8be14..307bfdf399b 100644 --- a/mps/test/function/161.c +++ b/mps/test/function/161.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = MV fenceposting check: subfree + summary = MVFF debug fenceposting check: subfree language = c link = testlib.o OUTPUT_SPEC @@ -12,7 +12,7 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" +#include "mpscmvff.h" #include "mpsavm.h" @@ -32,9 +32,11 @@ static void test(void) (size_t) (1024*1024*50)), "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - die(mps_pool_create(&pool, arena, mps_class_mv_debug(), &debugOpts, - (size_t)8192, (size_t)8, (size_t)65536), - "create MVFF pool"); + MPS_ARGS_BEGIN(args) { + MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &debugOpts); + die(mps_pool_create(&pool, arena, mps_class_mv_debug(), args), + "create MVFF pool"); + } MPS_ARGS_END(args); die(mps_alloc(&a, pool, 64), "alloc a"); diff --git a/mps/test/function/162.c b/mps/test/function/162.c index 8967b95b269..d6485ce779c 100644 --- a/mps/test/function/162.c +++ b/mps/test/function/162.c @@ -1,7 +1,7 @@ /* TEST_HEADER id = $Id$ - summary = MV fenceposting check: free + summary = MVFF debug fenceposting check: free language = c link = testlib.o OUTPUT_SPEC @@ -11,7 +11,7 @@ END_HEADER */ #include "testlib.h" -#include "mpscmv.h" +#include "mpscmvff.h" #include "mpsavm.h" void *stackpointer; @@ -29,10 +29,11 @@ static void test(void) { (size_t) (1024*1024*50)), "create arena"); cdie(mps_thread_reg(&thread, arena), "register thread"); - die(mps_pool_create(&pool, arena, mps_class_mv_debug(), &debugOpts, - (size_t)8192, (size_t)8, (size_t)65536), - "create MVFF pool"); - + MPS_ARGS_BEGIN(args) { + MPS_ARGS_ADD(args, MPS_KEY_POOL_DEBUG_OPTIONS, &debugOpts); + die(mps_pool_create_k(&pool, arena, mps_class_mv_debug(), args), + "create MVFF pool"); + } MPS_ARGS_END(args); die(mps_alloc(&a, pool, 63), "alloc a"); c = a;