Bug 960520 - Set generation id before adding the markers. r=jseward

--HG--
extra : rebase_source : 89fe0e02c0fedc65f111aec0367d70fdc10b787c
This commit is contained in:
Benoit Girard 2014-07-09 15:11:14 -04:00
parent 41eb7e8fa2
commit efec9062b4
2 changed files with 2 additions and 2 deletions

View File

@ -159,6 +159,7 @@ void populateBuffer(UnwinderThreadBuffer* utb, TickSample* sample,
{
ThreadProfile& sampledThreadProfile = *sample->threadProfile;
PseudoStack* stack = sampledThreadProfile.GetPseudoStack();
stack->updateGeneration(sampledThreadProfile.GetGenerationID());
/* Manufacture the ProfileEntries that we will give to the unwinder
thread, and park them in |utb|. */
@ -180,7 +181,6 @@ void populateBuffer(UnwinderThreadBuffer* utb, TickSample* sample,
stack->addStoredMarker(marker);
utb__addEntry( utb, ProfileEntry('m', marker) );
}
stack->updateGeneration(sampledThreadProfile.GetGenerationID());
if (jankOnly) {
// if we are on a different event we can discard any temporary samples
// we've kept around

View File

@ -602,6 +602,7 @@ void TableTicker::InplaceTick(TickSample* sample)
ThreadProfile& currThreadProfile = *sample->threadProfile;
PseudoStack* stack = currThreadProfile.GetPseudoStack();
stack->updateGeneration(currThreadProfile.GetGenerationID());
bool recordSample = true;
#if defined(XP_WIN)
bool powerSample = false;
@ -617,7 +618,6 @@ void TableTicker::InplaceTick(TickSample* sample)
stack->addStoredMarker(marker);
currThreadProfile.addTag(ProfileEntry('m', marker));
}
stack->updateGeneration(currThreadProfile.GetGenerationID());
#if defined(XP_WIN)
if (mProfilePower) {