Skip to content

Commit 9a6db0d

Browse files
authored
Merge branch 'BOINC:master' into Vulpine05_NewColumns
2 parents 98e1739 + 382bcea commit 9a6db0d

14 files changed

+31
-2
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ jobs:
125125
run:
126126
cmake --build build
127127

128-
- name: Build libraries for amd64
128+
- name: Build libraries for arm64
129129
if: success() && matrix.type == 'libs-arm64'
130130
run: |
131131
./linux/arm64/build_libraries_arm64.sh
132132
133-
- name: Build apps for amd64
133+
- name: Build apps for arm64
134134
if: success() && matrix.type == 'apps-arm64'
135135
run: |
136136
./linux/arm64/build_libraries_arm64.sh

lib/cc_config.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,9 @@ int EXCLUDE_GPU::parse(XML_PARSER& xp) {
274274
if (!xp.is_tag) continue;
275275
if (xp.match_tag("/exclude_gpu")) {
276276
if (!found_url) return ERR_XML_PARSE;
277+
if (device_num >= MAX_COPROC_INSTANCES) {
278+
return ERR_XML_PARSE;
279+
}
277280
return 0;
278281
}
279282
if (xp.parse_string("url", url)) {

sched/db_dump.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include <cstdio>
3131
#include <cstring>
3232
#include <cstdlib>
33+
#include <ctime>
3334
#include <unistd.h>
3435
#include <sys/types.h>
3536
#include <sys/stat.h>

sched/message_handler.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "config.h"
2929
#include <unistd.h>
3030
#include <cstdlib>
31+
#include <ctime>
3132
#include <string>
3233

3334
#include "boinc_db.h"

sched/sched_locality.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626

2727
#include <algorithm>
2828
#include <climits>
29+
#include <ctime>
2930
#include <vector>
3031

3132
#include <cstdio>

sched/sched_main.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
#include "config.h"
3232
#include <cassert>
33+
#include <ctime>
3334
#ifdef _USING_FCGI_
3435
#include "boinc_fcgi.h"
3536
#else

sched/sched_resend.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
#include <cstdlib>
3030
#include <cstring>
31+
#include <ctime>
3132
#include <string>
3233

3334
#include "error_numbers.h"

sched/sched_result.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#include "sched_config.h"
3131

3232
#include "sched_result.h"
33+
#include <ctime>
3334

3435
// got a SUCCESS result; double max jobs per day.
3536
// TODO: shouldn't we do this only for valid results?

sched/sched_types.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <vector>
2424
#include <string>
2525
#include <cstring>
26+
#include <ctime>
2627

2728
#include "parse.h"
2829
#include "error_numbers.h"

sched/sched_util.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
// utility functions for BOINC server programs
1919

2020
#include "config.h"
21+
#include <ctime>
2122

2223
#include "boinc_db.h"
2324
#include "sched_util.h"

0 commit comments

Comments
 (0)