← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~verzegnassi-stefano/ubuntu-docviewer-app/workaround-fix-1432412 into lp:ubuntu-docviewer-app

 

Stefano Verzegnassi has proposed merging lp:~verzegnassi-stefano/ubuntu-docviewer-app/workaround-fix-1432412 into lp:ubuntu-docviewer-app.

Commit message:
Workaround for multi-core support on ARM SoCs

Requested reviews:
  Ubuntu Document Viewer Developers (ubuntu-docviewer-dev)
Related bugs:
  Bug #1432412 in Ubuntu Document Viewer App: "[pdfPlugin] Multithreading does not work properly on ARM SoC"
  https://bugs.launchpad.net/ubuntu-docviewer-app/+bug/1432412

For more details, see:
https://code.launchpad.net/~verzegnassi-stefano/ubuntu-docviewer-app/workaround-fix-1432412/+merge/254117

Workaround for multi-core support on ARM SoCs
-- 
Your team Ubuntu Document Viewer Developers is requested to review the proposed merge of lp:~verzegnassi-stefano/ubuntu-docviewer-app/workaround-fix-1432412 into lp:ubuntu-docviewer-app.
=== modified file 'po/com.ubuntu.docviewer.pot'
--- po/com.ubuntu.docviewer.pot	2015-03-12 19:00:33 +0000
+++ po/com.ubuntu.docviewer.pot	2015-03-25 16:54:00 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-12 19:59+0100\n"
+"POT-Creation-Date: 2015-03-25 17:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -189,7 +189,7 @@
 msgstr ""
 
 #: ../src/app/qml/documentPage/DocumentPage.qml:25
-#: /home/stefano/tmp/translations/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
+#: /home/stefano/Progetti/doc-viewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
 msgid "Document Viewer"
 msgstr ""
 
@@ -254,6 +254,6 @@
 msgid "Loading..."
 msgstr ""
 
-#: /home/stefano/tmp/translations/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
+#: /home/stefano/Progetti/doc-viewer/build-ubuntu-docviewer-app-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
 msgid "documents;viewer;pdf;reader;"
 msgstr ""

=== modified file 'src/plugin/poppler-qml-plugin/pdfdocument.cpp'
--- src/plugin/poppler-qml-plugin/pdfdocument.cpp	2015-02-04 19:19:21 +0000
+++ src/plugin/poppler-qml-plugin/pdfdocument.cpp	2015-03-25 16:54:00 +0000
@@ -174,7 +174,13 @@
     // WORKAROUND: QQuickImageProvider should create multiple threads to load more images at the same time.
     // [QTBUG-37998] QQuickImageProvider can block its separate thread with ForceAsynchronousImageLoading
     // Link: https://bugreports.qt.io/browse/QTBUG-37988
-    int newProvidersNumber = QThread::idealThreadCount();
+
+    // WORKAROUND: ARM SoCs can disable some of their cores when the load is not particulary high.
+    // This causes a wrong value for the "newProvidersNumber" variable.
+    // We hard-code its value to 4 (which is the number of available core on all the supported devices).
+//    int newProvidersNumber = QThread::idealThreadCount();
+    int newProvidersNumber = 4;
+
     if (newProvidersNumber != m_providersNumber) {
         m_providersNumber = newProvidersNumber;
         Q_EMIT providersNumberChanged();


Follow ups