Added support for filter in dmtracedump tool, along with some test cases.
Some corner cases are still not handled in the code, but will be eventually.
diff --git a/tools/dmtracedump/TraceDump.c b/tools/dmtracedump/TraceDump.c
index 2308148..da3bfd0 100644
--- a/tools/dmtracedump/TraceDump.c
+++ b/tools/dmtracedump/TraceDump.c
@@ -47,6 +47,17 @@
/* Size of temporary buffers for escaping html strings */
#define HTML_BUFSIZE 10240
+/* Size of methodId->method cache */
+#define METHOD_CACHE_SIZE 2048
+
+/* Some filter constants */
+#define FILTER_TAG '*'
+#define FILTER_FLAG_THREAD '+'
+#define FILTER_TYPE_CLASS 0
+#define FILTER_TYPE_METHOD 1
+
+#define DEFAULT_ACTIVE_THREADS 8
+
char *htmlHeader =
"<html>\n<head>\n<script type=\"text/javascript\" src=\"%ssortable.js\"></script>\n"
"<script langugage=\"javascript\">\n"
@@ -186,6 +197,8 @@
ThreadEntry* threads;
int numMethods;
MethodEntry* methods; /* 2 extra methods: "toplevel" and "unknown" */
+ int* methodCache; /* methodId->methodIndex mapping */
+ // TODO change to map methodId->method itself
} DataKeys;
#define TOPLEVEL_INDEX 0
@@ -197,10 +210,15 @@
} StackEntry;
typedef struct CallStack {
- int top;
- StackEntry calls[MAX_STACK_DEPTH];
- uint64_t lastEventTime;
- uint64_t threadStartTime;
+ int top;
+ StackEntry calls[MAX_STACK_DEPTH];
+ uint64_t lastEventTime;
+ uint64_t threadStartTime;
+ uint64_t* remTimes;
+ // Note: remTimes keeps a sum of 'un-allocated' time for each thread, in case
+ // we need to allocate it to one (or many) filter later. This would happen when
+ // we see a method exit that maches a filter, but whose entry we hadn't seen.
+ // TODO: consider moving remTimes into FilterTimes and change logic appropriately
} CallStack;
typedef struct DiffEntry {
@@ -217,6 +235,7 @@
const char* traceFileName;
const char* diffFileName;
const char* graphFileName;
+ const char* filterFileName;
int keepDotFile;
int dump;
int outputHtml;
@@ -233,6 +252,31 @@
UniqueMethodEntry *uniqueMethods;
} TraceData;
+typedef struct FilterKey {
+ int type[2]; /* 0=class, 1=method; 2 needed for start and end keys */
+ uint32_t flags; /* 1st bit = include cross-thread time */
+ char* keys[2]; /* 2 needed for start and end keys */
+} FilterKey;
+
+typedef struct FilterTimes {
+ uint64_t totalWaitTime;
+ uint64_t* threadWaitTimes;
+ uint64_t* threadExecutionTimesWhileWaiting;
+ uint64_t* threadExecutionTimes;
+} FilterTimes;
+
+typedef struct Filter {
+ char* filterName;
+ FilterKey* filterKeys;
+ int numKeys;
+ int activeCount;
+ int* activeThreads;
+ int* activationKeys;
+ FilterTimes times;
+} Filter;
+
+int numFilters = 0; // global
+
static Options gOptions;
/* Escapes characters in the source string that are html special entities.
@@ -602,6 +646,7 @@
free(pKeys->fileData);
free(pKeys->threads);
free(pKeys->methods);
+ free(pKeys->methodCache);
free(pKeys);
}
@@ -628,20 +673,15 @@
return -1;
}
-/*
- * Count the number of lines until the next token.
- *
- * Returns -1 if none found before EOF.
- */
-int countLinesToToken(const char* data, int len)
+int countLinesToChar(const char* data, int len, const char toFind)
{
int count = 0;
int next;
- while (*data != TOKEN_CHAR) {
+ while (*data != toFind) {
next = findNextChar(data, len, '\n');
if (next < 0)
- return -1;
+ return count;
count++;
data += next+1;
len -= next+1;
@@ -651,6 +691,16 @@
}
/*
+ * Count the number of lines until the next token.
+ *
+ * Returns 0 if none found before EOF.
+ */
+int countLinesToToken(const char* data, int len)
+{
+ return countLinesToChar(data, len, TOKEN_CHAR);
+}
+
+/*
* Make sure we're at the start of the right section.
*
* Returns the length of the token line, or -1 if something is wrong.
@@ -1037,7 +1087,7 @@
printf("Methods (%d):\n", pKeys->numMethods);
for (i = 0; i < pKeys->numMethods; i++) {
printf("0x%08x %s : %s : %s\n",
- pKeys->methods[i].methodId, pKeys->methods[i].className,
+ pKeys->methods[i].methodId >> 2, pKeys->methods[i].className,
pKeys->methods[i].methodName, pKeys->methods[i].signature);
}
}
@@ -1119,6 +1169,17 @@
{
int hi, lo, mid;
unsigned int id;
+ int hashedId;
+
+ /* Create cache if it doesn't already exist */
+ if (pKeys->methodCache == NULL) {
+ pKeys->methodCache = (int*) malloc(sizeof(int) * METHOD_CACHE_SIZE);
+ }
+
+ hashedId = (methodId >> 2) % METHOD_CACHE_SIZE; // ids are multiples of 4, so shift
+ if (pKeys->methodCache[hashedId]) /* cache hit */
+ if (pKeys->methods[pKeys->methodCache[hashedId]].methodId == methodId)
+ return &pKeys->methods[pKeys->methodCache[hashedId]];
lo = 0;
hi = pKeys->numMethods - 1;
@@ -1127,9 +1188,11 @@
mid = (hi + lo) / 2;
id = pKeys->methods[mid].methodId;
- if (id == methodId) /* match */
- return &pKeys->methods[mid];
- else if (id < methodId) /* too low */
+ if (id == methodId) { /* match, put in cache */
+ hashedId = (methodId >> 2) % METHOD_CACHE_SIZE;
+ pKeys->methodCache[hashedId] = mid;
+ return &pKeys->methods[mid];
+ } else if (id < methodId) /* too low */
lo = mid + 1;
else /* too high */
hi = mid - 1;
@@ -1710,12 +1773,10 @@
char classBuf[HTML_BUFSIZE], methodBuf[HTML_BUFSIZE];
char signatureBuf[HTML_BUFSIZE];
char anchor_buf[80];
- char *anchor_close = "";
total = sumThreadTime;
anchor_buf[0] = 0;
if (gOptions.outputHtml) {
- anchor_close = "</a>";
printf("<a name=\"inclusive\"></a>\n");
printf("<hr>\n");
outputNavigationBar();
@@ -1800,20 +1861,19 @@
}
}
-void printThreadProfile(ThreadEntry *pThreads, int numThreads, uint64_t sumThreadTime)
+void printThreadProfile(ThreadEntry *pThreads, int numThreads, uint64_t sumThreadTime, Filter** filters)
{
- int ii;
+ int ii, jj;
ThreadEntry thread;
double total, per, sum_per;
uint64_t sum;
char threadBuf[HTML_BUFSIZE];
char anchor_buf[80];
- char *anchor_close = "";
+ int drawTable;
total = sumThreadTime;
anchor_buf[0] = 0;
if (gOptions.outputHtml) {
- anchor_close = "</a>";
printf("<a name=\"thread\"></a>\n");
printf("<hr>\n");
outputNavigationBar();
@@ -1824,13 +1884,18 @@
/* Sort the threads into decreasing order of elapsed time. */
qsort(pThreads, numThreads, sizeof(ThreadEntry), compareElapsed);
- printf("\nElapsed times for each thread, sorted by elapsed time.\n\n");
+ printf("\nElapsed times for each thread, sorted by elapsed time.\n");
+ printf("Also includes percentage of time spent during the <i>execution</i> of any filters.\n\n");
if (gOptions.outputHtml) {
printf("<br><br>\n<pre>\n");
}
- printf(" Usecs self %% sum %% tid ThreadName\n");
+ printf(" Usecs self %% sum %%");
+ for (ii = 0; ii < numFilters; ++ii) {
+ printf(" %s %%", filters[ii]->filterName);
+ }
+ printf(" tid ThreadName\n");
sum = 0;
for (ii = 0; ii < numThreads; ++ii) {
@@ -1851,11 +1916,64 @@
if (gOptions.outputHtml) {
threadName = htmlEscape(threadName, threadBuf, HTML_BUFSIZE);
}
- printf("%9llu %6.2f %6.2f %3d %s\n", time, per, sum_per, threadId, threadName);
+
+ printf("%9llu %6.2f %6.2f", time, per, sum_per);
+ for (jj = 0; jj < numFilters; jj++) {
+ printf(" %6.2f", 100.0 * filters[jj]->times.threadExecutionTimes[threadId] / time);
+ }
+ printf(" %3d %s\n", threadId, threadName);
}
if (gOptions.outputHtml)
- printf("</pre>\n");
+ printf("</pre><br />");
+
+ printf("\n\nBreak-down of portion of time spent by each thread while waiting on a filter method.\n");
+
+ for (ii = 0; ii < numFilters; ++ii) {
+ // Draw a table for each filter that measures wait time
+ drawTable = 0;
+ for (jj = 0; jj < filters[ii]->numKeys; jj++)
+ if (filters[ii]->filterKeys[jj].flags == 1)
+ drawTable = 1;
+
+ if (drawTable) {
+
+ if (gOptions.outputHtml)
+ printf("<br/><br/>\n<pre>\n");
+ printf("Filter: %s\n", filters[ii]->filterName);
+ printf("Total waiting cycles: %llu (%6.2f%% of total)\n",
+ filters[ii]->times.totalWaitTime,
+ 100.0 * filters[ii]->times.totalWaitTime / sum);
+
+ if (filters[ii]->times.totalWaitTime > 0) {
+
+ printf("Details: \n\n");
+
+ printf(" Waiting cycles %% of total waiting time execution time while waiting thread name\n");
+
+ for (jj = 0; jj < numThreads; jj++) {
+
+ thread = pThreads[jj];
+
+ char *threadName;
+ threadName = (char*) thread.threadName;
+ if (gOptions.outputHtml) {
+ threadName = htmlEscape(threadName, threadBuf, HTML_BUFSIZE);
+ }
+
+ printf(" %9llu %6.2f %6.2f %s\n",
+ filters[ii]->times.threadWaitTimes[thread.threadId],
+ 100.0 * filters[ii]->times.threadWaitTimes[thread.threadId] / filters[ii]->times.totalWaitTime,
+ 100.0 * filters[ii]->times.threadExecutionTimesWhileWaiting[thread.threadId] / filters[ii]->times.totalWaitTime,
+ threadName);
+ }
+ }
+
+ if (gOptions.outputHtml)
+ printf("</pre>\n");
+
+ }
+ }
}
@@ -2360,16 +2478,464 @@
}
/*
+ * Determines whether the given FilterKey matches the method. The FilterKey's
+ * key that is used to match against the method is determined by index.
+ */
+int keyMatchesMethod(FilterKey filterKey, MethodEntry* method, int index)
+{
+ if (filterKey.type[index] == 0) { // Class
+#if 0
+ fprintf(stderr, " class is %s; filter key is %s\n", method->className, filterKey.keys[index]);
+#endif
+ if (strcmp(method->className, filterKey.keys[index]) == 0) {
+ return 1;
+ }
+ } else { // Method
+ if (method->methodName != NULL) {
+ // Get fully-qualified name
+ // TODO: parse class name and method name an put them in structure to avoid
+ // allocating memory here
+ char* str = malloc ((strlen(method->className) + strlen(method->methodName) + 2) * sizeof(char));
+ strcpy(str, method->className);
+ strcat(str, ".");
+ strcat(str, method->methodName);
+#if 0
+ fprintf(stderr, " method is %s; filter key is %s\n", str, filterKey.keys[index]);
+#endif
+ if (strcmp(str, filterKey.keys[index]) == 0) {
+ free(str);
+ return 1;
+ }
+ free(str);
+ }
+ }
+ return 0;
+}
+
+/*
+ * Adds the appropriate times to the given filter based on the given method. Activates and
+ * de-activates filters as necessary.
+ *
+ * A filter is activated when the given method matches the 'entry' key of one of its FilterKeys.
+ * It is de-activated when the method matches the 'exit' key of the same FilterKey that activated it
+ * in the first place. Thus, a filter may be active more than once on the same thread (activated by
+ * different FilterKeys). A filter may also be active on different threads at the same time.
+ *
+ * While the filter is active on thread 1, elapsed time is allocated to different buckets which
+ * include: thread execution time (i.e., time thread 1 spent executing while filter was active),
+ * thread waiting time (i.e., time thread 1 waited while other threads executed), and execution
+ * time while waiting (i.e., time thread x spent executing while thread 1 was waiting). We also
+ * keep track of the total waiting time for a given filter.
+ *
+ * Lastly, we keep track of remaining (un-allocated) time for cases in which we exit a method we
+ * had not entered before, and that method happens to match the 'exit' key of a FilterKey.
+ */
+int filterMethod(MethodEntry* method, Filter* filter, int entry, int threadId, int numThreads,
+ uint64_t elapsed, uint64_t remTime)
+{
+ int ii, jj;
+ int activeCount, addedWaitTimeThreadsCount;
+ int* activeThreads;
+ int* activationKeys;
+ int* addedWaitTimeThreads;
+
+ // flags
+ int addWaitTime = 0;
+ int deactivation = 0;
+ int addedExecutionTime = 0;
+ int addedExecutionTimeWhileWaiting = 0;
+ int addedWaitTime;
+ int addedRemTime = 0;
+ int threadKeyPairActive = 0;
+
+ if (filter->times.threadWaitTimes == NULL && filter->times.threadExecutionTimes == NULL &&
+ filter->times.threadExecutionTimesWhileWaiting == NULL) {
+ filter->times.threadWaitTimes = (uint64_t*) calloc(MAX_THREADS, sizeof(uint64_t));
+ filter->times.threadExecutionTimesWhileWaiting =
+ (uint64_t*) calloc(MAX_THREADS, sizeof(uint64_t));
+ filter->times.threadExecutionTimes = (uint64_t*) calloc(MAX_THREADS, sizeof(uint64_t));
+ }
+
+ int verbose = 0;
+
+ if (verbose)
+ fprintf(stderr,
+ "Running %s filter for class %s method %s, thread %d; activeCount: %d time: %llu\n",
+ filter->filterName, method->className, method->methodName, threadId,
+ filter->activeCount, elapsed);
+
+ // If active on some thread
+ if (filter->activeCount > 0) {
+
+ // Initialize active structures in case there are any de-activations
+ activeThreads = (int*) calloc(filter->activeCount, sizeof(int));
+ activationKeys = (int*) calloc(filter->activeCount, sizeof(int));
+ activeCount = 0;
+
+ // Initialize structure to help us determine which threads we've already added wait time to
+ addedWaitTimeThreads = (int*) calloc(filter->activeCount, sizeof(int));
+ addedWaitTimeThreadsCount = 0;
+
+ // Add times to appropriate sums and de-activate (if necessary)
+ for (ii = 0; ii < filter->activeCount; ii++) {
+
+ if (verbose) {
+ fprintf(stderr, " Analyzing active thread with id %d, activated by key [%s, %s]\n",
+ filter->activeThreads[ii],
+ filter->filterKeys[filter->activationKeys[ii]].keys[0],
+ filter->filterKeys[filter->activationKeys[ii]].keys[1]);
+ }
+
+ // If active on THIS thread -> add to execution time (only add once!)
+ if (filter->activeThreads[ii] == threadId && !addedExecutionTime) {
+ if (verbose)
+ fprintf(stderr, " Adding execution time to this thead\n");
+ filter->times.threadExecutionTimes[threadId] += elapsed;
+ addedExecutionTime = 1;
+ }
+
+ // If active on ANOTHER thread (or this one too) with CROSS_THREAD_FLAG -> add to
+ // both thread's waiting time + total
+ if (filter->filterKeys[filter->activationKeys[ii]].flags == 1) {
+
+ // Add time to thread that is waiting (add to each waiting thread at most once!)
+ addedWaitTime = 0;
+ for (jj = 0; jj < addedWaitTimeThreadsCount; jj++) {
+ if (addedWaitTimeThreads[jj] == filter->activeThreads[ii])
+ addedWaitTime = 1;
+ }
+ if (!addedWaitTime) {
+ if (verbose)
+ fprintf(stderr, " Adding wait time to waiting thread\n");
+ filter->times.threadWaitTimes[filter->activeThreads[ii]] += elapsed;
+ addedWaitTimeThreads[addedWaitTimeThreadsCount++] = filter->activeThreads[ii];
+ }
+
+ // Add execution time to this thread while the other is waiting (only add once!)
+ // [Flag is needed only because outside for loop might iterate through same
+ // thread twice?] TODO: verify
+ if (!addedExecutionTimeWhileWaiting) {
+ if (verbose)
+ fprintf(stderr, " Adding exec time to this thread while thread waits\n");
+ filter->times.threadExecutionTimesWhileWaiting[threadId] += elapsed;
+ addedExecutionTimeWhileWaiting = 1;
+ }
+
+ addWaitTime = 1;
+ }
+
+ // If a method exit matches the EXIT method of an ACTIVE key -> de-activate
+ // the KEY (not the entire filter!!)
+ if (!entry && keyMatchesMethod(filter->filterKeys[filter->activationKeys[ii]],
+ method, 1)) {
+ if (verbose)
+ fprintf(stderr, " Exit key matched!\n");
+
+ // Deactivate by removing (NOT adding) entries from activeThreads and activationKeys
+ deactivation = 1; // singal that lists should be replaced
+ } else {
+ // No de-activation -> copy old entries into new lists
+ activeThreads[activeCount] = filter->activeThreads[ii];
+ activationKeys[activeCount++] = filter->activationKeys[ii];
+ }
+ }
+
+ // If waiting on ANY thread, add wait time to total (but only ONCE!)
+ if (addWaitTime) {
+ filter->times.totalWaitTime += elapsed;
+ }
+
+ // If de-activation occurred, replace lists
+ if (deactivation) {
+ // TODO: Free memory from old lists
+
+ // Set new lists
+ filter->activeThreads = activeThreads;
+ filter->activationKeys = activationKeys;
+ filter->activeCount = activeCount;
+ } else {
+ // TODO: Free memory from new lists
+ }
+
+ } // Else, continue (we might be activating the filter on a different thread)
+
+
+ if (entry) { // ENTRY
+ if (verbose)
+ fprintf(stderr, " Here at the entry\n");
+ // If method matches entry key -> activate thread (do not add time since it's a new entry!)
+ for (ii = 0; ii < filter->numKeys; ii++) {
+ if (keyMatchesMethod(filter->filterKeys[ii], method, 0)) {
+ if (verbose)
+ fprintf(stderr, " Entry key matched!\n");
+ // Activate thread only if thread/key pair is not already active
+ for (jj = 0; jj < filter->activeCount; jj++) {
+ if (filter->activeThreads[jj] == threadId && filter->activationKeys[jj] == ii)
+ threadKeyPairActive = 1;
+ }
+ // TODO: WORRY ABOUT MEMORY WHEN ACTIVE_COUNT > DEFAULT_ACTIVE_THREAD (unlikely)
+ // TODO: what if the same thread is active multiple times by different keys?
+ // nothing, we just have to make sure we dont double-add, and we dont..
+ if (!threadKeyPairActive) {
+ filter->activeThreads[filter->activeCount] = threadId;
+ filter->activationKeys[filter->activeCount++] = ii;
+ }
+ }
+ }
+ } else { // EXIT
+ // If method matches a terminal key -> add remTime to total (no need to active/de-activate)
+ for (ii = 0; ii < filter->numKeys; ii++) {
+ if (!deactivation && keyMatchesMethod(filter->filterKeys[ii], method, 1) &&
+ keyMatchesMethod(filter->filterKeys[ii], method, 0)) {
+ // Add remTime(s)
+ // TODO: think about how we should add remTimes.. should we add remTime to threads
+ // that were waiting or being waited on? for now, keep it simple and just add the
+ // execution time to the current thread.
+ filter->times.threadExecutionTimes[threadId] += remTime;
+ addedRemTime = 1;
+ }
+ }
+ }
+
+ return addedExecutionTime | (addedRemTime << 1);
+}
+
+void dumpFilters(Filter** filters) {
+ int i;
+ for (i = 0; i < numFilters; i++) {
+ int j;
+ fprintf(stderr, "FILTER %s\n", filters[i]->filterName);
+ for (j = 0; j < filters[i]->numKeys; j++) {
+ fprintf(stderr, "Keys: %s, type %d", filters[i]->filterKeys[j].keys[0],
+ filters[i]->filterKeys[j].type[0]);
+ if (filters[i]->filterKeys[j].keys[1] != NULL) {
+ fprintf(stderr, " AND %s, type %d", filters[i]->filterKeys[j].keys[1],
+ filters[i]->filterKeys[j].type[1]);
+ }
+ fprintf(stderr, "; flags: %d\n", filters[i]->filterKeys[j].flags);
+ }
+ }
+}
+
+/*
+ * See parseFilters for required data format.
+ * 'data' must point to the beginning of a filter definition.
+ */
+char* parseFilter(char* data, char* dataEnd, Filter** filters, int num) {
+
+ Filter* filter;
+ int next, count, i;
+ int tmpOffset, tmpKeyLen;
+ char* tmpKey;
+ char* key1;
+ char* key2;
+
+ filter = (Filter*) malloc(sizeof(Filter));
+ filter->activeCount = 0;
+ filter->activeThreads = (int*) calloc(DEFAULT_ACTIVE_THREADS, sizeof(int));
+ filter->activationKeys = (int*) calloc(DEFAULT_ACTIVE_THREADS, sizeof(int));
+
+ next = findNextChar(data + 1, dataEnd - data - 1, '\n');
+ if (next < 0) {
+ // TODO: what should we do here?
+ // End of file reached...
+ }
+ data[next+1] = '\0';
+ filter->filterName = data + 1;
+ data += next + 2; // Careful
+
+ /*
+ * Count the number of keys (one per line).
+ */
+ count = countLinesToChar(data, dataEnd - data, FILTER_TAG);
+ if (count <= 0) {
+ fprintf(stderr,
+ "ERROR: failed while parsing filter %s (found %d keys)\n",
+ filter->filterName, count);
+ return NULL; // TODO: Should do something else
+ // Could return filter with 0 keys instead (probably better to avoid random segfaults)
+ }
+
+ filter->filterKeys = (FilterKey*) malloc(sizeof(FilterKey) * count);
+
+ /*
+ * Extract all entries.
+ */
+ tmpOffset = 0;
+ for (i = 0; i < count; i++) {
+ next = findNextChar(data, dataEnd - data, '\n');
+ // assert(next > 0); // TODO: revise... (skip if next == 0 ?)
+ data[next] = '\0';
+ tmpKey = data;
+
+ if (*data == FILTER_FLAG_THREAD) {
+ filter->filterKeys[i].flags = 1;
+ tmpKey++;
+ } else {
+ filter->filterKeys[i].flags = 0;
+ }
+
+ tmpOffset = findNextChar(tmpKey, next, ',');
+
+ if (tmpOffset < 0) {
+ // No comma, so only 1 key
+ key1 = tmpKey;
+ key2 = tmpKey;
+
+ // Get type for key1
+ filter->filterKeys[i].type[0] = FILTER_TYPE_CLASS; // default
+ tmpOffset = findNextChar(key1, next, '(');
+ if (tmpOffset > 0) {
+ if (findNextChar(key1, next, ')') == tmpOffset + 1) {
+ filter->filterKeys[i].type[0] = FILTER_TYPE_METHOD;
+ filter->filterKeys[i].type[1] = FILTER_TYPE_METHOD;
+ }
+ key1[tmpOffset] = '\0';
+ }
+ } else {
+ // Pair of keys
+ tmpKey[tmpOffset] = '\0';
+ key1 = tmpKey;
+ key2 = tmpKey + tmpOffset + 1;
+
+ // Get type for key1
+ filter->filterKeys[i].type[0] = FILTER_TYPE_CLASS;
+ tmpKeyLen = tmpOffset;
+ tmpOffset = findNextChar(key1, tmpKeyLen, '(');
+ if (tmpOffset > 0) {
+ if (findNextChar(key1, tmpKeyLen, ')') == tmpOffset + 1) {
+ filter->filterKeys[i].type[0] = FILTER_TYPE_METHOD;
+ }
+ key1[tmpOffset] = '\0';
+ }
+
+ // Get type for key2
+ filter->filterKeys[i].type[1] = FILTER_TYPE_CLASS;
+ tmpOffset = findNextChar(key2, next - tmpKeyLen, '(');
+ if (tmpOffset > 0) {
+ if (findNextChar(key2, next - tmpKeyLen, ')') == tmpOffset + 1) {
+ filter->filterKeys[i].type[1] = FILTER_TYPE_METHOD;
+ }
+ key2[tmpOffset] = '\0';
+ }
+ }
+
+ filter->filterKeys[i].keys[0] = key1;
+ filter->filterKeys[i].keys[1] = key2;
+ data += next+1;
+ }
+
+ filter->numKeys = count;
+ filters[num] = filter;
+
+ return data;
+}
+
+/*
+ * Parses filters from given file. The file must follow the following format:
+ *
+ * *FilterName <- creates a new filter with keys to follow
+ * A.method() <- key that triggers whenever A.method() enters/exit
+ * Class <- key that triggers whenever any method from Class enters/exits
+ * +CrossThread <- same as above, but keeps track of execution times accross threads
+ * B.m(),C.m() <- key that triggers filter on when B.m() enters and off when C.m() exits
+ *
+ * TODO: add concrete example to make things clear
+ */
+Filter** parseFilters(const char* filterFileName) {
+
+ Filter** filters = NULL;
+ FILE* fp = NULL;
+ long len;
+ char* data;
+ char* dataEnd;
+ char* dataStart;
+ int i, next, count;
+
+ fp = fopen(filterFileName, "r");
+ if (fp == NULL)
+ goto bail;
+
+ if (fseek(fp, 0L, SEEK_END) != 0) {
+ perror("fseek");
+ goto bail;
+ }
+
+ len = ftell(fp);
+ if (len == 0) {
+ fprintf(stderr, "WARNING: Filter file is empty.\n");
+ goto bail;
+ }
+ rewind(fp);
+
+ data = (char*) malloc(len);
+ if (data == NULL) {
+ fprintf(stderr, "ERROR: unable to alloc %ld bytes for filter file\n", len);
+ goto bail;
+ }
+
+ // Read file into memory
+ if (fread(data, 1, len, fp) != (size_t) len) {
+ fprintf(stderr, "ERROR: unable to read %ld bytes from filter file\n", len);
+ goto bail;
+ }
+
+ dataStart = data;
+ dataEnd = data + len;
+
+ // Figure out how many filters there are
+ numFilters = 0;
+ next = -1;
+
+ while (1) {
+ if (*data == FILTER_TAG)
+ numFilters++;
+ next = findNextChar(data, len, '\n');
+ if (next < 0)
+ break;
+ data += next+1;
+ len -= next+1;
+ }
+
+ if (numFilters == 0) {
+ fprintf(stderr, "WARNING: no filters found. Continuing without filters\n");
+ goto bail;
+ }
+
+ filters = (Filter**) calloc(numFilters, sizeof(Filter *));
+ if (filters == NULL) {
+ fprintf(stderr, "ERROR: unable to alloc memory for filters");
+ goto bail;
+ }
+
+ data = dataStart;
+ for (i = 0; i < numFilters; i++) {
+ data = parseFilter(data, dataEnd, filters, i);
+ }
+
+ return filters;
+
+bail:
+ if (fp != NULL)
+ fclose(fp);
+
+ return NULL;
+
+}
+
+
+/*
* Read the key and data files and return the MethodEntries for those files
*/
-DataKeys* parseDataKeys(TraceData* traceData, const char* traceFileName, uint64_t* threadTime)
+DataKeys* parseDataKeys(TraceData* traceData, const char* traceFileName,
+ uint64_t* threadTime, Filter** filters)
{
DataKeys* dataKeys = NULL;
MethodEntry **pMethods = NULL;
MethodEntry* method;
FILE* dataFp = NULL;
DataHeader dataHeader;
- int ii;
+ int ii, jj, numThreads;
uint64_t currentTime;
MethodEntry* caller;
@@ -2378,11 +2944,13 @@
goto bail;
if ((dataKeys = parseKeys(dataFp, 0)) == NULL)
- goto bail;
+ goto bail;
if (parseDataHeader(dataFp, &dataHeader) < 0)
goto bail;
+ numThreads = dataKeys->numThreads;
+
#if 0
FILE *dumpStream = fopen("debug", "w");
#endif
@@ -2392,12 +2960,13 @@
int action;
unsigned int methodId;
CallStack *pStack;
+
/*
* Extract values from file.
*/
if (readDataRecord(dataFp, &threadId, &methodVal, ¤tTime))
break;
-
+
action = METHOD_ACTION(methodVal);
methodId = METHOD_ID(methodVal);
@@ -2410,6 +2979,7 @@
pStack->top = 0;
pStack->lastEventTime = currentTime;
pStack->threadStartTime = currentTime;
+ pStack->remTimes = (uint64_t*) calloc(numFilters, sizeof(uint64_t));
traceData->stacks[threadId] = pStack;
}
@@ -2420,16 +2990,16 @@
#if 0
if (method->methodName) {
- fprintf(dumpStream, "%2d %-8llu %d %8llu r %d c %d %s.%s %s\n",
- threadId, currentTime, action, pStack->threadStartTime,
- method->recursiveEntries,
- pStack->top, method->className, method->methodName,
- method->signature);
+ fprintf(dumpStream, "%2d %-8llu %d %8llu r %d c %d %s.%s %s\n",
+ threadId, currentTime, action, pStack->threadStartTime,
+ method->recursiveEntries,
+ pStack->top, method->className, method->methodName,
+ method->signature);
} else {
- fprintf(dumpStream, "%2d %-8llu %d %8llu r %d c %d %s\n",
- threadId, currentTime, action, pStack->threadStartTime,
- method->recursiveEntries,
- pStack->top, method->className);
+ printf(dumpStream, "%2d %-8llu %d %8llu r %d c %d %s\n",
+ threadId, currentTime, action, pStack->threadStartTime,
+ method->recursiveEntries,
+ pStack->top, method->className);
}
#endif
@@ -2462,6 +3032,26 @@
/* Push the method on the stack for this thread */
pStack->calls[pStack->top].method = method;
pStack->calls[pStack->top++].entryTime = currentTime;
+
+ // For each filter
+ int result = 0;
+ for (ii = 0; ii < numFilters; ii++) {
+ result = filterMethod(method, filters[ii], 1, threadId, numThreads,
+ currentTime - pStack->lastEventTime, pStack->remTimes[ii]);
+
+ // TODO: make remTimes work properly
+ // Consider moving remTimes handling together with the rest
+ // of time handling and clean up the return codes
+ /*
+ if (result == 0) { // no time added, no remTime added
+ pStack->remTimes[ii] += currentTime - pStack->lastEventTime;
+ } else if (result == 3 || result == 4) { // remTime added
+ // Reset remTime, since it's been added
+ pStack->remTimes[ii] = 0;
+ }
+ */
+ }
+
} else {
/* This is a method exit */
uint64_t entryTime = 0;
@@ -2499,6 +3089,24 @@
if (method->recursiveEntries == 0) {
method->topExclusive += currentTime - pStack->lastEventTime;
}
+
+ // For each filter
+ int result = 0;
+ for (ii = 0; ii < numFilters; ii++) {
+ result = filterMethod(method, filters[ii], 0, threadId, numThreads,
+ currentTime - pStack->lastEventTime, pStack->remTimes[ii]);
+
+ // TODO: make remTimes work properly
+ /*
+ if (result == 0) { // no time added, no remTime added
+ pStack->remTimes[ii] += currentTime - pStack->lastEventTime;
+ } else if (result == 3 || result == 4) { // remTime added
+ // Reset remTime, since it's been added
+ pStack->remTimes[ii] = 0;
+ }
+ */
+ }
+
}
/* Remember the time of the last entry or exit event */
pStack->lastEventTime = currentTime;
@@ -2520,17 +3128,13 @@
if (pStack == NULL)
continue;
- /* Calculate time spent in thread, and add it to total time */
+ /* Calculate times spent in thread, and add it to total time */
elapsedTime = pStack->lastEventTime - pStack->threadStartTime;
sumThreadTime += elapsedTime;
- /* Save the per-thread elapsed time in the DataKeys struct */
- for (ii = 0; ii < dataKeys->numThreads; ++ii) {
- if (dataKeys->threads[ii].threadId == threadId)
- dataKeys->threads[ii].elapsedTime = elapsedTime;
- }
-
for (ii = 0; ii < pStack->top; ++ii) {
+ //printf("in loop\n");
+
if (ii == 0)
caller = &dataKeys->methods[TOPLEVEL_INDEX];
else
@@ -2542,7 +3146,33 @@
uint64_t entryTime = pStack->calls[ii].entryTime;
uint64_t elapsed = pStack->lastEventTime - entryTime;
addInclusiveTime(caller, method, elapsed);
+
+ // For each filter
+ int result = 0;
+ for (ii = 0; ii < numFilters; ii++) {
+ result = filterMethod(method, filters[ii], 0, threadId, numThreads,
+ currentTime - pStack->lastEventTime, pStack->remTimes[ii]);
+
+ // TODO: make remTimes work properly
+ /*
+ if (result == 0) { // no time added, no remTime added
+ pStack->remTimes[ii] += currentTime - pStack->lastEventTime;
+ } else if (result == 3 || result == 4) { // remTime added
+ // Reset remTime, since it's been added
+ pStack->remTimes[ii] = 0;
+ }
+ */
+ }
}
+
+ /* Save the per-thread elapsed time in the DataKeys struct */
+ for (ii = 0; ii < dataKeys->numThreads; ++ii) {
+ if (dataKeys->threads[ii].threadId == threadId) {
+ dataKeys->threads[ii].elapsedTime = elapsedTime;
+ }
+ }
+
+
}
caller = &dataKeys->methods[TOPLEVEL_INDEX];
caller->elapsedInclusive = sumThreadTime;
@@ -2579,13 +3209,14 @@
return pMethods;
}
+
/*
* Produce a function profile from the following methods
*/
void profileTrace(TraceData* traceData, MethodEntry **pMethods, int numMethods, uint64_t sumThreadTime,
- ThreadEntry *pThreads, int numThreads)
+ ThreadEntry *pThreads, int numThreads, Filter** filters)
{
- /* Print the html header, if necessary */
+ /* Print the html header, if necessary */
if (gOptions.outputHtml) {
printf(htmlHeader, gOptions.sortableUrl);
outputTableOfContents();
@@ -2594,7 +3225,7 @@
printExclusiveProfile(pMethods, numMethods, sumThreadTime);
printInclusiveProfile(pMethods, numMethods, sumThreadTime);
- printThreadProfile(pThreads, numThreads, sumThreadTime);
+ printThreadProfile(pThreads, numThreads, sumThreadTime, filters);
createClassList(traceData, pMethods, numMethods);
printClassProfiles(traceData, sumThreadTime);
@@ -2887,9 +3518,10 @@
int usage(const char *program)
{
- fprintf(stderr, "usage: %s [-ho] [-s sortable] [-d trace-file-name] [-g outfile] trace-file-name\n", program);
+ fprintf(stderr, "usage: %s [-ho] [-s sortable] [-d trace-file-name] [-g outfile] [-f filter-file] trace-file-name\n", program);
fprintf(stderr, " -d trace-file-name - Diff with this trace\n");
fprintf(stderr, " -g outfile - Write graph to 'outfile'\n");
+ fprintf(stderr, " -f filter-file - Filter functions as specified in file\n");
fprintf(stderr, " -k - When writing a graph, keep the intermediate DOT file\n");
fprintf(stderr, " -h - Turn on HTML output\n");
fprintf(stderr, " -o - Dump the dmtrace file instead of profiling\n");
@@ -2902,7 +3534,7 @@
int parseOptions(int argc, char **argv)
{
while (1) {
- int opt = getopt(argc, argv, "d:hg:kos:t:");
+ int opt = getopt(argc, argv, "d:hg:kos:t:f:");
if (opt == -1)
break;
switch (opt) {
@@ -2912,6 +3544,8 @@
case 'g':
gOptions.graphFileName = optarg;
break;
+ case 'f':
+ gOptions.filterFileName = optarg;
case 'k':
gOptions.keepDotFile = 1;
break;
@@ -2939,8 +3573,9 @@
*/
int main(int argc, char** argv)
{
+
gOptions.threshold = -1;
-
+
// Parse the options
if (parseOptions(argc, argv) || argc - optind != 1)
return usage(argv[0]);
@@ -2957,10 +3592,15 @@
}
uint64_t sumThreadTime = 0;
-
+
+ Filter** filters = NULL;
+ if (gOptions.filterFileName != NULL) {
+ filters = parseFilters(gOptions.filterFileName);
+ }
+
TraceData data1;
DataKeys* dataKeys = parseDataKeys(&data1, gOptions.traceFileName,
- &sumThreadTime);
+ &sumThreadTime, filters);
if (dataKeys == NULL) {
fprintf(stderr, "Cannot read trace.\n");
exit(1);
@@ -2969,7 +3609,7 @@
if (gOptions.diffFileName != NULL) {
uint64_t sum2;
TraceData data2;
- DataKeys* d2 = parseDataKeys(&data2, gOptions.diffFileName, &sum2);
+ DataKeys* d2 = parseDataKeys(&data2, gOptions.diffFileName, &sum2, filters);
createDiff(d2, sum2, dataKeys, sumThreadTime);
@@ -2977,7 +3617,7 @@
} else {
MethodEntry** methods = parseMethodEntries(dataKeys);
profileTrace(&data1, methods, dataKeys->numMethods, sumThreadTime,
- dataKeys->threads, dataKeys->numThreads);
+ dataKeys->threads, dataKeys->numThreads, filters);
if (gOptions.graphFileName != NULL) {
createInclusiveProfileGraphNew(dataKeys);
}
diff --git a/tools/dmtracedump/filters b/tools/dmtracedump/filters
new file mode 100644
index 0000000..96a041c
--- /dev/null
+++ b/tools/dmtracedump/filters
@@ -0,0 +1,42 @@
+*GC
+dvmGcScanRootClassLoader
+mspace_walk_free_pages
+dvmCollectGarbageInternal
+doHeapWork
+dvmGetNextHeapWorkerObject
+GC
+GC2
+GC3
+*Net
+setsockopt
++sys_setsockopt [kernel]
+socketSelect
+send
+recv
+sendto
+recvfrom
++sys_sendto [kernel]
++sys_recvfrom [kernel]
+org.apache.harmony.luni.internal.net.www.protocol.http.HttpURLConnection
+android.net.http.ConnectionThread
+PlainSocketImpl
+WebCore::HTMLTokenizer
+*IO
+select
++sys_select [kernel]
+*DB
+android.database.sqlite.SQLiteOpenHelper
+android.database.sqlite.SQLiteQueryBuilder
+android.database.sqlite.SQLiteDatabase
+android.database.sqlite.SQLiteDirectCursorDriver
+android.database.sqlite.SQLiteQuery
+android.database.sqlite.SQLiteProgram
+android.database.AbstractCursor
+android.database.sqlite.SQLiteCursor
+*UI
+android.view.View.draw()
+android.view.ViewGroup
+*Sync
++java.lang.Object.wait()
+*Useless
++android.widget.ProgressBar
diff --git a/tools/dmtracedump/tests/filters/run_tests.sh b/tools/dmtracedump/tests/filters/run_tests.sh
new file mode 100755
index 0000000..cdf87cb
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/run_tests.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+failed=0
+for file in $(find $1 -type f -iname 'test*'); do
+ case $file in
+ *testFilters) continue; ;;
+ *Expected) continue; ;;
+ *Trace) continue; ;;
+ *.html) continue; ;;
+ esac
+
+ echo "Running test for $file"
+
+# create_test_dmtrace $file tmp.trace
+ dmtracedump -f testFilters -h "$file"Trace > tmp.html 2> /dev/null
+
+ output=`diff tmp.html "$file"Expected 2>&1`
+ if [ ${#output} -eq 0 ]
+ then
+ echo " OK"
+ else
+ echo " Test failed: $output"
+ failed=`expr $failed + 1`
+ fi
+
+done
+
+rm tmp.trace
+rm tmp.html
+
+if [ $failed -gt 0 ]
+then
+ echo "$failed test(s) failed"
+else
+ echo "All tests passed successfully"
+fi
diff --git a/tools/dmtracedump/tests/filters/testFilters b/tools/dmtracedump/tests/filters/testFilters
new file mode 100644
index 0000000..2c3edb6
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testFilters
@@ -0,0 +1,9 @@
+*FirstFilter
++A.m(),B.m()
++C.m()
++R.m(),S.m()
+*SecondFilter
++D.m(),E.m()
++F.m()
+*RepeatedFilter
++R.m(),S.m()
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeys
new file mode 100644
index 0000000..b4367c6
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeys
@@ -0,0 +1,19 @@
+# ____ ____ _________
+# __|A |___________|B |_____|Z |_______
+#
+# ___________ ____ ____
+# _______|Z |_____|D |_________|E |__
+#
+#
+0 1 A
+2 1 A
+0 2 Z
+4 2 Z
+2 1 B
+4 1 B
+4 2 D
+6 2 D
+4 1 Z
+8 1 Z
+6 2 E
+8 2 E
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeysExpected
new file mode 100644
index 0000000..7fa789a
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> D.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> E.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 D.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 E.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 D.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 E.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 0.00 50.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 50.00 main
+ 0 0.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 0 0.00 50.00 main
+ 8 100.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 D</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 E</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> D.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> E.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeysTrace
new file mode 100644
index 0000000..8bc74ff
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeys
new file mode 100644
index 0000000..76cdea7
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeys
@@ -0,0 +1,19 @@
+# ____ ____ _________
+# __|R |___________|S |_____|Z |_______
+#
+# ___________ ____ ____
+# _______|Z |_____|R |_________|S |__
+#
+#
+0 1 R
+2 1 R
+0 2 Z
+4 2 Z
+2 1 S
+4 1 S
+4 2 R
+6 2 R
+4 1 Z
+8 1 Z
+6 2 S
+8 2 S
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeysExpected
new file mode 100644
index 0000000..5672826
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeysExpected
@@ -0,0 +1,210 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> R.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 R.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 R.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 S.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 50.00 1 main
+ 8 50.00 100.00 50.00 0.00 50.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 16 (100.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 50.00 50.00 main
+ 8 50.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 16 (100.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 50.00 50.00 main
+ 8 50.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 R</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 S</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeysTrace
new file mode 100644
index 0000000..9ec7378
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadDiffFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeys
new file mode 100644
index 0000000..d1bcdd3
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeys
@@ -0,0 +1,19 @@
+# ____ ____ _________
+# __|A |___________|B |_____|Z |_______
+#
+# ___________ ____ ____
+# _______|Z |_____|R |_________|S |__
+#
+#
+0 1 A
+2 1 A
+0 2 Z
+4 2 Z
+2 1 B
+4 1 B
+4 2 R
+6 2 R
+4 1 Z
+8 1 Z
+6 2 S
+8 2 S
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeysExpected
new file mode 100644
index 0000000..ef56af5
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> R.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 R.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 R.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 S.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 50.00 0.00 50.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 16 (100.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 50.00 50.00 main
+ 8 50.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 0 0.00 50.00 main
+ 8 100.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 R</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 S</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeysTrace
new file mode 100644
index 0000000..0559a6a
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeys
new file mode 100644
index 0000000..2bb68d7
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeys
@@ -0,0 +1,19 @@
+# ____ ____ _________
+# __|A |___________|B |_____|Z |_______
+#
+# ___________ ____ ____
+# _______|Z |_____|A |_________|B |__
+#
+#
+0 1 A
+2 1 A
+0 2 Z
+4 2 Z
+2 1 B
+4 1 B
+4 2 A
+6 2 A
+4 1 Z
+8 1 Z
+6 2 B
+8 2 B
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeysExpected
new file mode 100644
index 0000000..50b2b98
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeysExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> A.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 A.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 A.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 B.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 50.00 0.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 16 (100.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 50.00 50.00 main
+ 8 50.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeysTrace
new file mode 100644
index 0000000..f113fcf
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointCrossThreadSameFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeys
new file mode 100644
index 0000000..e7456c1
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeys
@@ -0,0 +1,17 @@
+# ____ ____ ____ ________ ____ ____ ____
+# __|A ||Z ||B ||Z ||D ||Z ||E |__
+#
+0 1 A
+2 1 A
+2 1 Z
+4 1 Z
+4 1 B
+6 1 B
+6 1 Z
+10 1 Z
+10 1 D
+12 1 D
+12 1 Z
+14 1 Z
+14 1 E
+16 1 E
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeysExpected
new file mode 100644
index 0000000..9349375
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> D.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> E.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 3/3 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 D.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 E.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 3/3 8 (toplevel)
+[1] 50.0% 3+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 D.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 E.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 16 100.00 100.00 37.50 37.50 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 37.50% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 6 ( 37.50% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 3+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 3+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 D</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 E</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 7+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 3+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> D.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> E.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeysTrace
new file mode 100644
index 0000000..09983ba
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeys
new file mode 100644
index 0000000..b51f81e
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeys
@@ -0,0 +1,17 @@
+# ____ ____ ____ ________ ____ ____ ____
+# __|R ||Z ||S ||Z ||R ||Z ||S |__
+#
+0 1 R
+2 1 R
+2 1 Z
+4 1 Z
+4 1 S
+6 1 S
+6 1 Z
+10 1 Z
+10 1 R
+12 1 R
+12 1 Z
+14 1 Z
+14 1 S
+16 1 S
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeysExpected
new file mode 100644
index 0000000..41f9625
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeysExpected
@@ -0,0 +1,210 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> R.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 3/3 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 R.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 3/3 8 (toplevel)
+[1] 50.0% 3+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 R.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 S.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 16 100.00 100.00 75.00 0.00 75.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 3+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 3+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 R</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 S</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 7+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 3+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeysTrace
new file mode 100644
index 0000000..2cccf07
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadDiffFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeys
new file mode 100644
index 0000000..d4e41a4
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeys
@@ -0,0 +1,16 @@
+# ____
+# ____ ____ ____ ________ ____|Z |____
+# __|A ||Z ||B ||Z ||C |__
+#
+0 1 A
+2 1 A
+2 1 Z
+4 1 Z
+4 1 B
+6 1 B
+6 1 Z
+10 1 Z
+10 1 C
+12 1 Z
+14 1 Z
+16 1 C
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeysExpected
new file mode 100644
index 0000000..d81cccc
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeysExpected
@@ -0,0 +1,216 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> C.m ()
+ 2 12.50 87.50 <a href="#m3">[3]</a> A.m ()
+ 2 12.50 100.00 <a href="#m4">[4]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 37.5% <a href="#m2">[2]</a> 1/1 6 C.m ()
+ 37.5% <a href="#m1">[1]</a> 2/3 6 Z.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 75.0% <a href="#m0">[0]</a> 2/3 6 (toplevel)
+ 25.0% <a href="#m2">[2]</a> 1/3 2 C.m ()
+[1] 50.0% 3+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 6 (toplevel)
+[2] 37.5% 1+0 6 C.m ()
+ 66.7% excl 4
+ 33.3% <a href="#m1">[1]</a> 1/3 2 Z.m ()
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 16 100.00 100.00 75.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 3+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 3+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 1+0 C</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 6 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 87.5 1+0 A</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 100.0 1+0 B</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 3+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 6 25.0 75.0 1+0 <a href="#m2">[2]</a> C.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m3">[3]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m4">[4]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeysTrace
new file mode 100644
index 0000000..3f61656
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeys
new file mode 100644
index 0000000..0b3377d
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeys
@@ -0,0 +1,17 @@
+# ____ ____ ____ ________ ____ ____ ____
+# __|A ||Z ||B ||Z ||A ||Z ||B |__
+#
+0 1 A
+2 1 A
+2 1 Z
+4 1 Z
+4 1 B
+6 1 B
+6 1 Z
+10 1 Z
+10 1 A
+12 1 A
+12 1 Z
+14 1 Z
+14 1 B
+16 1 B
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeysExpected
new file mode 100644
index 0000000..aa476b3
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeysExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> A.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 3/3 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 A.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 3/3 8 (toplevel)
+[1] 50.0% 3+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 A.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 B.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 16 100.00 100.00 75.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 3+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 3+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 7+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 3+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeysTrace
new file mode 100644
index 0000000..c6ddbe5
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingDisjointSingleThreadSameFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeys
new file mode 100644
index 0000000..d87ac81
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeys
@@ -0,0 +1,19 @@
+# ____ ____ ________
+# __|A |_____________________|B ||Z |__
+#
+# ____ ________ ____
+# _______|D ||Z ||E |______________
+#
+#
+0 1 A
+2 1 A
+0 2 D
+2 2 D
+2 2 Z
+6 2 Z
+6 2 E
+8 2 E
+2 1 B
+4 1 B
+4 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeysExpected
new file mode 100644
index 0000000..a97f25c
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> D.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> E.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 D.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 E.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 D.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 E.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 0.00 100.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 33.33 main
+ 0 0.00 66.67 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 0 0.00 0.00 main
+ 8 100.00 100.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 D</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 E</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> D.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> E.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeysTrace
new file mode 100644
index 0000000..832bbfc
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeys
new file mode 100644
index 0000000..82ab142
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeys
@@ -0,0 +1,19 @@
+# ____ ____ ________
+# __|R |_____________________|S ||Z |__
+#
+# ____ ________ ____
+# _______|R ||Z ||S |______________
+#
+#
+0 1 R
+2 1 R
+0 2 R
+2 2 R
+2 2 Z
+6 2 Z
+6 2 S
+8 2 S
+2 1 S
+4 1 S
+4 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeysExpected
new file mode 100644
index 0000000..623478e
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeysExpected
@@ -0,0 +1,210 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> R.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 R.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 R.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 S.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 50.00 1 main
+ 8 50.00 100.00 100.00 0.00 100.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 33.33 main
+ 8 66.67 66.67 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 33.33 main
+ 8 66.67 66.67 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 R</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 S</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeysTrace
new file mode 100644
index 0000000..371f150
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadDiffFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeys
new file mode 100644
index 0000000..511543f
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeys
@@ -0,0 +1,19 @@
+# ____ ____ ________
+# __|A |_____________________|B ||Z |__
+#
+# ____ ________ ____
+# _______|R ||Z ||S |______________
+#
+#
+0 1 A
+2 1 A
+0 2 R
+2 2 R
+2 2 Z
+6 2 Z
+6 2 S
+8 2 S
+2 1 B
+4 1 B
+4 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeysExpected
new file mode 100644
index 0000000..1193f5f
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> R.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 R.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 R.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 S.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 100.00 0.00 100.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 33.33 main
+ 8 66.67 66.67 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 0 0.00 0.00 main
+ 8 100.00 100.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 R</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 S</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeysTrace
new file mode 100644
index 0000000..9f87efc
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeys
new file mode 100644
index 0000000..6714ddd
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeys
@@ -0,0 +1,19 @@
+# ____ ____ ________
+# __|A |_____________________|B ||Z |__
+#
+# ____ ________ ____
+# _______|A ||Z ||B |______________
+#
+#
+0 1 A
+2 1 A
+0 2 A
+2 2 A
+2 2 Z
+6 2 Z
+6 2 B
+8 2 B
+2 1 B
+4 1 B
+4 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeysExpected
new file mode 100644
index 0000000..79c2e63
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeysExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> A.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 A.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 8 (toplevel)
+[1] 50.0% 2+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 A.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 B.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 100.00 0.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 12 100.00 33.33 main
+ 8 66.67 66.67 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 6+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeysTrace
new file mode 100644
index 0000000..74e4c53
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapCrossThreadSameFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeys
new file mode 100644
index 0000000..b92471f
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeys
@@ -0,0 +1,13 @@
+# ____ ____ ____ ____ ____
+# __|A ||D ||E ||B ||Z |__
+#
+0 1 A
+2 1 A
+2 1 D
+4 1 D
+4 1 E
+6 1 E
+6 1 B
+8 1 B
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeysExpected
new file mode 100644
index 0000000..3b2ffc8
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 2 20.00 20.00 <a href="#m1">[1]</a> A.m ()
+ 2 20.00 40.00 <a href="#m2">[2]</a> B.m ()
+ 2 20.00 60.00 <a href="#m3">[3]</a> D.m ()
+ 2 20.00 80.00 <a href="#m4">[4]</a> E.m ()
+ 2 20.00 100.00 <a href="#m5">[5]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 20.0% <a href="#m1">[1]</a> 1/1 2 A.m ()
+ 20.0% <a href="#m2">[2]</a> 1/1 2 B.m ()
+ 20.0% <a href="#m3">[3]</a> 1/1 2 D.m ()
+ 20.0% <a href="#m4">[4]</a> 1/1 2 E.m ()
+ 20.0% <a href="#m5">[5]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[1] 20.0% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 20.0% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 20.0% 1+0 2 D.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 20.0% 1+0 2 E.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 80.00 40.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 4 ( 40.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 4 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 2 20.0 20.0 1+0 A</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 20.0 40.0 1+0 B</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 60.0 1+0 D</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 20.0 80.0 1+0 E</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 5+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 20.0 1+0 <a href="#m1">[1]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 40.0 1+0 <a href="#m2">[2]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 60.0 1+0 <a href="#m3">[3]</a> D.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 80.0 1+0 <a href="#m4">[4]</a> E.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m5">[5]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeysTrace
new file mode 100644
index 0000000..c9c086c
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeys
new file mode 100644
index 0000000..27b2bf8
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeys
@@ -0,0 +1,13 @@
+# ____ ____ ____ ____ ____
+# __|R ||R ||S ||S ||Z |__
+#
+0 1 R
+2 1 R
+2 1 R
+4 1 R
+4 1 S
+6 1 S
+6 1 S
+8 1 S
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeysExpected
new file mode 100644
index 0000000..df55cd4
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeysExpected
@@ -0,0 +1,210 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 40.00 40.00 <a href="#m1">[1]</a> R.m ()
+ 4 40.00 80.00 <a href="#m2">[2]</a> S.m ()
+ 2 20.00 100.00 <a href="#m3">[3]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 40.0% <a href="#m1">[1]</a> 2/2 4 R.m ()
+ 40.0% <a href="#m2">[2]</a> 2/2 4 S.m ()
+ 20.0% <a href="#m3">[3]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[1] 40.0% 2+0 4 R.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 40.0% 2+0 4 S.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 80.00 0.00 80.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 40.0 40.0 2+0 R</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 40.0 80.0 2+0 S</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 5+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 40.0 2+0 <a href="#m1">[1]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 80.0 2+0 <a href="#m2">[2]</a> S.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m3">[3]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeysTrace
new file mode 100644
index 0000000..0afca4d
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadDiffFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeys
new file mode 100644
index 0000000..a494716
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeys
@@ -0,0 +1,11 @@
+# ____ ____ ____ ____
+# __|A ||C ||B ||Z |__
+#
+0 1 A
+2 1 A
+2 1 C
+4 1 C
+4 1 B
+6 1 B
+6 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeysExpected
new file mode 100644
index 0000000..720d05a
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeysExpected
@@ -0,0 +1,214 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 8
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 2 25.00 25.00 <a href="#m1">[1]</a> A.m ()
+ 2 25.00 50.00 <a href="#m2">[2]</a> B.m ()
+ 2 25.00 75.00 <a href="#m3">[3]</a> C.m ()
+ 2 25.00 100.00 <a href="#m4">[4]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 8 (toplevel)
+ 0.0% excl 0
+ 25.0% <a href="#m1">[1]</a> 1/1 2 A.m ()
+ 25.0% <a href="#m2">[2]</a> 1/1 2 B.m ()
+ 25.0% <a href="#m3">[3]</a> 1/1 2 C.m ()
+ 25.0% <a href="#m4">[4]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[1] 25.0% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 25.0% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 25.0% 1+0 2 C.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 25.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 100.00 100.00 75.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 2 25.0 25.0 1+0 A</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 25.0 50.0 1+0 B</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 25.0 75.0 1+0 C</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 25.0 100.0 1+0 Z</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 8 100.0 100.0 4+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 25.0 1+0 <a href="#m1">[1]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 50.0 1+0 <a href="#m2">[2]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 75.0 1+0 <a href="#m3">[3]</a> C.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 100.0 1+0 <a href="#m4">[4]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeysTrace
new file mode 100644
index 0000000..c5f9a3e
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeys
new file mode 100644
index 0000000..bd645af
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeys
@@ -0,0 +1,13 @@
+# ____ ____ ____ ____ ____
+# __|A ||A ||B ||B ||Z |__
+#
+0 1 A
+2 1 A
+2 1 A
+4 1 A
+4 1 B
+6 1 B
+6 1 B
+8 1 B
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeysExpected
new file mode 100644
index 0000000..0e8f300
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeysExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 40.00 40.00 <a href="#m1">[1]</a> A.m ()
+ 4 40.00 80.00 <a href="#m2">[2]</a> B.m ()
+ 2 20.00 100.00 <a href="#m3">[3]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 40.0% <a href="#m1">[1]</a> 2/2 4 A.m ()
+ 40.0% <a href="#m2">[2]</a> 2/2 4 B.m ()
+ 20.0% <a href="#m3">[3]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[1] 40.0% 2+0 4 A.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 40.0% 2+0 4 B.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 80.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 40.0 40.0 2+0 A</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 40.0 80.0 2+0 B</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 5+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 40.0 2+0 <a href="#m1">[1]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 80.0 2+0 <a href="#m2">[2]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m3">[3]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeysTrace
new file mode 100644
index 0000000..65e381a
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingNestedOverlapSingleThreadSameFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPairCrossThread b/tools/dmtracedump/tests/filters/testWaitingPairCrossThread
new file mode 100644
index 0000000..6c93bc6
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPairCrossThread
@@ -0,0 +1,14 @@
+# ____ ____ ____
+# __|A |______|B ||Z |__
+#
+# _____
+# ________|Z |_________________
+#
+0 1 A
+2 1 A
+0 2 Z
+2 2 Z
+2 1 B
+4 1 B
+4 1 Z
+6 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPairCrossThreadExpected b/tools/dmtracedump/tests/filters/testWaitingPairCrossThreadExpected
new file mode 100644
index 0000000..ed45fff
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPairCrossThreadExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 8
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 25.00 75.00 <a href="#m2">[2]</a> A.m ()
+ 2 25.00 100.00 <a href="#m3">[3]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 8 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 4 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 25.0% <a href="#m3">[3]</a> 1/1 2 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[1] 50.0% 2+0 4 Z.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 25.0% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 25.0% 1+0 2 B.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 6 75.00 75.00 66.67 0.00 0.00 1 main
+ 2 25.00 100.00 0.00 0.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 66.67 main
+ 0 0.00 33.33 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 25.0 75.0 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 25.0 100.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 8 100.0 100.0 4+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 75.0 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 100.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPairCrossThreadTrace b/tools/dmtracedump/tests/filters/testWaitingPairCrossThreadTrace
new file mode 100644
index 0000000..4e53dfd
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPairCrossThreadTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPairSingleThread b/tools/dmtracedump/tests/filters/testWaitingPairSingleThread
new file mode 100644
index 0000000..45375ca
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPairSingleThread
@@ -0,0 +1,11 @@
+# ____ ____ ____ ____
+# __|A ||Z ||B ||Z |__
+#
+0 1 A
+2 1 A
+2 1 Z
+4 1 Z
+4 1 B
+6 1 B
+6 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPairSingleThreadExpected b/tools/dmtracedump/tests/filters/testWaitingPairSingleThreadExpected
new file mode 100644
index 0000000..b3e2b3f
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPairSingleThreadExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 8
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 25.00 75.00 <a href="#m2">[2]</a> A.m ()
+ 2 25.00 100.00 <a href="#m3">[3]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 8 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 2/2 4 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 25.0% <a href="#m3">[3]</a> 1/1 2 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[1] 50.0% 2+0 4 Z.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 25.0% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 25.0% 1+0 2 B.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 100.00 100.00 75.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 50.0 50.0 2+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 25.0 75.0 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 25.0 100.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 8 100.0 100.0 4+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 50.0 50.0 2+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 75.0 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 25.0 100.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPairSingleThreadTrace b/tools/dmtracedump/tests/filters/testWaitingPairSingleThreadTrace
new file mode 100644
index 0000000..3f29843
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPairSingleThreadTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeys
new file mode 100644
index 0000000..05995f3
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeys
@@ -0,0 +1,23 @@
+# ____ ____ ____ ____
+# __|A |___________|B ||Z |____|Z |_______
+#
+# ____ ____ ____ ____
+# _______|Z ||D |___________|E |____|Z |__
+#
+#
+0 1 A
+2 1 A
+0 2 Z
+2 2 Z
+2 2 D
+4 2 D
+2 1 B
+4 1 B
+4 1 Z
+6 1 Z
+4 2 E
+6 2 E
+6 1 Z
+8 1 Z
+6 2 Z
+8 2 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeysExpected
new file mode 100644
index 0000000..ba83cee
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> D.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> E.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 4/4 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 D.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 E.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 4/4 8 (toplevel)
+[1] 50.0% 4+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 D.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 E.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 0.00 50.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 50.00 main
+ 0 0.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 0 0.00 50.00 main
+ 8 100.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 4+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 4+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 D</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 E</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 8+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 4+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> D.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> E.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeysTrace
new file mode 100644
index 0000000..30fbe38
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeys
new file mode 100644
index 0000000..f874464
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeys
@@ -0,0 +1,23 @@
+# ____ ____ ____ ____
+# __|R |___________|S ||Z |____|Z |_______
+#
+# ____ ____ ____ ____
+# _______|Z ||R |___________|S |____|Z |__
+#
+#
+0 1 R
+2 1 R
+0 2 Z
+2 2 Z
+2 2 R
+4 2 R
+2 1 S
+4 1 S
+4 1 Z
+6 1 Z
+4 2 S
+6 2 S
+6 1 Z
+8 1 Z
+6 2 Z
+8 2 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeysExpected
new file mode 100644
index 0000000..93c4a05
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeysExpected
@@ -0,0 +1,210 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> R.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 4/4 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 R.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 4/4 8 (toplevel)
+[1] 50.0% 4+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 R.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 S.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 50.00 1 main
+ 8 50.00 100.00 50.00 0.00 50.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 66.67 50.00 main
+ 8 66.67 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 66.67 50.00 main
+ 8 66.67 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 4+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 4+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 R</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 S</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 8+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 4+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeysTrace
new file mode 100644
index 0000000..6dc1826
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadDiffFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeys
new file mode 100644
index 0000000..bdc4373
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeys
@@ -0,0 +1,23 @@
+# ____ ____ ____ ____
+# __|A |___________|B ||Z |____|Z |_______
+#
+# ____ ____ ____ ____
+# _______|Z ||R |___________|S |____|Z |__
+#
+#
+0 1 A
+2 1 A
+0 2 Z
+2 2 Z
+2 2 R
+4 2 R
+2 1 B
+4 1 B
+4 1 Z
+6 1 Z
+4 2 S
+6 2 S
+6 1 Z
+8 1 Z
+6 2 Z
+8 2 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeysExpected
new file mode 100644
index 0000000..b154ed1
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 2 12.50 62.50 <a href="#m2">[2]</a> A.m ()
+ 2 12.50 75.00 <a href="#m3">[3]</a> B.m ()
+ 2 12.50 87.50 <a href="#m4">[4]</a> R.m ()
+ 2 12.50 100.00 <a href="#m5">[5]</a> S.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 4/4 8 Z.m ()
+ 12.5% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 12.5% <a href="#m3">[3]</a> 1/1 2 B.m ()
+ 12.5% <a href="#m4">[4]</a> 1/1 2 R.m ()
+ 12.5% <a href="#m5">[5]</a> 1/1 2 S.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 4/4 8 (toplevel)
+[1] 50.0% 4+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 12.5% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 12.5% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 12.5% 1+0 2 R.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 12.5% 1+0 2 S.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 50.00 0.00 50.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 66.67 50.00 main
+ 8 66.67 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 8 ( 50.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 0 0.00 50.00 main
+ 8 100.00 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 4+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 4+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 12.5 62.5 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 12.5 75.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 12.5 87.5 1+0 R</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 12.5 100.0 1+0 S</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 8+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 4+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 62.5 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 75.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 87.5 1+0 <a href="#m4">[4]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 12.5 100.0 1+0 <a href="#m5">[5]</a> S.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeysTrace
new file mode 100644
index 0000000..efb0b1b
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeys
new file mode 100644
index 0000000..552ae40
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeys
@@ -0,0 +1,23 @@
+# ____ ____ ____ ____
+# __|A |___________|B ||Z |____|Z |_______
+#
+# ____ ____ ____ ____
+# _______|Z ||A |___________|B |____|Z |__
+#
+#
+0 1 A
+2 1 A
+0 2 Z
+2 2 Z
+2 2 A
+4 2 A
+2 1 B
+4 1 B
+4 1 Z
+6 1 Z
+4 2 B
+6 2 B
+6 1 Z
+8 1 Z
+6 2 Z
+8 2 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeysExpected
new file mode 100644
index 0000000..82b0356
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeysExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 16
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 8 50.00 50.00 <a href="#m1">[1]</a> Z.m ()
+ 4 25.00 75.00 <a href="#m2">[2]</a> A.m ()
+ 4 25.00 100.00 <a href="#m3">[3]</a> B.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 16 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 4/4 8 Z.m ()
+ 25.0% <a href="#m2">[2]</a> 2/2 4 A.m ()
+ 25.0% <a href="#m3">[3]</a> 2/2 4 B.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 4/4 8 (toplevel)
+[1] 50.0% 4+0 8 Z.m ()
+ 100.0% excl 8
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 25.0% 2+0 4 A.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[3] 25.0% 2+0 4 B.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 50.00 50.00 50.00 0.00 0.00 1 main
+ 8 50.00 100.00 50.00 0.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 12 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 66.67 50.00 main
+ 8 66.67 50.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 8 50.0 50.0 4+0 Z</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 8 8 100.0 100.0 4+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 25.0 75.0 2+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 4 25.0 100.0 2+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 16 100.0 100.0 8+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 8 8 50.0 50.0 4+0 <a href="#m1">[1]</a> Z.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 75.0 2+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 25.0 100.0 2+0 <a href="#m3">[3]</a> B.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeysTrace
new file mode 100644
index 0000000..497e925
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapCrossThreadSameFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeys
new file mode 100644
index 0000000..edf03c5
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeys
@@ -0,0 +1,13 @@
+# ____ ____ ____ ____ ____
+# __|A ||D ||B ||E ||Z |__
+#
+0 1 A
+2 1 A
+2 1 D
+4 1 D
+4 1 B
+6 1 B
+6 1 E
+8 1 E
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeysExpected
new file mode 100644
index 0000000..2d59720
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeysExpected
@@ -0,0 +1,232 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 2 20.00 20.00 <a href="#m1">[1]</a> A.m ()
+ 2 20.00 40.00 <a href="#m2">[2]</a> B.m ()
+ 2 20.00 60.00 <a href="#m3">[3]</a> D.m ()
+ 2 20.00 80.00 <a href="#m4">[4]</a> E.m ()
+ 2 20.00 100.00 <a href="#m5">[5]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 20.0% <a href="#m1">[1]</a> 1/1 2 A.m ()
+ 20.0% <a href="#m2">[2]</a> 1/1 2 B.m ()
+ 20.0% <a href="#m3">[3]</a> 1/1 2 D.m ()
+ 20.0% <a href="#m4">[4]</a> 1/1 2 E.m ()
+ 20.0% <a href="#m5">[5]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[1] 20.0% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 20.0% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 20.0% 1+0 2 D.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 20.0% 1+0 2 E.m ()
+ 100.0% excl 2
+<a name="m5"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[5] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 60.00 60.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 60.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 6 ( 60.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 2 20.0 20.0 1+0 A</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 20.0 40.0 1+0 B</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 60.0 1+0 D</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 20.0 80.0 1+0 E</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d4')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd4">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d4">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m5">[5]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 5+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 20.0 1+0 <a href="#m1">[1]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 40.0 1+0 <a href="#m2">[2]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 60.0 1+0 <a href="#m3">[3]</a> D.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 80.0 1+0 <a href="#m4">[4]</a> E.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m5">[5]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeysTrace
new file mode 100644
index 0000000..b9afef4
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeys
new file mode 100644
index 0000000..27b2bf8
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeys
@@ -0,0 +1,13 @@
+# ____ ____ ____ ____ ____
+# __|R ||R ||S ||S ||Z |__
+#
+0 1 R
+2 1 R
+2 1 R
+4 1 R
+4 1 S
+6 1 S
+6 1 S
+8 1 S
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeysExpected
new file mode 100644
index 0000000..df55cd4
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeysExpected
@@ -0,0 +1,210 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 40.00 40.00 <a href="#m1">[1]</a> R.m ()
+ 4 40.00 80.00 <a href="#m2">[2]</a> S.m ()
+ 2 20.00 100.00 <a href="#m3">[3]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 40.0% <a href="#m1">[1]</a> 2/2 4 R.m ()
+ 40.0% <a href="#m2">[2]</a> 2/2 4 S.m ()
+ 20.0% <a href="#m3">[3]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[1] 40.0% 2+0 4 R.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 40.0% 2+0 4 S.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 80.00 0.00 80.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 40.0 40.0 2+0 R</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 40.0 80.0 2+0 S</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 5+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 40.0 2+0 <a href="#m1">[1]</a> R.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 80.0 2+0 <a href="#m2">[2]</a> S.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m3">[3]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeysTrace
new file mode 100644
index 0000000..a52929a
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadDiffFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeys
new file mode 100644
index 0000000..c53c90d
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeys
@@ -0,0 +1,12 @@
+# ____
+# ____ ____|B |____ ____
+# __|A ||C ||Z |__
+#
+0 1 A
+2 1 A
+2 1 C
+4 1 B
+6 1 B
+8 1 C
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeysExpected
new file mode 100644
index 0000000..18ce892
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeysExpected
@@ -0,0 +1,214 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 40.00 40.00 <a href="#m1">[1]</a> C.m ()
+ 2 20.00 60.00 <a href="#m2">[2]</a> A.m ()
+ 2 20.00 80.00 <a href="#m3">[3]</a> B.m ()
+ 2 20.00 100.00 <a href="#m4">[4]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 60.0% <a href="#m1">[1]</a> 1/1 6 C.m ()
+ 20.0% <a href="#m2">[2]</a> 1/1 2 A.m ()
+ 20.0% <a href="#m4">[4]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 6 (toplevel)
+[1] 60.0% 1+0 6 C.m ()
+ 66.7% excl 4
+ 33.3% <a href="#m3">[3]</a> 1/1 2 B.m ()
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[2] 20.0% 1+0 2 A.m ()
+ 100.0% excl 2
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m1">[1]</a> 1/1 2 C.m ()
+[3] 20.0% 1+0 2 B.m ()
+ 100.0% excl 2
+<a name="m4"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[4] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 80.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 40.0 40.0 1+0 C</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 6 100.0 100.0 1+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 2 20.0 60.0 1+0 A</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 80.0 1+0 B</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d3')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd3">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d3">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m4">[4]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 4+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 6 40.0 40.0 1+0 <a href="#m1">[1]</a> C.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 60.0 1+0 <a href="#m2">[2]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 80.0 1+0 <a href="#m3">[3]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m4">[4]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeysTrace
new file mode 100644
index 0000000..23f4187
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterDiffKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeys b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeys
new file mode 100644
index 0000000..bd645af
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeys
@@ -0,0 +1,13 @@
+# ____ ____ ____ ____ ____
+# __|A ||A ||B ||B ||Z |__
+#
+0 1 A
+2 1 A
+2 1 A
+4 1 A
+4 1 B
+6 1 B
+6 1 B
+8 1 B
+8 1 Z
+10 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeysExpected b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeysExpected
new file mode 100644
index 0000000..0e8f300
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeysExpected
@@ -0,0 +1,203 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 10
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 40.00 40.00 <a href="#m1">[1]</a> A.m ()
+ 4 40.00 80.00 <a href="#m2">[2]</a> B.m ()
+ 2 20.00 100.00 <a href="#m3">[3]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 10 (toplevel)
+ 0.0% excl 0
+ 40.0% <a href="#m1">[1]</a> 2/2 4 A.m ()
+ 40.0% <a href="#m2">[2]</a> 2/2 4 B.m ()
+ 20.0% <a href="#m3">[3]</a> 1/1 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[1] 40.0% 2+0 4 A.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 40.0% 2+0 4 B.m ()
+ 100.0% excl 4
+<a name="m3"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 2 (toplevel)
+[3] 20.0% 1+0 2 Z.m ()
+ 100.0% excl 2
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 10 100.00 100.00 80.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 8 ( 80.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 8 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 40.0 40.0 2+0 A</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 40.0 80.0 2+0 B</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d2')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd2">+</span> 2 20.0 100.0 1+0 Z</div>
+<div class="parent" id="d2">
+<div class="leaf"><span class="leaf"> </span> 2 2 100.0 100.0 1+0 <a href="#m3">[3]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 10 100.0 100.0 5+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 40.0 2+0 <a href="#m1">[1]</a> A.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 40.0 80.0 2+0 <a href="#m2">[2]</a> B.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 2 2 20.0 100.0 1+0 <a href="#m3">[3]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeysTrace b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeysTrace
new file mode 100644
index 0000000..01e95cd
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingPartialOverlapSingleThreadSameFilterSameKeysTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingSoloCrossThread b/tools/dmtracedump/tests/filters/testWaitingSoloCrossThread
new file mode 100644
index 0000000..c9dbd1a
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingSoloCrossThread
@@ -0,0 +1,12 @@
+# ____ ____ ____
+# __|C ||Z |__
+#
+# ____
+# ________|Z |_____________
+#
+0 1 C
+0 2 Z
+2 2 Z
+4 1 C
+4 1 Z
+6 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingSoloCrossThreadExpected b/tools/dmtracedump/tests/filters/testWaitingSoloCrossThreadExpected
new file mode 100644
index 0000000..409b17e
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingSoloCrossThreadExpected
@@ -0,0 +1,192 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 8
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 50.00 50.00 <a href="#m1">[1]</a> C.m ()
+ 4 50.00 100.00 <a href="#m2">[2]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 8 (toplevel)
+ 0.0% excl 0
+ 50.0% <a href="#m1">[1]</a> 1/1 4 C.m ()
+ 50.0% <a href="#m2">[2]</a> 2/2 4 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 4 (toplevel)
+[1] 50.0% 1+0 4 C.m ()
+ 100.0% excl 4
+<a name="m2"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 2/2 4 (toplevel)
+[2] 50.0% 2+0 4 Z.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 6 75.00 75.00 66.67 0.00 0.00 1 main
+ 2 25.00 100.00 0.00 0.00 0.00 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 66.67 main
+ 0 0.00 33.33 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 50.0 50.0 1+0 C</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 1+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 50.0 100.0 2+0 Z</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 8 100.0 100.0 3+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 4 50.0 50.0 1+0 <a href="#m1">[1]</a> C.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 50.0 100.0 2+0 <a href="#m2">[2]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingSoloCrossThreadTrace b/tools/dmtracedump/tests/filters/testWaitingSoloCrossThreadTrace
new file mode 100644
index 0000000..e73f040
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingSoloCrossThreadTrace
Binary files differ
diff --git a/tools/dmtracedump/tests/filters/testWaitingSoloSingleThread b/tools/dmtracedump/tests/filters/testWaitingSoloSingleThread
new file mode 100644
index 0000000..3f0753e
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingSoloSingleThread
@@ -0,0 +1,10 @@
+# _____
+# ____|Z |____ ____
+# __|C ||Z |__
+#
+0 1 C
+2 1 Z
+4 1 Z
+6 1 C
+6 1 Z
+8 1 Z
diff --git a/tools/dmtracedump/tests/filters/testWaitingSoloSingleThreadExpected b/tools/dmtracedump/tests/filters/testWaitingSoloSingleThreadExpected
new file mode 100644
index 0000000..8d22b63
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingSoloSingleThreadExpected
@@ -0,0 +1,194 @@
+<html>
+<head>
+<script type="text/javascript" src="(null)sortable.js"></script>
+<script langugage="javascript">
+function toggle(item) {
+ obj=document.getElementById(item);
+ visible=(obj.style.display!="none" && obj.style.display!="");
+ key=document.getElementById("x" + item);
+ if (visible) {
+ obj.style.display="none";
+ key.innerHTML="+";
+ } else {
+ obj.style.display="block";
+ key.innerHTML="-";
+ }
+}
+function onMouseOver(obj) {
+ obj.style.background="lightblue";
+}
+function onMouseOut(obj) {
+ obj.style.background="white";
+}
+</script>
+<style type="text/css">
+div { font-family: courier; font-size: 13 }
+div.parent { margin-left: 15; display: none }
+div.leaf { margin-left: 10 }
+div.header { margin-left: 10 }
+div.link { margin-left: 10; cursor: move }
+span.parent { padding-right: 10; }
+span.leaf { padding-right: 10; }
+a img { border: 0;}
+table.sortable th { border-width: 0px 1px 1px 1px; background-color: #ccc;}
+a { text-decoration: none; }
+a:hover { text-decoration: underline; }
+table.sortable th, table.sortable td { text-align: left;}table.sortable tr.odd td { background-color: #ddd; }
+table.sortable tr.even td { background-color: #fff; }
+</style>
+</head><body>
+
+<a name="contents"></a>
+<h2>Table of Contents</h2>
+<ul>
+ <li><a href="#exclusive">Exclusive profile</a></li>
+ <li><a href="#inclusive">Inclusive profile</a></li>
+ <li><a href="#thread">Thread profile</a></li>
+ <li><a href="#class">Class/method profile</a></li>
+ <li><a href="#method">Method/class profile</a></li>
+</ul>
+
+<a name="exclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+Total cycles: 8
+
+<br><br>
+Exclusive elapsed times for each method, not including time spent in
+children, sorted by exclusive time.
+
+<br><br>
+<pre>
+ Usecs self % sum % Method
+ 4 50.00 50.00 <a href="#m1">[1]</a> C.m ()
+ 4 50.00 100.00 <a href="#m2">[2]</a> Z.m ()
+</pre>
+<a name="inclusive"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Inclusive elapsed times for each method and its parents and children,
+sorted by inclusive time.
+
+<br><br>
+<pre>
+index %/total %/self index calls usecs name
+<a name="m0"></a>----------------------------------------------------
+[0] 100.0% 0+0 8 (toplevel)
+ 0.0% excl 0
+ 75.0% <a href="#m1">[1]</a> 1/1 6 C.m ()
+ 25.0% <a href="#m2">[2]</a> 1/2 2 Z.m ()
+<a name="m1"></a>----------------------------------------------------
+ 100.0% <a href="#m0">[0]</a> 1/1 6 (toplevel)
+[1] 75.0% 1+0 6 C.m ()
+ 66.7% excl 4
+ 33.3% <a href="#m2">[2]</a> 1/2 2 Z.m ()
+<a name="m2"></a>----------------------------------------------------
+ 50.0% <a href="#m0">[0]</a> 1/2 2 (toplevel)
+ 50.0% <a href="#m1">[1]</a> 1/2 2 C.m ()
+[2] 50.0% 2+0 4 Z.m ()
+ 100.0% excl 4
+</pre>
+<a name="thread"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Elapsed times for each thread, sorted by elapsed time.
+Also includes percentage of time spent during the <i>execution</i> of any filters.
+
+<br><br>
+<pre>
+ Usecs self % sum % FirstFilter % SecondFilter % RepeatedFilter % tid ThreadName
+ 8 100.00 100.00 75.00 0.00 0.00 1 main
+ 0 0.00 100.00 nan nan nan 2 foo
+ 0 0.00 100.00 nan nan nan 3 bar
+ 0 0.00 100.00 nan nan nan 4 blah
+</pre><br />
+
+Break-down of portion of time spent by each thread while waiting on a filter method.
+<br/><br/>
+<pre>
+Filter: FirstFilter
+Total waiting cycles: 6 ( 75.00% of total)
+Details:
+
+ Waiting cycles % of total waiting time execution time while waiting thread name
+ 6 100.00 100.00 main
+ 0 0.00 0.00 foo
+ 0 0.00 0.00 bar
+ 0 0.00 0.00 blah
+</pre>
+<br/><br/>
+<pre>
+Filter: SecondFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<br/><br/>
+<pre>
+Filter: RepeatedFilter
+Total waiting cycles: 0 ( 0.00% of total)
+</pre>
+<a name="class"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each class, summed over all the methods
+in the class.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Class</div>
+<div class="link" onClick="javascript:toggle('d0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd0">+</span> 4 50.0 50.0 1+0 C</div>
+<div class="parent" id="d0">
+<div class="leaf"><span class="leaf"> </span> 4 6 100.0 100.0 1+0 <a href="#m1">[1]</a> m ()</div>
+</div>
+<div class="link" onClick="javascript:toggle('d1')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xd1">+</span> 4 50.0 100.0 2+0 Z</div>
+<div class="parent" id="d1">
+<div class="leaf"><span class="leaf"> </span> 4 4 100.0 100.0 2+0 <a href="#m2">[2]</a> m ()</div>
+</div>
+<a name="method"></a>
+<hr>
+<a href="#contents">[Top]</a>
+<a href="#exclusive">[Exclusive]</a>
+<a href="#inclusive">[Inclusive]</a>
+<a href="#thread">[Thread]</a>
+<a href="#class">[Class]</a>
+<a href="#method">[Method]</a>
+<br><br>
+
+Exclusive elapsed time for each method, summed over all the classes
+that contain a method with the same name.
+
+<br><br>
+<div class="header"><span class="parent"> </span> Cycles %/total Cumul.% Calls+Recur Method</div>
+<div class="link" onClick="javascript:toggle('e0')" onMouseOver="javascript:onMouseOver(this)" onMouseOut="javascript:onMouseOut(this)"><span class="parent" id="xe0">+</span> 8 100.0 100.0 3+0 m</div>
+<div class="parent" id="e0">
+<div class="leaf"><span class="leaf"> </span> 4 6 50.0 50.0 1+0 <a href="#m1">[1]</a> C.m ()</div>
+<div class="leaf"><span class="leaf"> </span> 4 4 50.0 100.0 2+0 <a href="#m2">[2]</a> Z.m ()</div>
+</div>
+
+</body>
+</html>
diff --git a/tools/dmtracedump/tests/filters/testWaitingSoloSingleThreadTrace b/tools/dmtracedump/tests/filters/testWaitingSoloSingleThreadTrace
new file mode 100644
index 0000000..3a43c46
--- /dev/null
+++ b/tools/dmtracedump/tests/filters/testWaitingSoloSingleThreadTrace
Binary files differ
