Merge remote-tracking branch 'origin/master' into int64-for-used-memory

Author: ZnPdCo

CMakeLists.txt

@@ -308,6 +308,13 @@ if(ENABLE_LTO)
     endif()
 endif()
 
+# ==================================================================================
+# Tests
+# ==================================================================================
+
+enable_testing()
+add_subdirectory(tests)
+
 # ==================================================================================
 # Platform-dependent installation process and deployment
 # ==================================================================================

README.md

@@ -6,7 +6,7 @@
 
 A tiny judging environment for OI contest based on Lemon + LemonPlus
 
-需要 Qt 6.8 或更高版本（可通过 `-DLEMON_QT_MAJOR_VERSION=<6|7>` 选择对应 Qt 主版本）。
+需要 Qt 6.8 或更高版本。
 
 现已支持 Linux，Windows 以及 macOS
 

src/core/contest.cpp

@@ -277,6 +277,10 @@ int Contest::readFromJson(const QJsonObject &in) {
 	QJsonArray tasks;
 	READ_JSON(in, tasks);
 
+	// NOTE: taskList and contestantList are empty here because readFromJson is
+	// only ever called once on a freshly constructed Contest (immediately after
+	// construction, before any tasks or contestants are added). If this invariant
+	// ever changes, qDeleteAll() must be called before clear() to avoid leaks.
 	taskList.clear();
 	for (const auto &task : tasks) {
 		Task *newTask = new Task();
@@ -288,6 +292,7 @@ int Contest::readFromJson(const QJsonObject &in) {
 	QJsonArray contestants;
 	READ_JSON(in, contestants);
 
+	// See note above: contestantList is also empty at this point.
 	contestantList.clear();
 	for (const auto &contestant : contestants) {
 		auto *newContestant = new Contestant();

src/core/judgesharedvariables.h

@@ -11,8 +11,10 @@
 //
 
 #include "base/LemonType.hpp"
+#include "processrunner.h"
 #include <QProcessEnvironment>
 #include <QThread>
+#include <atomic>
 
 class Task;
 
@@ -75,15 +77,15 @@ class JudgingThread : public QThread {
 	int judgedTimes;
 	ResultState result;
 	QString message;
-	bool stopJudging;
+	std::atomic<bool> stopJudging{false};
 	bool interpreterAsWatcher{};
 	void compareLineByLine(const QString &);
 	void compareIgnoreSpaces(const QString &);
 	void compareWithDiff(const QString &);
 	void compareRealNumbers(const QString &);
 	void lemonSpecialJudge(const QString &);
 	void testlibSpecialJudge(const QString &);
-	void runProgram();
+
 	void judgeOutput();
 	void judgeTraditionalTask();
 	void judgeAnswersOnlyTask();

src/core/judgingthread.h

@@ -0,0 +1,26 @@
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Project LemonLime
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#include "processrunner.h"
+
+#ifdef Q_OS_WIN32
+#include "processrunner_win.h"
+#else
+#include "processrunner_unix.h"
+#endif
+
+ProcessRunner::ProcessRunner(ProcessRunnerConfig cfg, const std::atomic<bool> &stop)
+    : config(std::move(cfg)), stopFlag(stop) {}
+
+auto ProcessRunner::create(ProcessRunnerConfig config,
+                           const std::atomic<bool> &stopFlag) -> std::unique_ptr<ProcessRunner> {
+#ifdef Q_OS_WIN32
+	return std::make_unique<WinProcessRunner>(std::move(config), stopFlag);
+#else
+	return std::make_unique<UnixProcessRunner>(std::move(config), stopFlag);
+#endif
+}

src/core/processrunner.cpp

@@ -0,0 +1,56 @@
+/*
+ * SPDX-FileCopyrightText: 2019-2022 Project LemonLime
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ */
+
+#pragma once
+
+#include "base/LemonType.hpp"
+#include <QProcessEnvironment>
+#include <QString>
+#include <QtGlobal>
+#include <atomic>
+#include <memory>
+
+struct ProcessRunnerConfig {
+	QString executableFile;
+	QString arguments;
+	QString workingDirectory;
+	QString inputFile;
+	QProcessEnvironment environment;
+	int timeLimit{};
+	int rawTimeLimit{};
+	int memoryLimit{};
+	int rawMemoryLimit{};
+	double extraTimeRatio{};
+	bool standardInputCheck{};
+	bool standardOutputCheck{};
+	QString inputFileName;
+	QString outputFileName;
+	bool interpreterAsWatcher{};
+};
+
+struct ProcessRunnerResult {
+	ResultState result = CorrectAnswer;
+	int score = 0;
+	int timeUsed = -1;
+	int memoryUsed = -1;
+	QString message;
+};
+
+class ProcessRunner {
+  public:
+	ProcessRunner(ProcessRunnerConfig config, const std::atomic<bool> &stopFlag);
+	virtual ~ProcessRunner() = default;
+
+	virtual ProcessRunnerResult run() = 0;
+
+	static std::unique_ptr<ProcessRunner> create(ProcessRunnerConfig config,
+	                                             const std::atomic<bool> &stopFlag);
+
+  protected:
+	ProcessRunnerConfig config;
+	const std::atomic<bool> &stopFlag;
+};