Merge branch 'main' into changelog

Author: meisterT

judge/create_cgroups.in

@@ -34,8 +34,8 @@ You can try using cgroup V1 by adding systemd.unified_cgroup_hierarchy=0 to the
     if ! echo "+cpuset" >> /sys/fs/cgroup/cgroup.subtree_control; then
         cgroup_error_and_usage "Error: Cannot add +cpuset to cgroup.subtree_control; check kernel params."
     fi
-    if ! grep -q "slice" /proc/self/cgroup; then
-        cgroup_error_and_usage "Error: Cgroups not configured properly, missing systemd slice under /proc/self/cgroup. If running under docker, make sure to set cgroupns=host."
+    if grep -q ":/$" /proc/self/cgroup; then
+        cgroup_error_and_usage "Error: Cgroups not configured properly, missing cgroup hierarchy prefix under /proc/self/cgroup. If running in a container, make sure to set cgroupns=host."
     fi
 
 else # Trying cgroup V1:

judge/judgedaemon.main.php

@@ -1451,6 +1451,16 @@ function judge(array $judgeTask): bool
         $passdir = $testcasedir . '/' . $passCnt;
         mkdir($passdir, 0755, true);
 
+        // In multi-pass problems, all files in the feedback directory
+        // are guaranteed to persist between passes, except `nextpass.in`.
+        // So, we recursively copy the feedback directory for every pass
+        // after the first (note that $passCnt starts at 1).
+        if ($passCnt > 1) {
+            $prevPassdir = $testcasedir . '/' . ($passCnt - 1) . '/feedback';
+            system('cp -R ' . dj_escapeshellarg($prevPassdir) . ' ' . dj_escapeshellarg($passdir . '/'));
+            system('rm ' . dj_escapeshellarg($passdir . '/feedback/nextpass.in'));
+        }
+
         // Copy program with all possible additional files to testcase
         // dir. Use hardlinks to preserve space with big executables.
         $programdir = $passdir . '/execdir';

judge/testcase_run.sh

@@ -197,7 +197,7 @@ if [ $COMBINED_RUN_COMPARE -eq 1 ]; then
 	# A combined run and compare script may now already need the
 	# feedback directory, and perhaps access to the test answers (but
 	# only the original that lives outside the chroot).
-	mkdir feedback
+	mkdir -p feedback
 	RUNARGS="$RUNARGS $TESTOUT compare.meta feedback"
 fi
 
@@ -234,8 +234,8 @@ if [ $COMBINED_RUN_COMPARE -eq 0 ]; then
 
 	exitcode=0
 	# Create dir for feedback files and make it writable for $RUNUSER
-	mkdir feedback
-	chmod a+w feedback
+	mkdir -p feedback
+	chmod -R a+w feedback
 
 	runcheck $GAINROOT "$RUNGUARD" ${DEBUG:+-v} $CPUSET_OPT -u "$RUNUSER" -g "$RUNGROUP" \
 		-m $SCRIPTMEMLIMIT -t $SCRIPTTIMELIMIT --no-core \

webapp/src/Controller/Jury/SubmissionController.php

@@ -889,10 +889,12 @@ public function sourceAction(
                 ->andWhere('s.problem = :probid')
                 ->andWhere('s.language = :langid')
                 ->andWhere('s.submittime < :submittime')
+                ->andWhere('s.contest = :contest')
                 ->setParameter('teamid', $submission->getTeam())
                 ->setParameter('probid', $submission->getProblem())
                 ->setParameter('langid', $submission->getLanguage())
                 ->setParameter('submittime', $submission->getSubmittime())
+                ->setParameter('contest', $submission->getContest())
                 ->orderBy('s.submittime', 'DESC')
                 ->setMaxResults(1)
                 ->getQuery()

webapp/src/Controller/PublicController.php

@@ -330,11 +330,15 @@ public function submissionsDataAction(Request $request, ?string $teamId, ?string
         }
 
         $scoreboard = $this->scoreboardService->getScoreboard($contest);
+        $teamIds = array_map(fn(Team $team) => $team->getTeamid(), $scoreboard->getTeamsInDescendingOrder());
 
         /** @var Submission[] $submissions */
         $submissions = $this->submissionService->getSubmissionList(
             [$contest->getCid() => $contest],
-            restrictions: new SubmissionRestriction(valid: true),
+            restrictions: new SubmissionRestriction(
+                teamIds: $teamIds,
+                valid: true,
+            ),
             paginated: false
         )[0];
 

webapp/templates/base.html.twig

@@ -21,13 +21,13 @@
     {% block extrahead %}
         <link rel="stylesheet" href="{{ asset('style_domjudge.css') }}">
 
-        {{ extrahead|default('') }}
+        {{ extrahead | default('') }}
     {% endblock %}
     {% for file in customAssetFiles('css') %}
         <link rel="stylesheet" href="{{ asset('css/custom/' ~ file) }}">
     {% endfor %}
 </head>
-<body{% if static is defined and static %} class="static"{% endif%}>
+<body{% if static is defined and static %} class="static"{% endif %}>
 {% block menu %}{% endblock %}
 {% block body %}
     <div class="container-fluid">
@@ -36,7 +36,7 @@
                 {% block messages %}
                     {% include 'partials/messages.html.twig' %}
                 {% endblock %}
-                {% block content %}{{ body|raw }}{% endblock %}
+                {% block content %}{{ body | raw }}{% endblock %}
             </div>
         </div>
     </div>

webapp/templates/form_theme.html.twig

@@ -1,28 +1,28 @@
 {% use 'bootstrap_5_layout.html.twig' %}
 
 {% block choice_widget_collapsed -%}
-    {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-control form-select')|trim}) -%}
+    {%- set attr = attr | merge({class: (attr.class | default('') ~ ' form-control form-select') | trim}) -%}
     {{- parent() -}}
 {%- endblock choice_widget_collapsed %}
 
 {% block button_widget -%}
-    {% set attr = attr|merge({class: (attr.class|default('') ~ ' btn')|trim}) %}
+    {% set attr = attr | merge({class: (attr.class | default('') ~ ' btn') | trim}) %}
     {% if label is empty -%}
         {%- if label_format is not empty -%}
-            {% set label = label_format|replace({
+            {% set label = label_format | replace({
                 '%name%': name,
                 '%id%': id,
             }) %}
         {%- else -%}
-            {% set label = name|humanize %}
+            {% set label = name | humanize %}
         {%- endif -%}
     {%- endif -%}
-    {% if icon|default %}
+    {% if icon | default %}
         {% set iconHtml = '<i class="fa ' ~ icon ~ '"></i> ' %}
     {% else %}
         {% set iconHtml = '' %}
     {% endif %}
-    <button type="{{ type|default('button') }}" {{ block('button_attributes') }}>{{ iconHtml|raw }}{{ label|trans({}, translation_domain) }}</button>
+    <button type="{{ type | default('button') }}" {{ block('button_attributes') }}>{{ iconHtml | raw }}{{ label | trans({}, translation_domain) }}</button>
 {%- endblock button_widget %}
 
 {% block form_widget_simple %}

webapp/templates/jury/analysis/contest_overview.html.twig

@@ -4,10 +4,10 @@
 
 {% block extrahead %}
 {{ parent() }}
-<link rel="stylesheet" href="{{asset('css/nv.d3.min.css')}}">
-<script src="{{asset('js/d3.min.js')}}"></script>
-<script src="{{asset('js/nv.d3.min.js')}}"></script>
-<script src="{{asset('js/FileSaver.min.js')}}"></script>
+<link rel="stylesheet" href="{{ asset('css/nv.d3.min.css') }}">
+<script src="{{ asset('js/d3.min.js') }}"></script>
+<script src="{{ asset('js/nv.d3.min.js') }}"></script>
+<script src="{{ asset('js/FileSaver.min.js') }}"></script>
 <style>
 .card-body.tablecard{
   overflow-y: auto;
@@ -50,9 +50,9 @@ $(function() {
             <br>
             Calculated as:<br>
             average across all teams of [3 people x (number of minutes elapsed - minute last problem solved by team t)]
-          ">Misery index</abbr>: {{misc.misery_index|number_format(0)}} minutes<br>
+          ">Misery index</abbr>: {{ misc.misery_index | number_format(0) }} minutes<br>
           # Submissions: {{ misc.total_submissions }}<br>
-          # Accepted Submissions: {{ misc.total_accepted }} <span class="text-muted">(~{{ (misc.total_submissions>0 ? (misc.total_accepted/misc.total_submissions)*100:0)|number_format(0) }}%)</span><br>
+          # Accepted Submissions: {{ misc.total_accepted }} <span class="text-muted">(~{{ (misc.total_submissions>0 ? (misc.total_accepted/misc.total_submissions)*100:0) | number_format(0) }}%)</span><br>
           # of Teams: {{ misc.num_teams }}<br>
         </div>
       </div>
@@ -116,13 +116,13 @@ $(function() {
               {% set id=p.probid %}
               <tr>
                 {% set link = path('analysis_problem', {'probid': id, 'view': view}) %}
-                <td scope="row"><a href="{{path('analysis_problem', {'probid': id, 'view': view}) }}">{{ id }}</a></td>
+                <td scope="row"><a href="{{ path('analysis_problem', {'probid': id, 'view': view}) }}">{{ id }}</a></td>
                 <td><a href="{{ link }}">{{ p | problemBadge }} {{ p.problem.name }}</a></td>
                 <td><a href="{{ link }}">{{ p.problem.timelimit }}</a></td>
-                <td><a href="{{ link }}">{{ p.problem.memlimit|default('default') }}</a></td>
+                <td><a href="{{ link }}">{{ p.problem.memlimit | default('default') }}</a></td>
                 <td><a href="{{ link }}">{{ misc.problem_num_testcases[id] }}</a></td>
-                <td><a href="{{ link }}">{{ misc.problem_attempts[id]|default(0) }} / {{ misc.problem_solutions[id]|default(0) }}</a></td>
-                <td><a href="{{ link }}">{{ misc.problem_stats.teams_attempted[id]|default([])|length }} / {{ misc.problem_stats.teams_solved[id]|default([])|length }}</a></td>
+                <td><a href="{{ link }}">{{ misc.problem_attempts[id] | default(0) }} / {{ misc.problem_solutions[id] | default(0) }}</a></td>
+                <td><a href="{{ link }}">{{ misc.problem_stats.teams_attempted[id] | default([]) | length }} / {{ misc.problem_stats.teams_solved[id] | default([]) | length }}</a></td>
               </tr>
             {% endfor %}
             </tbody>
@@ -156,8 +156,8 @@ $(function() {
                 <td><a href="{{ link }}">{% if t.affiliation %}{{ t.affiliation.name }}{% else %}-{% endif %}</a></td>
                 <td class="truncate" style="max-width: 200px"><a href="{{ link }}">{{ t.effectiveName }}</a></td>
                 <td><a href="{{ link }}">{{ misc.team_stats[id].total_submitted }} / {{ misc.team_stats[id].total_accepted }}</a></td>
-                <td><a href="{{ link }}">{{ misc.team_stats[id].problems_submitted|length }} / {{ misc.team_stats[id].problems_accepted|length }}</a></td>
-                <td><a href="{{ link }}">{{ misc.team_stats[id].misery_index|number_format(0) }}</a></td>
+                <td><a href="{{ link }}">{{ misc.team_stats[id].problems_submitted | length }} / {{ misc.team_stats[id].problems_accepted | length }}</a></td>
+                <td><a href="{{ link }}">{{ misc.team_stats[id].misery_index | number_format(0) }}</a></td>
               </tr>
             {% endfor %}
             </tbody>
@@ -173,7 +173,7 @@ $(function() {
                   Delayed Judgings (by more than {{ delayed_judgings.delay }}s)
               </div>
               <div class="card-body tablecard">
-                  {% if delayed_judgings.data|length > 0 %}
+                  {% if delayed_judgings.data | length > 0 %}
                       <table class="table table-sm table-striped table-hover table-full-clickable-cell">
                           <thead>
                           <tr>
@@ -235,7 +235,7 @@ var language_stats = [
     values: [
       {% for lang,count in misc.language_stats.total_submissions %}
         {
-          "label" : "{{lang}}",
+          "label" : "{{ lang }}",
           "value" : {{ count }},
         },
       {% endfor %}
@@ -247,7 +247,7 @@ var language_stats = [
     values: [
       {% for lang,count in misc.language_stats.total_solutions %}
         {
-          "label" : "{{lang}}",
+          "label" : "{{ lang }}",
           "value" : {{ count }},
         },
       {% endfor %}
@@ -288,8 +288,8 @@ var problem_stats = [
     values: [
       {% for prob in problems %}
         {
-          "label" : "{{prob.shortname}}",
-          "value" : {{ misc.problem_stats.teams_attempted[prob.probid]|default([])|length }},
+          "label" : "{{ prob.shortname }}",
+          "value" : {{ misc.problem_stats.teams_attempted[prob.probid] | default([]) | length }},
         },
       {% endfor %}
     ]
@@ -300,8 +300,8 @@ var problem_stats = [
     values: [
       {% for prob in problems %}
         {
-          "label" : "{{prob.shortname}}",
-          "value" : {{ misc.problem_stats.teams_solved[prob.probid]|default([])|length }},
+          "label" : "{{ prob.shortname }}",
+          "value" : {{ misc.problem_stats.teams_solved[prob.probid] | default([]) | length }},
         },
       {% endfor %}
     ]
@@ -344,8 +344,8 @@ nv.addGraph(function() {
 const submission_stats = [
   {% for result in ['correct', 'wrong-answer', 'timelimit', 'run-error', 'compiler-error', 'no-output'] %}
   {
-    key: "{{result}}",
-    color: "{{colors[result]}}",
+    key: "{{ result }}",
+    color: "{{ colors[result] }}",
     values: []
   },
   {% endfor %}

webapp/templates/jury/analysis/problem.html.twig

@@ -4,10 +4,10 @@
 
 {% block extrahead %}
 {{ parent() }}
-<link rel="stylesheet" href="{{asset('css/nv.d3.min.css')}}">
-<script src="{{asset('js/d3.min.js')}}"></script>
-<script src="{{asset('js/nv.d3.min.js')}}"></script>
-<script src="{{asset('js/FileSaver.min.js')}}"></script>
+<link rel="stylesheet" href="{{ asset('css/nv.d3.min.css') }}">
+<script src="{{ asset('js/d3.min.js') }}"></script>
+<script src="{{ asset('js/nv.d3.min.js') }}"></script>
+<script src="{{ asset('js/FileSaver.min.js') }}"></script>
 <style>
 .row.equal {
   display: flex;
@@ -31,16 +31,16 @@
         <div class="card-body">
           <dl class="row">
             <dt class="col-sm-6"># Submissions</dt>
-            <dd class="col-sm-6">{{ submissions|length }}</dd>
+            <dd class="col-sm-6">{{ submissions | length }}</dd>
 
             <dt class="col-sm-6"># Correct</dt>
-            <dd class="col-sm-6">{{ results['correct']|default(0) }} <span class="text-muted">({{ misc.correct_percentage|number_format(2) }}%)</span></dd>
+            <dd class="col-sm-6">{{ results['correct'] | default(0) }} <span class="text-muted">({{ misc.correct_percentage | number_format(2) }}%)</span></dd>
 
             <dt class="col-sm-6"># Teams Attempted</dt>
             <dd class="col-sm-6">{{ misc.num_teams_attempted }}</dd>
 
             <dt class="col-sm-6"># Teams Correct</dt>
-            <dd class="col-sm-6">{{misc.num_teams_correct}} <span class="text-muted">({{  misc.teams_correct_percentage|number_format(2) }}%)</dd>
+            <dd class="col-sm-6">{{ misc.num_teams_correct }} <span class="text-muted">({{  misc.teams_correct_percentage | number_format(2) }}%)</dd>
           </dl>
         </div>
       </div>
@@ -163,9 +163,9 @@ $(function(){
         line = d3.select('#maxruntime svg #maxline')
         .attr({
           x1: chart.margin().left,
-          y1: chart.yAxis.scale()({{timelimit}})+ chart.margin().top,
+          y1: chart.yAxis.scale()({{ timelimit }})+ chart.margin().top,
           x2: +svgsize - chart.margin().right,
-          y2: chart.yAxis.scale()({{timelimit}}) + chart.margin().top,
+          y2: chart.yAxis.scale()({{ timelimit }}) + chart.margin().top,
         })
       }
       updateline();
@@ -184,7 +184,7 @@ $(function(){
         values: [
           {% for result,count in results %}
             {
-              "label" : "{{result}}",
+              "label" : "{{ result }}",
               "value" : {{ count }},
               "color" : "{{ colors[result] }}",
             },
@@ -218,8 +218,8 @@ $(function(){
     const submission_stats = [
       {% for result in ['correct', 'wrong-answer', 'timelimit', 'run-error', 'compiler-error', 'no-output'] %}
       {
-        key: "{{result}}",
-        color: "{{colors[result]}}",
+        key: "{{ result }}",
+        color: "{{ colors[result] }}",
         values: []
       },
       {% endfor %}