[threads] Rework MonoThreadInfoCallbacks.thread_{register,detach,unregister} callback...

[mono.git] / mono / unit-tests / test-conc-hashtable.c

diff --git a/mono/unit-tests/test-conc-hashtable.c b/mono/unit-tests/test-conc-hashtable.c
index 23865ad88441b185637df6aec6dc1d094e3586d6..f01f01b574aa55c9cc9eb69afc51c8ffd0e88b09 100644 (file)
--- a/mono/unit-tests/test-conc-hashtable.c
+++ b/mono/unit-tests/test-conc-hashtable.c
@@ -3,18 +3,7 @@
  *
  * Copyright (C) 2014 Xamarin Inc
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License 2.0 as published by the Free Software Foundation;
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License 2.0 along with this library; if not, write to the Free
- * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
 #include "config.h"
@@ -22,6 +11,7 @@
 #include "utils/mono-threads.h"
 #include "utils/mono-conc-hashtable.h"
 #include "utils/checked-build.h"
+#include "metadata/w32handle.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -79,7 +69,7 @@ static void*
 pw_sr_thread (void *arg)
 {
        int i, idx = 1000 * GPOINTER_TO_INT (arg);
-       mono_thread_info_attach ((gpointer)&arg);
+       mono_thread_info_attach ();
 
        for (i = 0; i < 1000; ++i) {
                mono_os_mutex_lock (&global_mutex);
@@ -128,7 +118,7 @@ static void*
 pr_sw_thread (void *arg)
 {
        int i = 0, idx = 100 * GPOINTER_TO_INT (arg);
-       mono_thread_info_attach ((gpointer)&arg);
+       mono_thread_info_attach ();
 
        while (i < 100) {
                gpointer res = mono_conc_hashtable_lookup (hash, GINT_TO_POINTER (i + idx + 1));
@@ -188,7 +178,7 @@ static void*
 pw_pr_r_thread (void *arg)
 {
        int key, val, i;
-       mono_thread_info_attach ((gpointer)&arg);
+       mono_thread_info_attach ();
 
        /* i will not be incremented as long as running is set to 1, this guarantee that
           we loop over all the keys at least once after the writer threads have finished */
@@ -210,7 +200,7 @@ pw_pr_w_add_thread (void *arg)
 {
        int i, idx = 1000 * GPOINTER_TO_INT (arg);
 
-       mono_thread_info_attach ((gpointer)&arg);
+       mono_thread_info_attach ();
 
        for (i = idx; i < idx + 1000; i++) {
                mono_os_mutex_lock (&global_mutex);
@@ -225,7 +215,7 @@ pw_pr_w_del_thread (void *arg)
 {
        int i, idx = 1000 * GPOINTER_TO_INT (arg);
 
-       mono_thread_info_attach ((gpointer)&arg);
+       mono_thread_info_attach ();
 
        for (i = idx; i < idx + 1000; i++) {
                mono_os_mutex_lock (&global_mutex);
@@ -328,15 +318,29 @@ benchmark_glib (void)
        g_hash_table_destroy (h);
 }
 
+static void
+thread_state_init (MonoThreadUnwindState *ctx)
+{
+}
+
+
 int
 main (void)
 {
        MonoThreadInfoCallbacks cb = { NULL };
+       MonoThreadInfoRuntimeCallbacks ticallbacks;
        int res = 0;
 
        CHECKED_MONO_INIT ();
        mono_threads_init (&cb, sizeof (MonoThreadInfo));
-       mono_thread_info_attach ((gpointer)&cb);
+       memset (&ticallbacks, 0, sizeof (ticallbacks));
+       ticallbacks.thread_state_init = thread_state_init;
+       mono_threads_runtime_init (&ticallbacks);
+#ifndef HOST_WIN32
+       mono_w32handle_init ();
+#endif
+
+       mono_thread_info_attach ();
 
        // benchmark_conc ();
        // benchmark_glib ();