Merge lp:~schwann/gallery-app/gallery-startup-log into lp:gallery-app

[Günter Schwann]

Better and more startup feedback

Better and more startup feedback

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:749
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/311/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/121
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/121/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/121
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/350
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/350/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/317

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/311/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

179 + GalleryApplication::startStartupTimer();

Should you create the timer only if this was requested in the command line argument?

[Renato Araujo Oliveira Filho (renatofilho)]

79 + if (m_cmdLineParser->startupTimer()) {
80 + qDebug() << "MainView loaded" << m_timer->elapsed() << "ms";
81 + qDebug() << "Startup took" << m_timer->elapsed() << "ms";
82 + }

Should you destroy the m_timer here??

[Günter Schwann (schwann)]

> 179 + GalleryApplication::startStartupTimer();
>
> Should you create the timer only if this was requested in the command line
> argument?

That would be to late. As quite a lot of code would be executed before, and therefore a lot (more) of time would not be included.

> Should you destroy the m_timer here??

That I can do.

[lp:~schwann/gallery-app/gallery-startup-log]

750. By Günter Schwann on 2013-06-25

Delete startup timer after startup is completed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:750
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/312/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/122
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/122/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/122
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/352
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/354
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/354/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/321

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/312/rebuild

review: Approve (continuous-integration)

[Renato Araujo Oliveira Filho (renatofilho)]

looks good

review: Approve

=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2013-06-24 11:09:38 +0000
+++ src/gallery-application.cpp	2013-06-25 13:51:31 +0000
@@ -52,6 +52,8 @@
 #include "resource.h"
 #include "sharefile.h"
 
+QElapsedTimer* GalleryApplication::m_timer = 0;
+
 /*!
  * \brief GalleryApplication::GalleryApplication
  * \param argc
@@ -65,7 +67,6 @@
     if (m_bguSize <= 0)
         m_bguSize = 8;
 
-    m_timer.start();
     m_formFactors.insert("desktop", QSize(120, 80)); // In BGU.
     m_formFactors.insert("tablet", QSize(160, 100));
     m_formFactors.insert("phone", QSize(71, 40));
@@ -80,6 +81,9 @@
 
     GalleryManager::instance(m_cmdLineParser->picturesDir(), &m_view,
                              m_cmdLineParser->logImageLoading());
+
+    if (m_cmdLineParser->startupTimer())
+        qDebug() << "Construct GalleryApplication" << m_timer->elapsed() << "ms";
 }
 
 /*!
@@ -99,7 +103,7 @@
     createView();
 
     // Delay init_collections() so the main loop is running before it kicks off.
-    QTimer::singleShot(0, this, SLOT(startInitCollections()));
+    QTimer::singleShot(0, this, SLOT(initCollections()));
 
     return QApplication::exec();
 }
@@ -180,6 +184,9 @@
         m_view.showFullScreen();
     else
         m_view.show();
+
+    if (m_cmdLineParser->startupTimer())
+        qDebug() << "GalleryApplication view created" << m_timer->elapsed() << "ms";
 }
 
 /*!
@@ -188,26 +195,27 @@
 void GalleryApplication::initCollections()
 {
     GalleryManager::instance()->postInit();
+    if (m_cmdLineParser->startupTimer())
+        qDebug() << "GalleryManager initialized" << m_timer->elapsed() << "ms";
 
     emit mediaLoaded();
-
-    if (m_cmdLineParser->startupTimer())
-        qDebug() << "Startup took" << m_timer.elapsed() << "milliseconds";
-}
-
-/*!
- * \brief GalleryApplication::startInitCollections
- */
-void GalleryApplication::startInitCollections()
-{
-    initCollections();
-}
-
-/*!
- * \brief GalleryApplication::instance
- * \return
- */
-GalleryApplication* GalleryApplication::instance()
-{
-    return static_cast<GalleryApplication*>(qApp);
-}
+    if (m_cmdLineParser->startupTimer()) {
+        qDebug() << "MainView loaded" << m_timer->elapsed() << "ms";
+        qDebug() << "Startup took" << m_timer->elapsed() << "ms";
+    }
+
+    delete m_timer;
+    m_timer = 0;
+}
+
+/*!
+ * \brief GalleryApplication::startStartupTimer
+ */
+void GalleryApplication::startStartupTimer()
+{
+    if (!m_timer)
+        m_timer = new QElapsedTimer();
+
+    m_timer->restart();
+}
+

=== modified file 'src/gallery-application.h'
--- src/gallery-application.h	2013-06-24 11:09:38 +0000
+++ src/gallery-application.h	2013-06-25 13:51:31 +0000
@@ -41,27 +41,26 @@
 
     int exec();
 
-    static GalleryApplication* instance();
-
     Q_INVOKABLE bool runCommand(const QString &cmd, const QString &arg);
 
+    static void startStartupTimer();
+
+signals:
+    void mediaLoaded();
+
+private slots:
+    void initCollections();
+
 private:
     void registerQML();
     void createView();
-    void initCollections();
 
     QHash<QString, QSize> m_formFactors;
     int m_bguSize;
     QQuickView m_view;
-    QElapsedTimer m_timer;
+    static QElapsedTimer *m_timer;
 
     CommandLineParser* m_cmdLineParser;
-
-private slots:
-    void startInitCollections();
-
-signals:
-    void mediaLoaded();
 };
 
 #endif // GALLERYAPPLICATION_H

=== modified file 'src/gallery-manager.cpp'
--- src/gallery-manager.cpp	2013-06-14 13:27:05 +0000
+++ src/gallery-manager.cpp	2013-06-25 13:51:31 +0000
@@ -44,6 +44,8 @@
 // util
 #include "resource.h"
 
+#include <QElapsedTimer>
+
 #include <exiv2/exiv2.hpp>
 
 GalleryManager* GalleryManager::m_galleryManager = NULL;
@@ -101,6 +103,8 @@
 
     if (!collectionsInitialised)
     {
+        QElapsedTimer t;
+        t.start();
         qDebug() << "Opening" << m_resource->mediaDirectories() << "...";
 
         Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute);
@@ -125,7 +129,10 @@
         QObject::connect(m_monitor, SIGNAL(mediaItemAdded(QFileInfo)), this,
                          SLOT(onMediaItemAdded(QFileInfo)));
 
-        qDebug() << "Opened" << m_resource->mediaDirectories();
+        qDebug() << "Opened" << m_resource->mediaDirectories() << "with "
+                 << m_mediaCollection->count() << "media files in"
+                 << t.elapsed() << "ms - "
+                 <<  (qreal)t.elapsed() / (qreal)m_mediaCollection->count() << " ms per media";
     }
 }
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2013-02-25 10:16:29 +0000
+++ src/main.cpp	2013-06-25 13:51:31 +0000
@@ -23,6 +23,7 @@
 
 int main(int argc, char *argv[])
 {
+    GalleryApplication::startStartupTimer();
     GalleryApplication app(argc, argv);
     return app.exec();
 }