feat: maximum judgeing threads can be changed now

Author: alphagocc

CMakeLists.txt

@@ -47,12 +47,14 @@ if(LEMON_QT6)
     set(LEMON_QT_LIBNAME Qt6)
     set(QT_MAJOR_VERSION 6)
     set(QT_DEFAULT_MAJOR_VERSION 6)
+    set(Qt_DIR ${Qt6_DIR})
     add_definitions(-DLEMON_QT6)
 else()
     set(LEMON_QT_MAJOR_VERSION 5)
     set(LEMON_QT_MINOR_VERSION 15)
     set(LEMON_QT_LIBNAME Qt5)
     set(QT_MAJOR_VERSION 5)
+    set(Qt_DIR ${Qt5_DIR})
 endif()
 
 add_definitions(-DQT_NO_FOREACH)
@@ -182,7 +184,7 @@ endif()
 
 # Qt language translations
 add_custom_target(lupdate
-    COMMAND lupdate
+    COMMAND ${Qt_DIR}/../../../bin/lupdate
     ${LEMON_BASE_HEADERS}
     ${LEMON_BASE_SOURCES}
     ${LEMON_CORE_SOURCES}

makespec/BUILDVERSION

@@ -1 +1 @@
-181
+182

src/base/LemonConfig.cpp

@@ -20,6 +20,7 @@ namespace Lemon::base::config {
 		READ_JSON(json, specialJudgeTimeLimit);
 		READ_JSON(json, fileSizeLimit);
 		READ_JSON(json, rejudgeTimes);
+		READ_JSON(json, maxJudgingThreads);
 
 		READ_JSON(json, defaultInputFileExtension);
 		READ_JSON(json, defaultOutputFileExtension);
@@ -54,6 +55,7 @@ namespace Lemon::base::config {
 		WRITE_JSON(json, specialJudgeTimeLimit);
 		WRITE_JSON(json, fileSizeLimit);
 		WRITE_JSON(json, rejudgeTimes);
+		WRITE_JSON(json, maxJudgingThreads);
 
 		WRITE_JSON(json, defaultInputFileExtension);
 		WRITE_JSON(json, defaultOutputFileExtension);

src/base/LemonConfig.hpp

@@ -26,6 +26,7 @@ namespace Lemon::base::config {
 		int specialJudgeTimeLimit{};
 		int fileSizeLimit{};
 		int rejudgeTimes{};
+		int maxJudgingThreads{};
 		QString defaultInputFileExtension;
 		QString defaultOutputFileExtension;
 		QStringList inputFileExtensions;

src/base/settings.cpp

@@ -113,6 +113,8 @@ auto Settings::getFileSizeLimit() const -> int { return fileSizeLimit; }
 
 auto Settings::getRejudgeTimes() const -> int { return rejudgeTimes; }
 
+auto Settings::getMaxJudgingThreads() const -> int { return maxJudgingThreads; }
+
 auto Settings::getDefaultExtraTimeRatio() const -> double { return defaultExtraTimeRatio; }
 
 auto Settings::getDefaultInputFileExtension() const -> const QString & { return defaultInputFileExtension; }
@@ -176,6 +178,11 @@ void Settings::setRejudgeTimes(int number) {
 	DEBUG("Set Rejudge Times to " + QString::number(number));
 }
 
+void Settings::setMaxJudgingThreads(int number) {
+	maxJudgingThreads = number;
+	DEBUG("Set Max Judging Threads to " + QString::number(number));
+}
+
 void Settings::setDefaultInputFileExtension(const QString &extension) {
 	defaultInputFileExtension = extension;
 	DEBUG("Set Default InputFile Extension to " + extension);
@@ -361,6 +368,7 @@ void Settings::copyFrom(Settings *other) {
 	setSpecialJudgeTimeLimit(other->getSpecialJudgeTimeLimit());
 	setFileSizeLimit(other->getFileSizeLimit());
 	setRejudgeTimes(other->getRejudgeTimes());
+	setMaxJudgingThreads(other->getMaxJudgingThreads());
 	setDefaultInputFileExtension(other->getDefaultInputFileExtension());
 	setDefaultOutputFileExtension(other->getDefaultOutputFileExtension());
 	setInputFileExtensions(other->getInputFileExtensions().join(";"));
@@ -409,6 +417,7 @@ void Settings::saveSettings() {
 	settings.setValue("SpecialJudgeTimeLimit", specialJudgeTimeLimit);
 	settings.setValue("FileSizeLimit", fileSizeLimit);
 	settings.setValue("MaximumRejudgeTimes", rejudgeTimes);
+	settings.setValue("MaximumJudgingThreads", maxJudgingThreads);
 	settings.setValue("DefaultInputFileExtension", defaultInputFileExtension);
 	settings.setValue("DefaultOutputFileExtension", defaultOutputFileExtension);
 	settings.setValue("InputFileExtensions", inputFileExtensions);
@@ -512,6 +521,7 @@ void Settings::loadSettings() {
 	specialJudgeTimeLimit = settings.value("SpecialJudgeTimeLimit", 10000).toInt();
 	fileSizeLimit = settings.value("FileSizeLimit", 50).toInt();
 	rejudgeTimes = settings.value("MaximumRejudgeTimes", 1).toInt();
+	maxJudgingThreads = settings.value("MaximumJudgingThreads", 1).toInt();
 	defaultInputFileExtension = settings.value("DefaultInputFileExtension", "in").toString();
 	defaultOutputFileExtension = settings.value("DefaultOuputFileExtension", "out").toString();
 	inputFileExtensions = settings.value("InputFileExtensions", QStringList() << "in").toStringList();

src/base/settings.h

@@ -78,6 +78,7 @@ class Settings {
 	int getSpecialJudgeTimeLimit() const;
 	int getFileSizeLimit() const;
 	int getRejudgeTimes() const;
+	int getMaxJudgingThreads() const;
 	double getDefaultExtraTimeRatio() const;
 	const QString &getDefaultInputFileExtension() const;
 	const QString &getDefaultOutputFileExtension() const;
@@ -98,6 +99,7 @@ class Settings {
 	void setSpecialJudgeTimeLimit(int);
 	void setFileSizeLimit(int);
 	void setRejudgeTimes(int);
+	void setMaxJudgingThreads(int);
 	void setDefaultInputFileExtension(const QString &);
 	void setDefaultOutputFileExtension(const QString &);
 	void setInputFileExtensions(const QString &);
@@ -146,6 +148,7 @@ class Settings {
 	int specialJudgeTimeLimit{};
 	int fileSizeLimit{};
 	int rejudgeTimes{};
+	int maxJudgingThreads{};
 	double defaultExtraTimeRatio{};
 	QString defaultInputFileExtension;
 	QString defaultOutputFileExtension;

src/core/contest.cpp

@@ -171,7 +171,7 @@ void Contest::judge(const QVector<std::pair<Contestant *, int>> &judgingTasks) {
 	stopJudging = false;
 	// emit contestantJudgingStart(contestant->getContestantName());
 
-	controller = new JudgingController();
+	controller = new JudgingController(settings);
 
 	// connect(controller, &JudgingController::judgeFinished, this, &Contest::judgeFinished);
 	for (auto [contestant, i] : judgingTasks) {

src/core/judgingcontroller.cpp

@@ -8,11 +8,13 @@
 #include "judgingcontroller.h"
 #include "core/contestant.h"
 
+#include <QtMath>
+
 #define LEMON_MODULE_NAME "JudgingController"
 
-JudgingController::JudgingController(QObject *parent) : QObject(parent) {
+JudgingController::JudgingController(Settings *settings, QObject *parent) : QObject(parent) {
 	isJudging = 0;
-	maxThreads = 8;
+	maxThreads = qMax(1, settings->getMaxJudgingThreads());
 }
 
 void JudgingController::assign() {
@@ -70,4 +72,4 @@ void JudgingController::stop() {
 	}
 	emit judgeFinished();
 }
-void JudgingController::addTask(TaskJudger *taskJudger) { queuingTasks.push_back(taskJudger); }
+void JudgingController::addTask(TaskJudger *taskJudger) { queuingTasks.push_back(taskJudger); }

src/core/judgingcontroller.h

@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/LemonType.hpp"
+#include "base/settings.h"
 #include "taskjudger.h"
 
 #include <QMap>
@@ -19,7 +20,7 @@ class JudgingController : public QObject {
 	Q_OBJECT
 
   public:
-	explicit JudgingController(QObject *parent = nullptr);
+	explicit JudgingController(Settings *settings, QObject *parent = nullptr);
 	void addTask(TaskJudger *judger);
 
   private: