Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2019-11-21 12:01:39 +0300
committerGitHub <noreply@github.com>2019-11-21 12:01:39 +0300
commitb6e4ddd73c436ce23ae7036a7170f59b545e46b7 (patch)
tree8770bf0d4eda427ee6161dee2a073d0de5889d12
parent2c20649539ac16e069a65f2a750c793eb341e50f (diff)
[metadata] Remove native threadpool from netcore build (#17856)
We use the managed threadpool there.
-rw-r--r--mono/metadata/threadpool-io.h4
-rw-r--r--mono/metadata/threadpool-worker-default.c17
-rw-r--r--mono/metadata/threadpool-worker-wasm.c12
-rw-r--r--mono/metadata/threadpool-worker.h13
-rw-r--r--mono/utils/mono-complex.h4
5 files changed, 19 insertions, 31 deletions
diff --git a/mono/metadata/threadpool-io.h b/mono/metadata/threadpool-io.h
index da753529b44..7a51863c69f 100644
--- a/mono/metadata/threadpool-io.h
+++ b/mono/metadata/threadpool-io.h
@@ -8,6 +8,8 @@
#include <config.h>
#include <glib.h>
+#ifndef ENABLE_NETCORE
+
#include <mono/metadata/object-internals.h>
#include <mono/metadata/icalls.h>
@@ -26,4 +28,6 @@ mono_threadpool_io_remove_domain_jobs (MonoDomain *domain);
void
mono_threadpool_io_cleanup (void);
+#endif /* ENABLE_NETCORE */
+
#endif /* _MONO_METADATA_THREADPOOL_IO_H_ */
diff --git a/mono/metadata/threadpool-worker-default.c b/mono/metadata/threadpool-worker-default.c
index a0937ff4810..1491597b68f 100644
--- a/mono/metadata/threadpool-worker-default.c
+++ b/mono/metadata/threadpool-worker-default.c
@@ -14,6 +14,8 @@
#include <config.h>
#include <glib.h>
+#ifndef ENABLE_NETCORE
+
#include <mono/metadata/class-internals.h>
#include <mono/metadata/exception.h>
#include <mono/metadata/gc-internals.h>
@@ -349,19 +351,6 @@ mono_threadpool_worker_request (void)
mono_refcount_dec (&worker);
}
-#ifdef ENABLE_NETCORE
-gint64 mono_threadpool_worker_get_completed_threads_count (void)
-{
- return worker.heuristic_completions;
-}
-
-gint32 mono_threadpool_worker_get_threads_count (void)
-{
- ThreadPoolWorkerCounter const counter = COUNTER_READ ();
- return counter._.working;
-}
-#endif
-
/* return TRUE if timeout, FALSE otherwise (worker unpark or interrupt) */
static gboolean
worker_park (void)
@@ -1198,3 +1187,5 @@ mono_threadpool_worker_set_suspended (gboolean suspended)
mono_refcount_dec (&worker);
}
+
+#endif /* ENABLE_NETCORE */
diff --git a/mono/metadata/threadpool-worker-wasm.c b/mono/metadata/threadpool-worker-wasm.c
index 9eaa348f490..3cd3485c56f 100644
--- a/mono/metadata/threadpool-worker-wasm.c
+++ b/mono/metadata/threadpool-worker-wasm.c
@@ -14,6 +14,8 @@
#include <config.h>
#include <glib.h>
+#ifndef ENABLE_NETCORE
+
#include <mono/metadata/threadpool.h>
#include <mono/metadata/threadpool-worker.h>
@@ -76,14 +78,4 @@ mono_threadpool_worker_notify_completed (void)
return FALSE;
}
-#ifdef ENABLE_NETCORE
-gint64 mono_threadpool_worker_get_completed_threads_count (void)
-{
- return 0;
-}
-
-gint32 mono_threadpool_worker_get_threads_count (void)
-{
- return 0;
-}
#endif
diff --git a/mono/metadata/threadpool-worker.h b/mono/metadata/threadpool-worker.h
index 99bf52e38dd..0b37d248290 100644
--- a/mono/metadata/threadpool-worker.h
+++ b/mono/metadata/threadpool-worker.h
@@ -5,8 +5,11 @@
#ifndef _MONO_METADATA_THREADPOOL_WORKER_H
#define _MONO_METADATA_THREADPOOL_WORKER_H
+#include <config.h>
#include <glib.h>
+#ifndef ENABLE_NETCORE
+
typedef void (*MonoThreadPoolWorkerCallback)(void);
void
@@ -21,14 +24,6 @@ mono_threadpool_worker_request (void);
gboolean
mono_threadpool_worker_notify_completed (void);
-#ifdef ENABLE_NETCORE
-gint64
-mono_threadpool_worker_get_completed_threads_count (void);
-
-gint32
-mono_threadpool_worker_get_threads_count (void);
-#endif
-
gint32
mono_threadpool_worker_get_min (void);
gboolean
@@ -42,4 +37,6 @@ mono_threadpool_worker_set_max (gint32 value);
void
mono_threadpool_worker_set_suspended (gboolean suspended);
+#endif /* ENABLE_NETCORE */
+
#endif /* _MONO_METADATA_THREADPOOL_WORKER_H */
diff --git a/mono/utils/mono-complex.h b/mono/utils/mono-complex.h
index e817ac5e472..6b3fe7544ae 100644
--- a/mono/utils/mono-complex.h
+++ b/mono/utils/mono-complex.h
@@ -14,6 +14,8 @@
#define _USE_MATH_DEFINES // needed by MSVC to define math constants
#include <math.h>
+#ifndef ENABLE_NETCORE
+
typedef struct double_complex {
double real;
double imag;
@@ -59,3 +61,5 @@ double_complex mono_double_complex_sub(double_complex left, double_complex right
}
#include "../../support/libm/complex.c"
+
+#endif