Merge pull request #1920

da3eae2 Dynamic monerod --max-concurrency, max 6 (xmrdsc)

3 files changed, 9 insertions, 5 deletions

diff --git a/main.cpp b/main.cpp
index b47d1191..69dca900 100644
--- a/main.cpp
+++ b/main.cpp
@@ -298,7 +298,7 @@ int main(int argc, char *argv[])
 
     engine.rootContext()->setContextProperty("defaultAccountName", accountName);
     engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());
-    engine.rootContext()->setContextProperty("numberMiningThreadsAvailable", QThread::idealThreadCount());
+    engine.rootContext()->setContextProperty("idealThreadCount", QThread::idealThreadCount());
 
     bool builtWithScanner = false;
 #ifdef WITH_SCANNER
diff --git a/pages/Mining.qml b/pages/Mining.qml
index 8a971273..b05fea49 100644
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -101,13 +101,13 @@ Rectangle {
                 id: soloMinerThreadsLine
                 Layout.preferredWidth:  200 * scaleRatio
                 text: "1"
-                validator: IntValidator { bottom: 1; top: numberMiningThreadsAvailable }
+                validator: IntValidator { bottom: 1; top: idealThreadCount }
             }
         }
 
         Text {
             id: numAvailableThreadsText
-            text: qsTr("Max # of CPU threads available for mining: ") + numberMiningThreadsAvailable + translationManager.emptyString
+            text: qsTr("Max # of CPU threads available for mining: ") + idealThreadCount + translationManager.emptyString
             wrapMode: Text.WordWrap
             Layout.leftMargin: 125 * scaleRatio
             font.family: MoneroComponents.Style.fontRegular.name
@@ -124,7 +124,7 @@ Rectangle {
                 text: qsTr("Use recommended # of threads") + translationManager.emptyString
                 enabled: startSoloMinerButton.enabled
                 onClicked: {
-                        soloMinerThreadsLine.text = Math.floor(numberMiningThreadsAvailable / 2);
+                        soloMinerThreadsLine.text = Math.floor(idealThreadCount / 2);
                         appWindow.showStatusMessage(qsTr("Set to use recommended # of threads"),3)
                 }
             }
@@ -135,7 +135,7 @@ Rectangle {
                 text: qsTr("Use all threads") + translationManager.emptyString
                 enabled: startSoloMinerButton.enabled
                 onClicked: {
-                    soloMinerThreadsLine.text = numberMiningThreadsAvailable
+                    soloMinerThreadsLine.text = idealThreadCount
                     appWindow.showStatusMessage(qsTr("Set to use all threads"),3)
                 }
             }
diff --git a/src/daemon/DaemonManager.cpp b/src/daemon/DaemonManager.cpp
index 79db8cff..09507a4a 100644
--- a/src/daemon/DaemonManager.cpp
+++ b/src/daemon/DaemonManager.cpp
@@ -1,5 +1,6 @@
 #include "DaemonManager.h"
 #include <QFile>
+#include <QThread>
 #include <QFileInfo>
 #include <QDir>
 #include <QDebug>
@@ -72,7 +73,10 @@ bool DaemonManager::start(const QString &flags, NetworkType::Type nettype, const
 
     arguments << "--check-updates" << "disabled";
 
+    // --max-concurrency based on threads available. max: 6
+    int32_t concurrency = qBound(1, QThread::idealThreadCount() / 2, 6);
 
+    arguments << "--max-concurrency" << QString::number(concurrency);
 
     qDebug() << "starting monerod " + m_monerod;
     qDebug() << "With command line arguments " << arguments;