projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[runtime] Use HOST_ defines instead of PLATFORM_ defines. (#5362)
[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 32d859c50d56cee18c92a9518db37a9c762a0597..b7868f6bda7a7f9f23cc2d00d369821c3a1600e1 100644
(file)
--- a/
mono/unit-tests/test-conc-hashtable.c
+++ b/
mono/unit-tests/test-conc-hashtable.c
@@
-11,6
+11,7
@@
#include "utils/mono-threads.h"
#include "utils/mono-conc-hashtable.h"
#include "utils/checked-build.h"
#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>
#include <stdlib.h>
#include <string.h>
@@
-68,7
+69,7
@@
static void*
pw_sr_thread (void *arg)
{
int i, idx = 1000 * GPOINTER_TO_INT (arg);
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);
for (i = 0; i < 1000; ++i) {
mono_os_mutex_lock (&global_mutex);
@@
-117,7
+118,7
@@
static void*
pr_sw_thread (void *arg)
{
int i = 0, idx = 100 * GPOINTER_TO_INT (arg);
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));
while (i < 100) {
gpointer res = mono_conc_hashtable_lookup (hash, GINT_TO_POINTER (i + idx + 1));
@@
-177,7
+178,7
@@
static void*
pw_pr_r_thread (void *arg)
{
int key, val, i;
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 */
/* 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 */
@@
-199,7
+200,7
@@
pw_pr_w_add_thread (void *arg)
{
int i, idx = 1000 * GPOINTER_TO_INT (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);
for (i = idx; i < idx + 1000; i++) {
mono_os_mutex_lock (&global_mutex);
@@
-214,7
+215,7
@@
pw_pr_w_del_thread (void *arg)
{
int i, idx = 1000 * GPOINTER_TO_INT (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);
for (i = idx; i < idx + 1000; i++) {
mono_os_mutex_lock (&global_mutex);
@@
-326,17
+327,19
@@
thread_state_init (MonoThreadUnwindState *ctx)
int
main (void)
{
int
main (void)
{
- MonoThreadInfoCallbacks cb = { NULL };
MonoThreadInfoRuntimeCallbacks ticallbacks;
int res = 0;
CHECKED_MONO_INIT ();
MonoThreadInfoRuntimeCallbacks ticallbacks;
int res = 0;
CHECKED_MONO_INIT ();
- mono_thread
s_init (&cb,
sizeof (MonoThreadInfo));
+ mono_thread
_info_init (
sizeof (MonoThreadInfo));
memset (&ticallbacks, 0, sizeof (ticallbacks));
ticallbacks.thread_state_init = thread_state_init;
memset (&ticallbacks, 0, sizeof (ticallbacks));
ticallbacks.thread_state_init = thread_state_init;
- mono_threads_runtime_init (&ticallbacks);
+ mono_thread_info_runtime_init (&ticallbacks);
+#ifndef HOST_WIN32
+ mono_w32handle_init ();
+#endif
- mono_thread_info_attach (
(gpointer)&cb
);
+ mono_thread_info_attach ();
// benchmark_conc ();
// benchmark_glib ();
// benchmark_conc ();
// benchmark_glib ();