Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bonefish+mmlr:

Browse Source 
* Introduce TracingMetaData::IsInBuffer() to validate that a certain memory
  range is within the valid tracing buffer limits.
* Use that when validating in tracing_is_entry_valid() before trying to access
  the entry, resolving a TODO.
* Validate the candidate time against the handed in time (if specified) as an
  additional check.
* Tiny unrelated text cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@43116 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2011-11-02 16:02:07 +00:00
parent 279ca67d6e
commit 9a79e531ef
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
headers/private/kernel/tracing.h
View File

@ -265,7 +265,8 @@ TraceOutput::Print(const char* format,...)
int dump_tracing(int argc, char** argv, WrapperTraceFilter* wrapperFilter);
bool tracing_is_entry_valid(TraceEntry* entry, bigtime_t entryTime);
bool tracing_is_entry_valid(AbstractTraceEntry* entry,
bigtime_t entryTime = -1);
#endif // __cplusplus

40
src/system/kernel/debug/tracing.cpp
View File

@ -100,6 +100,8 @@ public:
trace_entry* AllocateEntry(size_t size, uint16 flags);
bool IsInBuffer(void* address, size_t size);
private:
bool _FreeFirstEntry();
bool _MakeSpace(size_t needed);
@ -285,6 +287,25 @@ TracingMetaData::AllocateEntry(size_t size, uint16 flags)
}
bool
TracingMetaData::IsInBuffer(void* address, size_t size)
{
if (fEntries == 0)
return false;
addr_t start = (addr_t)address;
addr_t end = start + size;
if (start < (addr_t)fBuffer || end > (addr_t)(fBuffer + kBufferSize))
return false;
if (fFirstEntry > fAfterLastEntry)
return start >= (addr_t)fFirstEntry || end <= (addr_t)fAfterLastEntry;
return start >= (addr_t)fFirstEntry && end <= (addr_t)fAfterLastEntry;
}
bool
TracingMetaData::_FreeFirstEntry()
{
@ -495,8 +516,8 @@ bool
TracingMetaData::_InitPreviousTracingData()
{
// TODO: ATM re-attaching the previous tracing buffer doesn't work very
// well. The entries should checked more thoroughly for validity -- e.g. the
// pointers to the entries' vtable pointers could be invalid, which can
// well. The entries should be checked more thoroughly for validity -- e.g.
// the pointers to the entries' vtable pointers could be invalid, which can
// make the "traced" command quite unusable. The validity of the entries
// could be checked in a safe environment (i.e. with a fault handler) with
// typeid() and call of a virtual function.
@ -1696,18 +1717,25 @@ dump_tracing(int argc, char** argv, WrapperTraceFilter* wrapperFilter)
bool
tracing_is_entry_valid(TraceEntry* candidate, bigtime_t entryTime)
tracing_is_entry_valid(AbstractTraceEntry* candidate, bigtime_t entryTime)
{
#if ENABLE_TRACING
if (!sTracingMetaData->IsInBuffer(candidate, sizeof(*candidate)))
return false;
if (entryTime < 0)
return true;
TraceEntryIterator iterator;
while (TraceEntry* entry = iterator.Next()) {
AbstractTraceEntry* abstract = dynamic_cast<AbstractTraceEntry*>(entry);
if (abstract == NULL)
continue;
// TODO: This could be better by additionally checking if the
// candidate entry address falls within the valid entry range.
return abstract == candidate || abstract->Time() < entryTime;
if (abstract != candidate && abstract->Time() > entryTime)
return false;
return candidate->Time() == entryTime;
}
#endif