mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 02:51:31 -08:00
Code Issues Projects Releases Wiki Activity

Catch-up merge from master sources to branch/2016-04-08/protidying.

Browse source 
Copied from Perforce
 Change: 191471
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Richard Brooksby 2016-04-21 14:46:10 +01:00
commit 4be15a5b0b
43 changed files with 1002 additions and 601 deletions
Download patch file Download diff file Expand all files Collapse all files

6
mps/code/cbs.c
View file

@ -59,7 +59,7 @@ Bool CBSCheck(CBS cbs)
CHECKL(cbs->blockStructSize > 0);
CHECKL(BoolCheck(cbs->ownPool));
CHECKL(SizeIsAligned(cbs->size, LandAlignment(land)));
STATISTIC_STAT({CHECKL((cbs->size == 0) == (cbs->treeSize == 0));});
STATISTIC(CHECKL((cbs->size == 0) == (cbs->treeSize == 0)));
return TRUE;
}
@ -248,7 +248,7 @@ static Res cbsInitComm(Land land, LandClass klass,
return res;
cbs->ownPool = TRUE;
}
cbs->treeSize = 0;
STATISTIC(cbs->treeSize = 0);
cbs->size = 0;
cbs->blockStructSize = blockStructSize;
@ -1107,7 +1107,7 @@ static Res cbsDescribe(Land land, mps_lib_FILE *stream, Count depth)
res = WriteF(stream, depth + 2,
"blockPool $P\n", (WriteFP)cbsBlockPool(cbs),
"ownPool $U\n", (WriteFU)cbs->ownPool,
"treeSize $U\n", (WriteFU)cbs->treeSize,
STATISTIC_WRITE(" treeSize: $U\n", (WriteFU)cbs->treeSize)
NULL);
if (res != ResOK)
return res;