Merge "Fix leak of FILE* in dumping" (f559685b) · Commits · e / os / android_frameworks_base

libs/hwui/FrameInfoVisualizer.cpp

+2 −5

Original line number	Diff line number	Diff line
		@@ -245,22 +245,19 @@ void FrameInfoVisualizer::dumpData(int fd) {
		// last call to dumpData(). In other words if there's a dumpData(), draw frame,
		// dumpData(), the last dumpData() should only log 1 frame.

		FILE* file = fdopen(fd, "a");
		fprintf(file, "\n\tDraw\tPrepare\tProcess\tExecute\n");
		dprintf(fd, "\n\tDraw\tPrepare\tProcess\tExecute\n");

		for (size_t i = 0; i < mFrameSource.size(); i++) {
		if (mFrameSource[i][FrameInfoIndex::IntendedVsync] <= mLastFrameLogged) {
		continue;
		}
		mLastFrameLogged = mFrameSource[i][FrameInfoIndex::IntendedVsync];
		fprintf(file, "\t%3.2f\t%3.2f\t%3.2f\t%3.2f\n",
		dprintf(fd, "\t%3.2f\t%3.2f\t%3.2f\t%3.2f\n",
		durationMS(i, FrameInfoIndex::IntendedVsync, FrameInfoIndex::SyncStart),
		durationMS(i, FrameInfoIndex::SyncStart, FrameInfoIndex::IssueDrawCommandsStart),
		durationMS(i, FrameInfoIndex::IssueDrawCommandsStart, FrameInfoIndex::SwapBuffers),
		durationMS(i, FrameInfoIndex::SwapBuffers, FrameInfoIndex::FrameCompleted));
		}

		fflush(file);
		}

		} /* namespace uirenderer */

+6 −8

Original line number	Diff line number	Diff line
		@@ -174,24 +174,22 @@ void JankTracker::dumpData(int fd, const ProfileDataDescription* description,
		}

		void JankTracker::dumpFrames(int fd) {
		FILE* file = fdopen(fd, "a");
		fprintf(file, "\n\n---PROFILEDATA---\n");
		dprintf(fd, "\n\n---PROFILEDATA---\n");
		for (size_t i = 0; i < static_cast<size_t>(FrameInfoIndex::NumIndexes); i++) {
		fprintf(file, "%s", FrameInfoNames[i].c_str());
		fprintf(file, ",");
		dprintf(fd, "%s", FrameInfoNames[i].c_str());
		dprintf(fd, ",");
		}
		for (size_t i = 0; i < mFrames.size(); i++) {
		FrameInfo& frame = mFrames[i];
		if (frame[FrameInfoIndex::SyncStart] == 0) {
		continue;
		}
		fprintf(file, "\n");
		dprintf(fd, "\n");
		for (int i = 0; i < static_cast<int>(FrameInfoIndex::NumIndexes); i++) {
		fprintf(file, "%" PRId64 ",", frame[i]);
		dprintf(fd, "%" PRId64 ",", frame[i]);
		}
		}
		fprintf(file, "\n---PROFILEDATA---\n\n");
		fflush(file);
		dprintf(fd, "\n---PROFILEDATA---\n\n");
		}

		void JankTracker::reset() {

+2 −4

Original line number	Diff line number	Diff line
		@@ -141,10 +141,8 @@ void RenderThread::dumpGraphicsMemory(int fd) {
		break;
		}

		FILE* file = fdopen(fd, "a");
		fprintf(file, "\n%s\n", cachesOutput.string());
		fprintf(file, "\nPipeline=%s\n", pipeline.string());
		fflush(file);
		dprintf(fd, "\n%s\n", cachesOutput.string());
		dprintf(fd, "\nPipeline=%s\n", pipeline.string());
		}

		Readback& RenderThread::readback() {