fix(judge): no bwrap in macos

Project-LemonLime · Jun 23, 2024 · f4db375 · f4db375
1 parent 2c0c98f
commit f4db375
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
@@ -1 +1 @@
-263
+264
diff --git a/src/core/judgingthread.cpp b/src/core/judgingthread.cpp
@@ -878,6 +878,8 @@ void JudgingThread::runProgram() {
 	LOG("User Time Used:", timeUsed, "ms, Kernel Time Used:", kernelTimeUsed,
 	    "ms, User+Kernel Time Used:", timeUsed + kernelTimeUsed, "ms, Memory Used:", memoryUsed, "bytes");
 #else
+
+#ifdef Q_OS_LINUX
 	// TODO: rewrite with cgroup
 	QFile watcher(workingDirectory + QUuid::createUuid().toString(QUuid::Id128));
 	QFile::copy(":/watcher/watcher_unix", watcher.fileName());
@@ -941,6 +943,37 @@ void JudgingThread::runProgram() {
 	runner->setWorkingDirectory(workingDirectory);
 	runner->start("/usr/bin/bwrap", argumentsList);
 
+#else
+
+	QFile watcher(workingDirectory + QUuid::createUuid().toString(QUuid::Id128));
+	QFile::copy(":/watcher/watcher_unix", watcher.fileName());
+	watcher.setPermissions(QFileDevice::ReadOwner | QFileDevice::WriteOwner | QFileDevice::ExeOwner);
+	auto *runner = new QProcess(this);
+	QStringList argumentsList;
+	argumentsList << QString("\"%1\" %2").arg(executableFile, arguments);
+
+	if (task->getStandardInputCheck()) {
+		argumentsList << QFileInfo(inputFile).absoluteFilePath();
+	} else {
+		argumentsList << "";
+	}
+
+	if (task->getStandardOutputCheck()) {
+		argumentsList << "_tmpout";
+	} else {
+		argumentsList << "";
+	}
+
+	argumentsList << "_tmperr";
+	argumentsList << QString("%1").arg(timeLimit + extraTime);
+	argumentsList << QString("%1").arg(memoryLimit);
+
+	runner->setProcessEnvironment(environment);
+	runner->setWorkingDirectory(workingDirectory);
+	runner->start(watcher.fileName(), argumentsList);
+
+#endif
+
 	if (! runner->waitForStarted(-1)) {
 		delete runner;
 		score = 0;