EAPI int eina_counter_init(void);
EAPI int eina_counter_shutdown(void);
-EAPI Eina_Counter *eina_counter_add(const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
-EAPI void eina_counter_delete(Eina_Counter *counter) EINA_ARG_NONNULL(1);
+EAPI Eina_Counter *eina_counter_new(const char *name) EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EAPI void eina_counter_free(Eina_Counter *counter) EINA_ARG_NONNULL(1);
EAPI void eina_counter_start(Eina_Counter *counter) EINA_ARG_NONNULL(1);
EAPI void eina_counter_stop(Eina_Counter *counter, int specimen) EINA_ARG_NONNULL(1);
}
static inline void *
-eina_mempool_alloc(Eina_Mempool *mp, unsigned int size)
+eina_mempool_malloc(Eina_Mempool *mp, unsigned int size)
{
return mp->backend.alloc(mp->backend_data, size);
}
typedef struct _Eina_Lalloc Eina_Lalloc;
EAPI Eina_Lalloc *eina_lalloc_new(void *data, Eina_Lalloc_Alloc alloc_cb, Eina_Lalloc_Free free_cb, int num_init) EINA_ARG_NONNULL(2, 3);
-EAPI void eina_lalloc_delete(Eina_Lalloc *a) EINA_ARG_NONNULL(1);
+EAPI void eina_lalloc_free(Eina_Lalloc *a) EINA_ARG_NONNULL(1);
EAPI Eina_Bool eina_lalloc_elements_add(Eina_Lalloc *a, int num) EINA_ARG_NONNULL(1);
EAPI Eina_Bool eina_lalloc_element_add(Eina_Lalloc *a) EINA_ARG_NONNULL(1);
EAPI int eina_mempool_init(void);
EAPI int eina_mempool_shutdown(void);
-EAPI Eina_Mempool * eina_mempool_new(const char *module, const char *context, const char *options, ...) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
-EAPI void eina_mempool_delete(Eina_Mempool *mp) EINA_ARG_NONNULL(1);
+EAPI Eina_Mempool * eina_mempool_add(const char *module, const char *context, const char *options, ...) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
+EAPI void eina_mempool_del(Eina_Mempool *mp) EINA_ARG_NONNULL(1);
static inline void * eina_mempool_realloc(Eina_Mempool *mp, void *element, unsigned int size) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
-static inline void * eina_mempool_alloc(Eina_Mempool *mp, unsigned int size) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
+static inline void * eina_mempool_malloc(Eina_Mempool *mp, unsigned int size) EINA_MALLOC EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT;
static inline void eina_mempool_free(Eina_Mempool *mp, void *element) EINA_ARG_NONNULL(1);
EAPI void eina_mempool_gc(Eina_Mempool *mp) EINA_ARG_NONNULL(1);
EAPI int eina_module_shutdown(void);
EAPI Eina_Module * eina_module_new(const char *file) EINA_MALLOC EINA_WARN_UNUSED_RESULT EINA_ARG_NONNULL(1);
-EAPI Eina_Bool eina_module_delete(Eina_Module *m) EINA_ARG_NONNULL(1);
+EAPI Eina_Bool eina_module_free(Eina_Module *m) EINA_ARG_NONNULL(1);
EAPI Eina_Bool eina_module_load(Eina_Module *module) EINA_ARG_NONNULL(1);
EAPI Eina_Bool eina_module_unload(Eina_Module *m) EINA_ARG_NONNULL(1);
EAPI void *eina_module_symbol_get(Eina_Module *module, const char *symbol) EINA_PURE EINA_ARG_NONNULL(1, 2) EINA_WARN_UNUSED_RESULT;
typedef struct _Eina_Tiler Eina_Tiler;
EAPI Eina_Tiler *eina_tiler_new(int w, int h);
-EAPI void eina_tiler_del(Eina_Tiler *t);
+EAPI void eina_tiler_free(Eina_Tiler *t);
EAPI void eina_tiler_tile_size_set(Eina_Tiler *t, int w, int h);
EAPI Eina_Bool eina_tiler_rect_add(Eina_Tiler *t, Eina_Rectangle *r);
EAPI void eina_tiler_rect_del(Eina_Tiler *t, Eina_Rectangle *r);
eina_array_push(ea, strdup(buffer));
- counter = eina_counter_add(run->name);
+ counter = eina_counter_new(run->name);
for (i = run->start; i < run->end; i += run->step)
{
free(result);
}
- eina_counter_delete(counter);
+ eina_counter_free(counter);
fclose(current_data);
*
* The counter system must be initialized with eina_counter_init() and
* shut down with eina_counter_shutdown(). The create a counter, use
- * eina_counter_add(). To free it, use eina_counter_delete().
+ * eina_counter_new(). To free it, use eina_counter_free().
*
* To time a part of a code, call eina_counter_start() just before it,
* and eina_counter_stop() just after it. Each time you start to time
* return EXIT_FAILURE;
* }
*
- * counter = eina_counter_add("malloc");
+ * counter = eina_counter_new("malloc");
*
* eina_counter_start(counter);
* test_malloc();
*
* eina_counter_dump(counter);
*
- * eina_counter_delete(counter);
+ * eina_counter_free(counter);
* eina_counter_shutdown();
*
* return EXIT_SUCCESS;
* error is set to #EINA_ERROR_OUT_OF_MEMORY.
*/
EAPI Eina_Counter *
-eina_counter_add(const char *name)
+eina_counter_new(const char *name)
{
Eina_Counter *counter;
size_t length;
* immediatly.
*/
EAPI void
-eina_counter_delete(Eina_Counter *counter)
+eina_counter_free(Eina_Counter *counter)
{
EINA_SAFETY_ON_NULL_RETURN(counter);
return a;
}
-EAPI void eina_lalloc_delete(Eina_Lalloc *a)
+EAPI void eina_lalloc_free(Eina_Lalloc *a)
{
EINA_SAFETY_ON_NULL_RETURN(a);
EINA_SAFETY_ON_NULL_RETURN(a->free_cb);
{
Eina_List_Accounting *tmp;
- tmp = eina_mempool_alloc(_eina_list_accounting_mp, sizeof (Eina_List_Accounting));
+ tmp = eina_mempool_malloc(_eina_list_accounting_mp, sizeof (Eina_List_Accounting));
if (!tmp) return NULL;
EINA_MAGIC_SET(tmp, EINA_MAGIC_LIST_ACCOUNTING);
{
Eina_List *tmp;
- tmp = eina_mempool_alloc(_eina_list_mp, sizeof (Eina_List));
+ tmp = eina_mempool_malloc(_eina_list_mp, sizeof (Eina_List));
if (!tmp) return NULL;
EINA_MAGIC_SET(tmp, EINA_MAGIC_LIST);
choice = "chained_mempool";
#endif
- _eina_list_mp = eina_mempool_new(choice, "list", NULL,
+ _eina_list_mp = eina_mempool_add(choice, "list", NULL,
sizeof (Eina_List), 320);
if (!_eina_list_mp)
{
EINA_ERROR_PERR("ERROR: Mempool for list cannot be allocated in list init.\n");
goto on_init_fail;
}
- _eina_list_accounting_mp = eina_mempool_new(choice, "list_accounting", NULL,
+ _eina_list_accounting_mp = eina_mempool_add(choice, "list_accounting", NULL,
sizeof (Eina_List_Accounting), 80);
if (!_eina_list_accounting_mp)
{
EINA_ERROR_PERR("ERROR: Mempool for list accounting cannot be allocated in list init.\n");
- eina_mempool_delete(_eina_list_mp);
+ eina_mempool_del(_eina_list_mp);
goto on_init_fail;
}
if (!_eina_list_init_count)
{
- eina_mempool_delete(_eina_list_accounting_mp);
- eina_mempool_delete(_eina_list_mp);
+ eina_mempool_del(_eina_list_accounting_mp);
+ eina_mempool_del(_eina_list_mp);
eina_mempool_shutdown();
eina_magic_string_shutdown();
}
EAPI Eina_Mempool *
-eina_mempool_new(const char *name, const char *context, const char *options, ...)
+eina_mempool_add(const char *name, const char *context, const char *options, ...)
{
Eina_Mempool *mp;
va_list args;
return mp;
}
-EAPI void eina_mempool_delete(Eina_Mempool *mp)
+EAPI void eina_mempool_del(Eina_Mempool *mp)
{
EINA_SAFETY_ON_NULL_RETURN(mp);
EINA_SAFETY_ON_NULL_RETURN(mp->backend.shutdown);
return;
/* call the user provided cb on this module */
if (!cb_data->cb(m, cb_data->data))
- eina_module_delete(m);
+ eina_module_free(m);
}
}
static int _eina_module_count = 0;
return m;
}
-EAPI Eina_Bool eina_module_delete(Eina_Module *m)
+EAPI Eina_Bool eina_module_free(Eina_Module *m)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(m, EINA_FALSE);
/**
* Helper function that iterates over the list of modules and calls
- * eina_module_delete on each
+ * eina_module_free on each
*/
EAPI void eina_module_list_delete(Eina_Array *array)
{
EINA_SAFETY_ON_NULL_RETURN(array);
EINA_ARRAY_ITER_NEXT(array, i, m, iterator)
- eina_module_delete(m);
+ eina_module_free(m);
eina_array_flush(array);
}
{
Eina_Rectangle *rect;
- rect = eina_mempool_alloc(_eina_rectangle_mp, sizeof (Eina_Rectangle));
+ rect = eina_mempool_malloc(_eina_rectangle_mp, sizeof (Eina_Rectangle));
if (!rect) return NULL;
EINA_RECTANGLE_SET(rect, x, y, w, h);
if (x == -1) return NULL;
pool->sorted = EINA_FALSE;
- new = eina_mempool_alloc(_eina_rectangle_alloc_mp,
- sizeof (Eina_Rectangle_Alloc) + sizeof (Eina_Rectangle));
+ new = eina_mempool_malloc(_eina_rectangle_alloc_mp,
+ sizeof (Eina_Rectangle_Alloc) + sizeof (Eina_Rectangle));
if (!new) return NULL;
rect = (Eina_Rectangle*) (new + 1);
choice = "chained_mempool";
#endif
- _eina_rectangle_alloc_mp = eina_mempool_new(choice, "rectangle-alloc", NULL,
+ _eina_rectangle_alloc_mp = eina_mempool_add(choice, "rectangle-alloc", NULL,
sizeof (Eina_Rectangle_Alloc) + sizeof (Eina_Rectangle), 42);
if (!_eina_rectangle_alloc_mp)
{
goto init_error;
}
- _eina_rectangle_mp = eina_mempool_new(choice, "rectangle", NULL, sizeof (Eina_Rectangle), 256);
+ _eina_rectangle_mp = eina_mempool_add(choice, "rectangle", NULL, sizeof (Eina_Rectangle), 256);
if (!_eina_rectangle_mp)
{
EINA_ERROR_PERR("ERROR: Mempool for rectangle cannot be allocated in list init.\n");
if (_eina_rectangle_init_count) return _eina_rectangle_init_count;
- eina_mempool_delete(_eina_rectangle_alloc_mp);
- eina_mempool_delete(_eina_rectangle_mp);
+ eina_mempool_del(_eina_rectangle_alloc_mp);
+ eina_mempool_del(_eina_rectangle_mp);
eina_mempool_shutdown();
eina_error_shutdown();
* To be documented
* FIXME: To be fixed
*/
-EAPI void eina_tiler_del(Eina_Tiler *t)
+EAPI void eina_tiler_free(Eina_Tiler *t)
{
EINA_MAGIC_CHECK_TILER(t);
_splitter_del(t);
{
for (j = 0; j < request; ++j)
{
- eina_array_push(array, eina_mempool_alloc(mp, sizeof (int)));
+ eina_array_push(array, eina_mempool_malloc(mp, sizeof (int)));
}
for (j = 0; j < request; ++j)
{
Eina_Mempool *mp;
- mp = eina_mempool_new("chained_mempool", "test", NULL, sizeof (int), 256);
+ mp = eina_mempool_add("chained_mempool", "test", NULL, sizeof (int), 256);
_eina_mempool_bench(mp, request);
- eina_mempool_delete(mp);
+ eina_mempool_del(mp);
}
static void
{
Eina_Mempool *mp;
- mp = eina_mempool_new("pass_through", "test", NULL, sizeof (int), 8, 0);
+ mp = eina_mempool_add("pass_through", "test", NULL, sizeof (int), 8, 0);
_eina_mempool_bench(mp, request);
- eina_mempool_delete(mp);
+ eina_mempool_del(mp);
}
static void
{
Eina_Mempool *mp;
- mp = eina_mempool_new("fixed_bitmap", "test", NULL, sizeof (int));
+ mp = eina_mempool_add("fixed_bitmap", "test", NULL, sizeof (int));
_eina_mempool_bench(mp, request);
- eina_mempool_delete(mp);
+ eina_mempool_del(mp);
}
#ifdef EINA_EMEMOA_SUPPORT
{
Eina_Mempool *mp;
- mp = eina_mempool_new("ememoa_fixed", "test", NULL, sizeof (int), 8, 0);
+ mp = eina_mempool_add("ememoa_fixed", "test", NULL, sizeof (int), 8, 0);
_eina_mempool_bench(mp, request);
- eina_mempool_delete(mp);
+ eina_mempool_del(mp);
}
static void
{
Eina_Mempool *mp;
- mp = eina_mempool_new("ememoa_unknown", "test", NULL, 0, 2, sizeof (int), 8, sizeof (int) * 2, 8);
+ mp = eina_mempool_add("ememoa_unknown", "test", NULL, 0, 2, sizeof (int), 8, sizeof (int) * 2, 8);
_eina_mempool_bench(mp, request);
- eina_mempool_delete(mp);
+ eina_mempool_del(mp);
}
#endif
{
Eina_Counter *cnt;
- cnt = eina_counter_add(str->name);
+ cnt = eina_counter_new(str->name);
eina_counter_start(cnt);
fprintf(stderr, "For `%s`:\n", str->name);
eina_counter_dump(cnt);
- eina_counter_delete(cnt);
+ eina_counter_free(cnt);
}
#endif
eina_counter_init();
- cnt = eina_counter_add("eina_test");
+ cnt = eina_counter_new("eina_test");
fail_if(!cnt);
eina_counter_start(cnt);
free(dump);
- eina_counter_delete(cnt);
+ eina_counter_free(cnt);
eina_counter_shutdown();
}
eina_counter_init();
- cnt = eina_counter_add("eina_test");
+ cnt = eina_counter_new("eina_test");
fail_if(!cnt);
eina_counter_stop(cnt, 10);
- eina_counter_delete(cnt);
+ eina_counter_free(cnt);
dump = eina_counter_dump(NULL);
fail_if(dump);
fail_if(eina_lalloc_elements_add(test, 50) != EINA_FALSE);
- eina_lalloc_delete(test);
+ eina_lalloc_free(test);
}
END_TEST
for (i = 0; i < 512; ++i)
{
- tbl[i] = eina_mempool_alloc(mp, sizeof (int));
+ tbl[i] = eina_mempool_malloc(mp, sizeof (int));
fail_if(!tbl[i]);
*tbl[i] = i;
}
eina_mempool_statistics(mp);
}
- eina_mempool_delete(mp);
+ eina_mempool_del(mp);
}
START_TEST(eina_mempool_init_shutdown)
_mempool_init();
- mp = eina_mempool_new("test", "test", NULL);
+ mp = eina_mempool_add("test", "test", NULL);
fail_if(mp != NULL);
_mempool_shutdown();
_mempool_init();
- mp = eina_mempool_new("chained_mempool", "test", NULL, sizeof (int), 256);
+ mp = eina_mempool_add("chained_mempool", "test", NULL, sizeof (int), 256);
_eina_mempool_test(mp, EINA_FALSE, EINA_FALSE);
_mempool_shutdown();
_mempool_init();
- mp = eina_mempool_new("pass_through", "test", NULL, sizeof (int), 8, 0);
+ mp = eina_mempool_add("pass_through", "test", NULL, sizeof (int), 8, 0);
_eina_mempool_test(mp, EINA_TRUE, EINA_FALSE);
_mempool_shutdown();
_mempool_init();
- mp = eina_mempool_new("fixed_bitmap", "test", NULL, sizeof (int));
+ mp = eina_mempool_add("fixed_bitmap", "test", NULL, sizeof (int));
_eina_mempool_test(mp, EINA_FALSE, EINA_FALSE);
_mempool_shutdown();
_mempool_init();
- mp = eina_mempool_new("ememoa_fixed", "test", NULL, sizeof (int), 8, 0);
+ mp = eina_mempool_add("ememoa_fixed", "test", NULL, sizeof (int), 8, 0);
_eina_mempool_test(mp, EINA_FALSE, EINA_TRUE);
_mempool_shutdown();
_mempool_init();
- mp = eina_mempool_new("ememoa_unknown", "test", NULL, 0, 2, sizeof (int), 8, sizeof (int) * 2, 8);
+ mp = eina_mempool_add("ememoa_unknown", "test", NULL, 0, 2, sizeof (int), 8, sizeof (int) * 2, 8);
_eina_mempool_test(mp, EINA_TRUE, EINA_TRUE);
_mempool_shutdown();