From 193faf3fbb8a931d5aaef971b2f3e2d510dc052d Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Sun, 8 Dec 2013 21:48:48 +0000 Subject: [PATCH] Add (commented out) code to time MTP connect/update. --- devices/mtpdevice.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/devices/mtpdevice.cpp b/devices/mtpdevice.cpp index 032992fd8..422cfefc3 100644 --- a/devices/mtpdevice.cpp +++ b/devices/mtpdevice.cpp @@ -52,6 +52,11 @@ #include #include #include +//#define TIME_MTP_OPERATIONS +#ifdef TIME_MTP_OPERATIONS +#include +#include +#endif #define MTP_FAKE_ALBUMARTIST_SUPPORT #define MTP_TRACKNUMBER_FROM_FILENAME @@ -131,6 +136,13 @@ void MtpConnection::trackListProgress(uint64_t count) void MtpConnection::connectToDevice() { + #ifdef TIME_MTP_OPERATIONS + QElapsedTimer timer; + QElapsedTimer totalTimer; + timer.start(); + totalTimer.start(); + #endif + device=0; storage.clear(); defaultMusicFolder=0; @@ -141,6 +153,10 @@ void MtpConnection::connectToDevice() emit statusMessage(i18n("No devices found")); return; } + #ifdef TIME_MTP_OPERATIONS + qWarning() << "Connect to device:" << timer.elapsed(); + timer.restart(); + #endif LIBMTP_mtpdevice_t *mptDev=0; for (int i = 0; i < numDev; i++) { @@ -154,13 +170,25 @@ void MtpConnection::connectToDevice() } } + #ifdef TIME_MTP_OPERATIONS + qWarning() << "Open raw device:" << timer.elapsed(); + timer.restart(); + #endif + size=0; used=0; device=mptDev; updateStorage(); + #ifdef TIME_MTP_OPERATIONS + qWarning() << "Update storage:" << timer.elapsed(); + #endif + free(rawDevices); if (!device) { emit statusMessage(i18n("No devices found")); + #ifdef TIME_MTP_OPERATIONS + qWarning() << "TOTAL connect:" <default_music_folder; emit statusMessage(i18n("Connected to device")); + #ifdef TIME_MTP_OPERATIONS + qWarning() << "TOTAL connect:" <applyGrouping(); + #ifdef TIME_MTP_OPERATIONS + qWarning() << "Grouping:" << timer.elapsed(); + qWarning() << "TOTAL update:" <