projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[mcs] Accept and ignore command line args supported by csc that we don't
[mono.git]
/
mono
/
utils
/
mono-conc-hashtable.c
diff --git
a/mono/utils/mono-conc-hashtable.c
b/mono/utils/mono-conc-hashtable.c
index 30521b2af9ef81e221add9051db5cbf3f46a299f..58cf945facf0a0136f920c2f94d72622df4c7ea9 100644
(file)
--- a/
mono/utils/mono-conc-hashtable.c
+++ b/
mono/utils/mono-conc-hashtable.c
@@
-48,7
+48,7
@@
conc_table_new (int size)
static void
conc_table_free (gpointer ptr)
{
static void
conc_table_free (gpointer ptr)
{
- conc_table *table = ptr;
+ conc_table *table =
(conc_table *)
ptr;
g_free (table->kvs);
g_free (table);
}
g_free (table->kvs);
g_free (table);
}
@@
-56,7
+56,7
@@
conc_table_free (gpointer ptr)
static void
conc_table_lf_free (conc_table *table)
{
static void
conc_table_lf_free (conc_table *table)
{
- mono_thread_hazardous_free_or_queue (table, conc_table_free,
TRUE, FALSE
);
+ mono_thread_hazardous_free_or_queue (table, conc_table_free,
HAZARD_FREE_MAY_LOCK, HAZARD_FREE_SAFE_CTX
);
}
}
@@
-164,7
+164,7
@@
mono_conc_hashtable_lookup (MonoConcurrentHashTable *hash_table, gpointer key)
hp = mono_hazard_pointer_get ();
retry:
hp = mono_hazard_pointer_get ();
retry:
- table = get_hazardous_pointer ((gpointer volatile*)&hash_table->table, hp, 0);
+ table =
(conc_table *)
get_hazardous_pointer ((gpointer volatile*)&hash_table->table, hp, 0);
table_mask = table->table_size - 1;
kvs = table->kvs;
i = hash & table_mask;
table_mask = table->table_size - 1;
kvs = table->kvs;
i = hash & table_mask;