1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
|
Description: Fix autopkgtest against Octave 7
Author: Sébastien Villemot <sebastien@debian.org>
Bug: https://savannah.gnu.org/bugs/?62349
Last-Update: 2022-04-25
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/__octave_server__.cc
+++ b/src/__octave_server__.cc
@@ -317,7 +317,7 @@ Undocumented internal function.\n\
#endif // HAVE_LIBGNUTLS
// determine own number of usable processor cores
- uint32_t nproc = num_processors (NPROC_CURRENT);
+ uint32_t nproc = octave_num_processors_wrapper (NPROC_CURRENT);
// The servers command stream will not be inserted into a
// connection object.
--- a/src/p-control.cc
+++ b/src/p-control.cc
@@ -286,7 +286,7 @@ namespace octave_parallel
}
else
{
- nproc_max = num_processors (NPROC_CURRENT);
+ nproc_max = octave_num_processors_wrapper (NPROC_CURRENT);
gnulib_pollfds = gnulib_alloc_pollfds (nproc_max);
}
--- a/src/parallel-gnutls.h
+++ b/src/parallel-gnutls.h
@@ -58,7 +58,7 @@ enum nproc_query
/* Return the total number of processors. The result is guaranteed to
be at least 1. */
-extern unsigned long int num_processors (enum nproc_query query);
+extern unsigned long int octave_num_processors_wrapper (enum nproc_query query);
}
--- a/src/pconnect.cc
+++ b/src/pconnect.cc
@@ -407,7 +407,7 @@ sclose (sockets);\n\
network->insert_connection (conn, 0);
// store number of processor cores available in client
- conn->set_nproc (num_processors (NPROC_CURRENT));
+ conn->set_nproc (octave_num_processors_wrapper (NPROC_CURRENT));
for (uint32_t i = 0; i < nhosts; i++)
{
|
