aboutsummaryrefslogtreecommitdiffstats
path: root/src/benchmarks
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-01 18:06:28 +0000
committerTom Hacohen <tom@stosb.com>2016-03-03 09:58:08 +0000
commitf21ade6123b9053fca8d1632644c48525a99d6e0 (patch)
treec5eb0445f471d21365a7a5a7b0ec7d279c11b398 /src/benchmarks
parentSome automatic migration and some manual adjustments to calc and text. (diff)
downloadefl-f21ade6123b9053fca8d1632644c48525a99d6e0.tar.gz
Automatic migration to Eo4.
I just ran my script (email to follow) to migrate all of the EFL automatically. This commit is *only* the automatic conversion, so it can be easily reverted and re-run.
Diffstat (limited to 'src/benchmarks')
-rw-r--r--src/benchmarks/eo/class_simple.c2
-rw-r--r--src/benchmarks/eo/eo_bench_callbacks.c6
-rw-r--r--src/benchmarks/eo/eo_bench_eo_do.c12
3 files changed, 10 insertions, 10 deletions
diff --git a/src/benchmarks/eo/class_simple.c b/src/benchmarks/eo/class_simple.c
index 0a57e285fa..a4482726c3 100644
--- a/src/benchmarks/eo/class_simple.c
+++ b/src/benchmarks/eo/class_simple.c
@@ -15,7 +15,7 @@ _other_call(Eo *obj EINA_UNUSED, void *class_data EINA_UNUSED, Eo *other, int ti
{
if (times > 0)
{
- eo_do(other, simple_other_call(obj, times-1));
+ simple_other_call(other, obj, times-1);
}
}
diff --git a/src/benchmarks/eo/eo_bench_callbacks.c b/src/benchmarks/eo/eo_bench_callbacks.c
index 5f675598f3..ab779f8417 100644
--- a/src/benchmarks/eo/eo_bench_callbacks.c
+++ b/src/benchmarks/eo/eo_bench_callbacks.c
@@ -21,7 +21,7 @@ bench_eo_callbacks_add(int request)
for (i = 0 ; i < request ; i++)
{
- eo_do(obj, eo_event_callback_priority_add(SIMPLE_FOO, (short) i, _cb, NULL));
+ eo_event_callback_priority_add(obj, SIMPLE_FOO, (short) i, _cb, NULL);
}
eo_unref(obj);
@@ -57,7 +57,7 @@ bench_eo_callbacks_call(int request)
for (j = 0 ; j < i ; j++)
{
- eo_do(obj[i], eo_event_callback_priority_add(SIMPLE_FOO, (short) j, _cb, NULL));
+ eo_event_callback_priority_add(obj[i], SIMPLE_FOO, (short) j, _cb, NULL);
}
}
@@ -66,7 +66,7 @@ bench_eo_callbacks_call(int request)
for (j = 0 ; j < (int) (distribution[i] * request) ; j++)
{
/* Miss finding the callbacks on purpose, so we measure worst case scenario. */
- eo_do(obj[i], eo_event_callback_call(SIMPLE_BAR, NULL));
+ eo_event_callback_call(obj[i], SIMPLE_BAR, NULL);
}
}
diff --git a/src/benchmarks/eo/eo_bench_eo_do.c b/src/benchmarks/eo/eo_bench_eo_do.c
index 2bcdc4246e..9f84535254 100644
--- a/src/benchmarks/eo/eo_bench_eo_do.c
+++ b/src/benchmarks/eo/eo_bench_eo_do.c
@@ -13,7 +13,7 @@ bench_eo_do_simple(int request)
Eo *obj = eo_add(SIMPLE_CLASS, NULL);
for (i = 0 ; i < request ; i++)
{
- eo_do(obj, simple_a_set(i));
+ simple_a_set(obj, i);
}
eo_unref(obj);
@@ -27,8 +27,8 @@ bench_eo_do_two_objs(int request)
Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
for (i = 0 ; i < request ; i++)
{
- eo_do(obj, simple_a_set(i));
- eo_do(obj2, simple_a_set(i));
+ simple_a_set(obj, i);
+ simple_a_set(obj2, i);
}
eo_unref(obj);
@@ -43,7 +43,7 @@ bench_eo_do_two_objs_growing_stack(int request)
Eo *obj2 = eo_add(SIMPLE_CLASS, NULL);
for (i = 0 ; i < request ; i++)
{
- eo_do(obj, simple_other_call(obj2, 20));
+ simple_other_call(obj, obj2, 20);
}
eo_unref(obj);
@@ -55,7 +55,7 @@ static const Eo_Class *cur_klass;
static void
_a_set(Eo *obj, void *class_data EINA_UNUSED, int a)
{
- eo_do_super(obj, cur_klass, simple_a_set(a));
+ simple_a_set(eo_super(obj, cur_klass), a);
}
static Eo_Op_Description op_desc[] = {
@@ -81,7 +81,7 @@ bench_eo_do_super(int request)
Eo *obj = eo_add(cur_klass, NULL);
for (i = 0 ; i < request ; i++)
{
- eo_do(obj, simple_a_set(i));
+ simple_a_set(obj, i);
}
eo_unref(obj);