finish removing threadsafe stuff

SVN revision: 51687
This commit is contained in:
Mike Blumenkrantz 2010-08-27 21:41:03 +00:00
parent b61db77029
commit 7a5677ad43
4 changed files with 4 additions and 21 deletions

View File

@ -76,7 +76,6 @@ struct _Eina_Array
};
EAPI Eina_Array * eina_array_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_WARN_UNUSED_RESULT;
EAPI Eina_Array * eina_array_threadsafe_new(unsigned int step) EINA_WARN_UNUSED_RESULT EINA_MALLOC EINA_WARN_UNUSED_RESULT;
EAPI void eina_array_free(Eina_Array *array) EINA_ARG_NONNULL(1);
EAPI void eina_array_step_set(Eina_Array *array,
unsigned int sizeof_eina_array,

View File

@ -70,18 +70,6 @@ EAPI Eina_Hash * eina_hash_int32_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_int64_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_pointer_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_stringshared_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_new(Eina_Key_Length key_length_cb,
Eina_Key_Cmp key_cmp_cb,
Eina_Key_Hash key_hash_cb,
Eina_Free_Cb data_free_cb,
int buckets_power_size) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(2, 3);
EAPI Eina_Hash * eina_hash_threadsafe_string_djb2_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_string_superfast_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_string_small_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_int32_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_int64_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_pointer_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Hash * eina_hash_threadsafe_stringshared_new(Eina_Free_Cb data_free_cb);
EAPI Eina_Bool eina_hash_add(Eina_Hash *hash,
const void *key,
const void *data) EINA_ARG_NONNULL(1, 2, 3);

View File

@ -88,23 +88,20 @@ eina_bench_array_4evas_render_inline(int request)
if (i == 500)
{
EINA_ARRAY_THREADSAFE_ITER_NEXT(array, j, ebo, it,
EINA_ARRAY_ITER_NEXT(array, j, ebo, it)
free(ebo);
);
eina_array_clean(array);
}
else if (i % 30 == 0)
eina_array_remove(array, keep, NULL);
EINA_ARRAY_THREADSAFE_ITER_NEXT(array, j, ebo, it,
EINA_ARRAY_ITER_NEXT(array, j, ebo, it)
ebo->keep = rand() < (RAND_MAX / 2) ? ebo->keep : EINA_FALSE;
);
}
EINA_ARRAY_THREADSAFE_ITER_NEXT(array, j, ebo, it,
EINA_ARRAY_ITER_NEXT(array, j, ebo, it)
free(ebo);
);
eina_array_free(array);

View File

@ -344,9 +344,8 @@ eina_bench_lookup_evas(int request)
evas_hash_free(hash);
EINA_ARRAY_THREADSAFE_ITER_NEXT(array, i, tmp_val, it,
EINA_ARRAY_ITER_NEXT(array, i, tmp_val, it)
free(tmp_val);
);
eina_array_free(array);
}