OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed the TArray serializer declaration.

Browse source 
(Thank you for your warnings, GCC! ;-)
- Changed root sector marking so that it can happen incrementally.


SVN r811 (trunk)
This commit is contained in:
Randy Heit 2008-03-19 02:20:19 +00:00
commit 02071140a5
8 changed files with 83 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

83
src/dobjgc.cpp
View file

@ -89,6 +89,8 @@
*/
#define DEFAULT_GCMUL 400 // GC runs 'quadruple the speed' of memory allocation
// Number of sectors to mark for each step.
#define SECTORSTEPSIZE 32
#define GCSTEPSIZE 1024u
#define GCSWEEPMAX 40
@ -97,6 +99,19 @@
// TYPES -------------------------------------------------------------------
// This object is responsible for marking sectors during the propagate
// stage. In case there are many, many sectors, it lets us break them
// up instead of marking them all at once.
class DSectorMarker : public DObject
{
DECLARE_CLASS(DSectorMarker, DObject)
public:
DSectorMarker() : SecNum(0) {}
size_t PropagateMark();
int SecNum;
};
IMPLEMENT_CLASS(DSectorMarker)
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@ -125,6 +140,8 @@ size_t Dept;
// PRIVATE DATA DEFINITIONS ------------------------------------------------
static DSectorMarker *SectorMarker;
// CODE --------------------------------------------------------------------
//==========================================================================
@ -281,19 +298,15 @@ static void MarkRoot()
if (playeringame[i])
players[i].PropagateMark();
}
if (sectors != NULL)
if (SectorMarker == NULL)
{
for (i = 0; i < numsectors; ++i)
{
Mark(sectors[i].SoundTarget);
Mark(sectors[i].CeilingSkyBox);
Mark(sectors[i].FloorSkyBox);
Mark(sectors[i].SecActTarget);
Mark(sectors[i].floordata);
Mark(sectors[i].ceilingdata);
Mark(sectors[i].lightingdata);
}
SectorMarker = new DSectorMarker;
}
else
{
SectorMarker->SecNum = 0;
}
Mark(SectorMarker);
{ // Silly bots
DObject *foo = &bglobal;
Mark(foo);
@ -564,6 +577,54 @@ void DelSoftRoot(DObject *obj)
}
//==========================================================================
//
// DSectorMarker :: PropagateMark
//
// Propagates marks across a few sectors and reinserts itself into the
// gray list if it didn't do them all.
//
//==========================================================================
size_t DSectorMarker::PropagateMark()
{
int i;
if (sectors == NULL)
{
return 0;
}
for (i = 0; i < SECTORSTEPSIZE && SecNum + i < numsectors; ++i)
{
sector_t *sec = &sectors[SecNum + i];
GC::Mark(sec->SoundTarget);
GC::Mark(sec->CeilingSkyBox);
GC::Mark(sec->FloorSkyBox);
GC::Mark(sec->SecActTarget);
GC::Mark(sec->floordata);
GC::Mark(sec->ceilingdata);
GC::Mark(sec->lightingdata);
}
// If there are more sectors to mark, put ourself back into the gray
// list.
if (SecNum + i < numsectors)
{
SecNum += i;
Black2Gray();
GCNext = GC::Gray;
GC::Gray = this;
}
return i * sizeof(sector_t);
}
//==========================================================================
//
// STAT gc
//
// Provides information about the current garbage collector state.
//
//==========================================================================
ADD_STAT(gc)
{
static const char *StateStrings[] = {