X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=gui%2Ftraceloader.cpp;h=2ad32b1fb4d73523dc4219650ee5ac6cd93a85d6;hb=3801952b80cd7a7160f6410518f6e3740d461b60;hp=0fee815ff6a811bbac9a58e9099453de6aa71fa5;hpb=ae2b4d32ed56e3ac193cc7205aeb58082c448ce8;p=apitrace diff --git a/gui/traceloader.cpp b/gui/traceloader.cpp index 0fee815..2ad32b1 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) { } @@ -38,6 +37,16 @@ void TraceLoader::loadTrace(const QString &filename) loadHelpFile(); } + if (!m_frameBookmarks.isEmpty()) { + qDeleteAll(m_signatures); + qDeleteAll(m_enumSignatures); + m_signatures.clear(); + m_enumSignatures.clear(); + m_frameBookmarks.clear(); + m_createdFrames.clear(); + m_parser.close(); + } + if (!m_parser.open(filename.toLatin1())) { qDebug() << "error: failed to open " << filename; return; @@ -51,7 +60,7 @@ void TraceLoader::loadTrace(const QString &filename) //Load the entire file into memory parseTrace(); } - + emit guessedApi(static_cast(m_parser.api)); emit finishedParsing(); } @@ -60,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(); @@ -95,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 = @@ -127,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; @@ -138,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; @@ -163,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; @@ -192,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) { @@ -208,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(); @@ -274,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; } } @@ -303,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]; @@ -328,7 +307,7 @@ void TraceLoader::searchPrev(int startFrame, if (numCallsToParse == 0) { bool foundCall = searchCallsBackwards(frameCalls, frameIdx, - str, sensitivity); + request); qDeleteAll(frameCalls); frameCalls.clear(); @@ -347,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; } } @@ -377,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; @@ -390,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); @@ -424,7 +404,7 @@ 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 = @@ -443,7 +423,7 @@ TraceLoader::fetchFrameContents(ApiTraceFrame *currentFrame) delete call; - if (ApiTrace::isCallAFrameMarker(apiCall, m_frameMarker)) { + if (apiCall->flags() & trace::CALL_FLAG_END_FRAME) { break; } @@ -493,4 +473,13 @@ void TraceLoader::findCallIndex(int index) emit foundCallIndex(call); } +void TraceLoader::search(const ApiTrace::SearchRequest &request) +{ + if (request.direction == ApiTrace::SearchRequest::Next) { + searchNext(request); + } else { + searchPrev(request); + } +} + #include "traceloader.moc"