wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 726369 - Profiler: Make the circular buffer reader code safer. r=BenWa

Browse Source
This commit is contained in:
Jeff Muizelaar 2012-02-11 18:56:18 -05:00
parent 4eb7a39045
commit 30ceaba0e5
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/profiler/TableTicker.cpp
View File

@ -253,16 +253,11 @@ public:
void ToString(StringBuilder &profile)
{
//XXX: this code is not thread safe and needs to be fixed
// can we just have a mutex that guards access to the circular buffer?
// no because the main thread can be stopped while it still has access.
// which will cause a deadlock
int oldReadPos = mReadPos;
while (mReadPos != mLastFlushPos) {
profile.Append(mEntries[mReadPos].TagToString(this).c_str());
mReadPos = (mReadPos + 1) % mEntrySize;
int readPos = mReadPos;
while (readPos != mLastFlushPos) {
profile.Append(mEntries[readPos].TagToString(this).c_str());
readPos = (readPos + 1) % mEntrySize;
}
mReadPos = oldReadPos;
}
JSObject *ToJSObject(JSContext *aCx)
@ -306,14 +301,12 @@ public:
void WriteProfile(FILE* stream)
{
//XXX: this code is not thread safe and needs to be fixed
int oldReadPos = mReadPos;
while (mReadPos != mLastFlushPos) {
string tag = mEntries[mReadPos].TagToString(this);
int readPos = mReadPos;
while (readPos != mLastFlushPos) {
string tag = mEntries[readPos].TagToString(this);
fwrite(tag.data(), 1, tag.length(), stream);
mReadPos = (mReadPos + 1) % mEntrySize;
readPos = (readPos + 1) % mEntrySize;
}
mReadPos = oldReadPos;
}
private:
// Circular buffer 'Keep One Slot Open' implementation