X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Ftraceloader.cpp;h=6110c5972d6416752bc82a1c0472812625907549;hb=caa8428eb4c4292d3ea53405d4dc9c3c3f21f10a;hp=cf9b37bb4f9485d292f854469e9daf3aa6733886;hpb=daf82af9d5f270c87434cc1142f32a6407703781;p=apitrace diff --git a/gui/traceloader.cpp b/gui/traceloader.cpp index cf9b37b..6110c59 100644 --- a/gui/traceloader.cpp +++ b/gui/traceloader.cpp @@ -7,7 +7,7 @@ #define FRAMES_TO_CACHE 100 static ApiTraceCall * -apiCallFromTraceCall(const Trace::Call *call, +apiCallFromTraceCall(const trace::Call *call, const QHash &helpHash, ApiTraceFrame *frame, TraceLoader *loader) @@ -20,8 +20,7 @@ apiCallFromTraceCall(const Trace::Call *call, } TraceLoader::TraceLoader(QObject *parent) - : QObject(parent), - m_frameMarker(ApiTrace::FrameMarker_SwapBuffers) + : QObject(parent) { } @@ -61,6 +60,7 @@ void TraceLoader::loadTrace(const QString &filename) //Load the entire file into memory parseTrace(); } + emit guessedApi(static_cast(m_parser.api)); emit finishedParsing(); } @@ -69,34 +69,6 @@ void TraceLoader::loadFrame(ApiTraceFrame *currentFrame) fetchFrameContents(currentFrame); } -void TraceLoader::setFrameMarker(ApiTrace::FrameMarker marker) -{ - m_frameMarker = marker; -} - -bool TraceLoader::isCallAFrameMarker(const Trace::Call *call) const -{ - std::string name = call->name(); - - switch (m_frameMarker) { - case ApiTrace::FrameMarker_SwapBuffers: - return name.find("SwapBuffers") != std::string::npos || - name == "CGLFlushDrawable" || - name == "glFrameTerminatorGREMEDY"; - break; - case ApiTrace::FrameMarker_Flush: - return name == "glFlush"; - break; - case ApiTrace::FrameMarker_Finish: - return name == "glFinish"; - break; - case ApiTrace::FrameMarker_Clear: - return name == "glClear"; - break; - } - return false; -} - int TraceLoader::numberOfFrames() const { return m_frameBookmarks.size(); @@ -104,7 +76,7 @@ int TraceLoader::numberOfFrames() const int TraceLoader::numberOfCallsInFrame(int frameIdx) const { - if (frameIdx > m_frameBookmarks.size()) { + if (frameIdx >= m_frameBookmarks.size()) { return 0; } FrameBookmarks::const_iterator itr = @@ -136,8 +108,8 @@ void TraceLoader::scanTrace() QList frames; ApiTraceFrame *currentFrame = 0; - Trace::Call *call; - Trace::ParseBookmark startBookmark; + trace::Call *call; + trace::ParseBookmark startBookmark; int numOfFrames = 0; int numOfCalls = 0; int lastPercentReport = 0; @@ -147,7 +119,7 @@ void TraceLoader::scanTrace() while ((call = m_parser.scan_call())) { ++numOfCalls; - if (isCallAFrameMarker(call)) { + if (call->flags & trace::CALL_FLAG_END_FRAME) { FrameBookmark frameBookmark(startBookmark); frameBookmark.numberOfCalls = numOfCalls; @@ -172,7 +144,7 @@ void TraceLoader::scanTrace() } if (numOfCalls) { - //Trace::File::Bookmark endBookmark = m_parser.currentBookmark(); + //trace::File::Bookmark endBookmark = m_parser.currentBookmark(); FrameBookmark frameBookmark(startBookmark); frameBookmark.numberOfCalls = numOfCalls; @@ -201,7 +173,7 @@ void TraceLoader::parseTrace() int lastPercentReport = 0; - Trace::Call *call = m_parser.parse_call(); + trace::Call *call = m_parser.parse_call(); while (call) { //std::cout << *call; if (!currentFrame) { @@ -217,8 +189,7 @@ void TraceLoader::parseTrace() apiCall->arguments()[apiCall->binaryDataIndex()].toByteArray(); binaryDataSize += data.size(); } - if (ApiTrace::isCallAFrameMarker(apiCall, - m_frameMarker)) { + if (call->flags & trace::CALL_FLAG_END_FRAME) { calls.squeeze(); currentFrame->setCalls(calls, binaryDataSize); calls.clear(); @@ -283,25 +254,25 @@ void TraceLoader::addEnumSignature(unsigned id, ApiTraceEnumSignature *signature m_enumSignatures[id] = signature; } -void TraceLoader::searchNext(int startFrame, - const QString &str, - Qt::CaseSensitivity sensitivity) +void TraceLoader::searchNext(const ApiTrace::SearchRequest &request) { Q_ASSERT(m_parser.supportsOffsets()); if (m_parser.supportsOffsets()) { + int startFrame = m_createdFrames.indexOf(request.frame); const FrameBookmark &frameBookmark = m_frameBookmarks[startFrame]; m_parser.setBookmark(frameBookmark.start); - Trace::Call *call = 0; + trace::Call *call = 0; while ((call = m_parser.parse_call())) { - if (callContains(call, str, sensitivity)) { + if (callContains(call, request.text, request.cs)) { unsigned frameIdx = callInFrame(call->no); ApiTraceFrame *frame = m_createdFrames[frameIdx]; const QVector calls = fetchFrameContents(frame); for (int i = 0; i < calls.count(); ++i) { if (calls[i]->index() == call->no) { - emit searchResult(ApiTrace::SearchResult_Found, calls[i]); + emit searchResult(request, ApiTrace::SearchResult_Found, + calls[i]); break; } } @@ -312,17 +283,16 @@ void TraceLoader::searchNext(int startFrame, delete call; } } - emit searchResult(ApiTrace::SearchResult_NotFound, 0); + emit searchResult(request, ApiTrace::SearchResult_NotFound, 0); } -void TraceLoader::searchPrev(int startFrame, - const QString &str, - Qt::CaseSensitivity sensitivity) +void TraceLoader::searchPrev(const ApiTrace::SearchRequest &request) { Q_ASSERT(m_parser.supportsOffsets()); if (m_parser.supportsOffsets()) { - Trace::Call *call = 0; - QList frameCalls; + int startFrame = m_createdFrames.indexOf(request.frame); + trace::Call *call = 0; + QList frameCalls; int frameIdx = startFrame; const FrameBookmark &frameBookmark = m_frameBookmarks[frameIdx]; @@ -337,7 +307,7 @@ void TraceLoader::searchPrev(int startFrame, if (numCallsToParse == 0) { bool foundCall = searchCallsBackwards(frameCalls, frameIdx, - str, sensitivity); + request); qDeleteAll(frameCalls); frameCalls.clear(); @@ -356,23 +326,24 @@ void TraceLoader::searchPrev(int startFrame, } } } - emit searchResult(ApiTrace::SearchResult_NotFound, 0); + emit searchResult(request, ApiTrace::SearchResult_NotFound, 0); } -bool TraceLoader::searchCallsBackwards(const QList &calls, +bool TraceLoader::searchCallsBackwards(const QList &calls, int frameIdx, - const QString &str, - Qt::CaseSensitivity sensitivity) + const ApiTrace::SearchRequest &request) { for (int i = calls.count() - 1; i >= 0; --i) { - Trace::Call *call = calls[i]; - if (callContains(call, str, sensitivity)) { + trace::Call *call = calls[i]; + if (callContains(call, request.text, request.cs)) { ApiTraceFrame *frame = m_createdFrames[frameIdx]; const QVector apiCalls = fetchFrameContents(frame); for (int i = 0; i < apiCalls.count(); ++i) { if (apiCalls[i]->index() == call->no) { - emit searchResult(ApiTrace::SearchResult_Found, apiCalls[i]); + emit searchResult(request, + ApiTrace::SearchResult_Found, + apiCalls[i]); break; } } @@ -386,7 +357,7 @@ int TraceLoader::callInFrame(int callIdx) const { unsigned numCalls = 0; - for (int frameIdx = 0; frameIdx <= m_frameBookmarks.size(); ++frameIdx) { + for (int frameIdx = 0; frameIdx < m_frameBookmarks.size(); ++frameIdx) { const FrameBookmark &frameBookmark = m_frameBookmarks[frameIdx]; unsigned firstCall = numCalls; unsigned endCall = numCalls + frameBookmark.numberOfCalls; @@ -399,12 +370,12 @@ int TraceLoader::callInFrame(int callIdx) const return 0; } -bool TraceLoader::callContains(Trace::Call *call, +bool TraceLoader::callContains(trace::Call *call, const QString &str, Qt::CaseSensitivity sensitivity) { /* - * FIXME: do string comparison directly on Trace::Call + * FIXME: do string comparison directly on trace::Call */ ApiTraceCall *apiCall = apiCallFromTraceCall(call, m_helpHash, 0, this); @@ -433,14 +404,15 @@ TraceLoader::fetchFrameContents(ApiTraceFrame *currentFrame) m_parser.setBookmark(frameBookmark.start); - Trace::Call *call; + trace::Call *call; int parsedCalls = 0; while ((call = m_parser.parse_call())) { ApiTraceCall *apiCall = apiCallFromTraceCall(call, m_helpHash, currentFrame, this); - calls[parsedCalls] = apiCall; - Q_ASSERT(calls[parsedCalls]); + Q_ASSERT(apiCall); + Q_ASSERT(parsedCalls < calls.size()); + calls[parsedCalls++] = apiCall; if (apiCall->hasBinaryData()) { QByteArray data = apiCall->arguments()[ @@ -448,20 +420,21 @@ TraceLoader::fetchFrameContents(ApiTraceFrame *currentFrame) binaryDataSize += data.size(); } - ++parsedCalls; - delete call; - if (ApiTrace::isCallAFrameMarker(apiCall, m_frameMarker)) { + if (apiCall->flags() & trace::CALL_FLAG_END_FRAME) { break; } } - assert(parsedCalls == numOfCalls); - Q_ASSERT(parsedCalls == calls.size()); + // There can be fewer parsed calls when call in different + // threads cross the frame boundary + Q_ASSERT(parsedCalls <= numOfCalls); + Q_ASSERT(parsedCalls <= calls.size()); + calls.resize(parsedCalls); calls.squeeze(); - Q_ASSERT(parsedCalls == currentFrame->numChildrenToLoad()); + Q_ASSERT(parsedCalls <= currentFrame->numChildrenToLoad()); emit frameContentsLoaded(currentFrame, calls, binaryDataSize); return calls; @@ -498,8 +471,18 @@ void TraceLoader::findCallIndex(int index) call = *itr; } } - Q_ASSERT(call); - emit foundCallIndex(call); + if (call) { + emit foundCallIndex(call); + } +} + +void TraceLoader::search(const ApiTrace::SearchRequest &request) +{ + if (request.direction == ApiTrace::SearchRequest::Next) { + searchNext(request); + } else { + searchPrev(request); + } } #include "traceloader.moc"