zehortigoza pushed a commit to branch master.
commit fe6dbda0e18743eba6568ac36cff643f15442c26
Author: José Roberto de Souza <[email protected]>
Date: Thu Jul 18 19:00:57 2013 -0300
edje: Refactor signal callbacks flags
Share a byte with 2 matchs and use bitwise operations to read/write they
states
is not much readable and easily could lead a issues.
Use a struct is much simpler and only will coast a half of byte per match.
---
ChangeLog | 4 ++
src/lib/edje/edje_match.c | 4 +-
src/lib/edje/edje_private.h | 14 +++--
src/lib/edje/edje_program.c | 5 +-
src/lib/edje/edje_signal.c | 130 ++++++++++----------------------------------
5 files changed, 46 insertions(+), 111 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9bf5911..0fec98a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-22 José Roberto de Souza
+
+ * Edje: Refactor signal callbacks flags
+
2013-07-19 Cedric Bail
* Edje: add threshold to draggable part.
diff --git a/src/lib/edje/edje_match.c b/src/lib/edje/edje_match.c
index 4ebff50..573191f 100644
--- a/src/lib/edje/edje_match.c
+++ b/src/lib/edje/edje_match.c
@@ -539,7 +539,7 @@ edje_match_callback_exec_check_finals(const
Edje_Signals_Sources_Patterns *ssp,
cb = &matches[*e];
if (cb)
{
- if ((prop) &&
_edje_signal_callback_prop(ed->callbacks->flags, *e)) continue;
+ if ((prop) && ed->callbacks->flags[*e].propagate)
continue;
eina_array_push(&run, cb);
r = 2;
}
@@ -551,7 +551,7 @@ edje_match_callback_exec_check_finals(const
Edje_Signals_Sources_Patterns *ssp,
{
int idx = cb - matches;
- if (_edje_signal_callback_run(ed->callbacks->flags, idx)) continue;
+ if (ed->callbacks->flags[idx].delete_me) continue;
cb->func((void*) ed->callbacks->custom_data[idx], ed->obj, sig,
source);
if (_edje_block_break(ed))
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index d2bb323..20124b4 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -334,6 +334,7 @@ typedef struct _Edje_Signal_Source_Char
Edje_Signal_Source_Char;
typedef struct _Edje_Text_Insert_Filter_Callback
Edje_Text_Insert_Filter_Callback;
typedef struct _Edje_Markup_Filter_Callback Edje_Markup_Filter_Callback;
typedef struct _Edje_Signals_Sources_Patterns Edje_Signals_Sources_Patterns;
+typedef struct _Edje_Signal_Callback_Flags Edje_Signal_Callback_Flags;
typedef struct _Edje_Signal_Callback_Group Edje_Signal_Callback_Group;
typedef struct _Edje_Signal_Callback_Match Edje_Signal_Callback_Match;
typedef struct _Edje_Signal_Callback_Matches Edje_Signal_Callback_Matches;
@@ -830,13 +831,20 @@ struct _Edje_Signal_Callback_Matches
Eina_Bool hashed : 1;
};
+struct _Edje_Signal_Callback_Flags
+{
+ Eina_Bool delete_me:1;
+ Eina_Bool just_added:1;
+ Eina_Bool propagate:1;
+};
+
struct _Edje_Signal_Callback_Group
{
const Edje_Signal_Callback_Matches *matches;
void **custom_data;
- Eina_Bool *flags; /* 4 bits per custom data (delete_me, just_added,
propagate) */
+ Edje_Signal_Callback_Flags *flags;
};
/*----------*/
@@ -1992,9 +2000,7 @@ void
_edje_signals_sources_patterns_clean(Edje_Signals_Sources_Patterns *ssp);
const Edje_Signals_Sources_Patterns *_edje_signal_callback_patterns_ref(const
Edje_Signal_Callback_Group *gp);
void _edje_signal_callback_patterns_unref(const Edje_Signals_Sources_Patterns
*essp);
-Eina_Bool _edje_signal_callback_prop(const Eina_Bool *flags, int i);
-Eina_Bool _edje_signal_callback_run(const Eina_Bool *flags, unsigned int i);
-void _edje_signal_callback_reset(Eina_Bool *flags, unsigned int length);
+void _edje_signal_callback_reset(Edje_Signal_Callback_Flags *flags, unsigned
int length);
void _edje_signal_callback_free(const Edje_Signal_Callback_Group *gp);
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 9fd3179..52335b9 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -1444,9 +1444,8 @@ _edje_emit_cb(Edje *ed, const char *sig, const char *src,
Edje_Message_Signal_Da
EINA_INARRAY_FOREACH(match, i)
{
- if (_edje_signal_callback_run(ed->callbacks->flags, *i)) continue;
- if ((prop) && (_edje_signal_callback_prop(ed->callbacks->flags,
- *i))) continue;
+ if (ed->callbacks->flags[*i].delete_me) continue;
+ if ((prop) && (ed->callbacks->flags[*i].propagate)) continue;
cb = &m->matches[*i];
diff --git a/src/lib/edje/edje_signal.c b/src/lib/edje/edje_signal.c
index 4988891..83d6d19 100644
--- a/src/lib/edje/edje_signal.c
+++ b/src/lib/edje/edje_signal.c
@@ -2,10 +2,6 @@
#include "edje_private.h"
-#define _DELETE_ME 0x4
-#define _JUST_ADDED 0x2
-#define _PROPAGATE 0x1
-
static Eina_Hash *signal_match = NULL;
static unsigned int
@@ -145,7 +141,7 @@ _edje_signal_callback_unset(Edje_Signal_Callback_Group *gp,
int idx)
static void
_edje_signal_callback_set(Edje_Signal_Callback_Group *gp, int idx,
const char *sig, const char *src,
- Edje_Signal_Cb func, void *data, Eina_Bool flags)
+ Edje_Signal_Cb func, void *data,
Edje_Signal_Callback_Flags flags)
{
Edje_Signal_Callback_Match *m;
@@ -156,34 +152,19 @@ _edje_signal_callback_set(Edje_Signal_Callback_Group *gp,
int idx,
gp->custom_data[idx] = data;
- gp->flags[idx >> 1] = (gp->flags[idx >> 1] & (0xF << (((idx & 1) ^ 1) *
4))) |
- ((flags & 0xF) << ((idx & 1) * 4));
-}
-
-Eina_Bool
-_edje_signal_callback_prop(const Eina_Bool *flags, int i)
-{
- Eina_Bool b;
-
- b = flags[i >> 1];
- return b & (_PROPAGATE << ((i & 1) * 4));
+ gp->flags[idx] = flags;
}
static Edje_Signal_Callback_Group *
_edje_signal_callback_grow(Edje_Signal_Callback_Group *gp)
{
Edje_Signal_Callback_Matches *tmp;
- unsigned int c;
tmp = (Edje_Signal_Callback_Matches*) gp->matches;
tmp->matches_count++;
tmp->matches = realloc(tmp->matches, sizeof (Edje_Signal_Callback_Match) *
tmp->matches_count);
gp->custom_data = realloc(gp->custom_data, sizeof (void*) *
tmp->matches_count);
-
- c = ((tmp->matches_count >> 1) + (tmp->matches_count & 1));
- gp->flags = realloc(gp->flags, sizeof (Eina_Bool) * c);
- // We have just expanded by one char, set it to 0
- if (tmp->matches_count & 1) gp->flags[tmp->matches_count >> 1] = 0;
+ gp->flags = realloc(gp->flags, sizeof (Edje_Signal_Callback_Flags) *
tmp->matches_count);
return gp;
}
@@ -195,6 +176,11 @@ _edje_signal_callback_push(const
Edje_Signal_Callback_Group *cgp,
{
Edje_Signal_Callback_Group *gp = (Edje_Signal_Callback_Group*) cgp;
unsigned int i;
+ Edje_Signal_Callback_Flags flags;
+
+ flags.delete_me = EINA_FALSE;
+ flags.just_added = EINA_TRUE;
+ flags.propagate = !!propagate;
// let's first try to see if we do find an empty matching stop
for (i = 0; i < gp->matches->matches_count; i++)
@@ -202,15 +188,10 @@ _edje_signal_callback_push(const
Edje_Signal_Callback_Group *cgp,
src == gp->matches->matches[i].source &&
func == gp->matches->matches[i].func)
{
- Eina_Bool flags;
-
- flags = gp->flags[i >> 1] & (0xF << ((i & 1) * 4));
- if (flags & _DELETE_ME)
+ if (gp->flags[i].delete_me)
{
_edje_signal_callback_unset(gp, i);
- _edje_signal_callback_set(gp, i,
- sig, src, func, data,
- (((!!propagate) & 1) | _JUST_ADDED));
+ _edje_signal_callback_set(gp, i, sig, src, func, data, flags);
return;
}
}
@@ -237,32 +218,19 @@ _edje_signal_callback_push(const
Edje_Signal_Callback_Group *cgp,
}
// search an empty spot now
- for (i = 0; i < gp->matches->matches_count; i += 2)
- if (gp->flags[i >> 1] & (_DELETE_ME | (_DELETE_ME << 4)))
+ for (i = 0; i < gp->matches->matches_count; i++)
+ if (gp->flags[i].delete_me)
{
- if (gp->flags[i >> 1] & _DELETE_ME)
- {
- _edje_signal_callback_unset(gp, i);
- _edje_signal_callback_set(gp, i,
- sig, src, func, data,
- (((!!propagate) & 1) | _JUST_ADDED));
- return;
- }
- if (gp->flags[i >> 1] & (_DELETE_ME << 4))
- {
- _edje_signal_callback_unset(gp, i + 1);
- _edje_signal_callback_set(gp, i + 1,
- sig, src, func, data,
- (((!!propagate) & 1) | _JUST_ADDED));
- return;
- }
+ _edje_signal_callback_unset(gp, i);
+ _edje_signal_callback_set(gp, i, sig, src, func, data, flags);
+ return;
}
_edje_signal_callback_grow(gp);
// Set propagate and just_added flags
_edje_signal_callback_set(gp, gp->matches->matches_count - 1,
- sig, src, func, data, (((!!propagate) & 1) |
_JUST_ADDED));
+ sig, src, func, data, flags);
return;
}
@@ -343,10 +311,7 @@ _edje_signal_callback_disable(const
Edje_Signal_Callback_Group *cgp,
func == gp->matches->matches[i].func &&
gp->custom_data[i] == data)
{
- Eina_Bool flags;
-
- flags = gp->flags[i >> 1] | (_DELETE_ME << ((i & 1) * 4));
- gp->flags[i >> 1] = flags;
+ gp->flags[i].delete_me = EINA_TRUE;
return gp->custom_data[i];
}
}
@@ -359,10 +324,7 @@ _edje_signal_callback_disable(const
Edje_Signal_Callback_Group *cgp,
src == gp->matches->matches[i].source &&
func == gp->matches->matches[i].func)
{
- Eina_Bool flags;
-
- flags = gp->flags[i >> 1] | (_DELETE_ME << ((i & 1) * 4));
- gp->flags[i >> 1] = flags;
+ gp->flags[i].delete_me = EINA_TRUE;
return gp->custom_data[i];
}
}
@@ -373,32 +335,22 @@ _edje_signal_callback_disable(const
Edje_Signal_Callback_Group *cgp,
static void
_edje_signal_callback_move_last(Edje_Signal_Callback_Group *gp,
- int i)
+ unsigned int i)
{
Edje_Signal_Callback_Matches *m;
- int j;
+ unsigned int j;
m = (Edje_Signal_Callback_Matches*) gp->matches;
- for (j = (int) --m->matches_count; j > i; --j)
+ for (j = --m->matches_count; j > i; --j)
{
- if (!(gp->flags[j >> 1] & (_DELETE_ME << ((j & 1) * 4))))
+ if (!gp->flags[j].delete_me)
{
- Eina_Bool flag_neighbor_i, flag_j;
-
_edje_signal_callback_unset(gp, i);
-
m->matches[i].signal = m->matches[j].signal;
m->matches[i].source = m->matches[j].source;
m->matches[i].func = m->matches[j].func;
-
- flag_j = gp->flags[j >> 1] >> ((j & 1) * 4);
- flag_neighbor_i = gp->flags[i >> 1] >> ((!(j & 1)) * 4);
-
- if (i & 1)
- gp->flags[i >> 1] = flag_neighbor_i | (flag_j << 4);
- else
- gp->flags[i >> 1] = flag_j | (flag_neighbor_i << 4);
+ gp->flags[i] = gp->flags[j];
return;
}
}
@@ -421,23 +373,12 @@ _edje_signal_callback_patterns_ref(const
Edje_Signal_Callback_Group *gp)
{
// Let compact it and remove uneeded pattern before building it
// We can do that because the custom data are kept local into the
matching code.
- Eina_Bool delete_me = _DELETE_ME | (_DELETE_ME << 4);
unsigned int i;
- for (i = 0; i < tmp->matches_count; i += 2)
+ for (i = 0; i < tmp->matches_count; i++)
{
- if (gp->flags[i >> 1] & delete_me)
- {
- if (gp->flags[i >> 1] & _DELETE_ME)
- {
-
_edje_signal_callback_move_last((Edje_Signal_Callback_Group*) gp, i);
- }
- if (i + 1 < gp->matches->matches_count &&
- (gp->flags[i >> 1] & (_DELETE_ME << 4)))
- {
-
_edje_signal_callback_move_last((Edje_Signal_Callback_Group*) gp, i + 1);
- }
- }
+ if (gp->flags[i].delete_me)
+
_edje_signal_callback_move_last((Edje_Signal_Callback_Group*) gp, i);
}
}
@@ -488,26 +429,11 @@ _edje_signal_callback_patterns_unref(const
Edje_Signals_Sources_Patterns *essp)
}
}
-Eina_Bool
-_edje_signal_callback_run(const Eina_Bool *flags, unsigned int i)
-{
- Eina_Bool r;
-
- r = flags[i >> 1] & ((_DELETE_ME) << ((i & 0x1) * 4));
-
- return r;
-}
-
void
-_edje_signal_callback_reset(Eina_Bool *flags, unsigned int length)
+_edje_signal_callback_reset(Edje_Signal_Callback_Flags *flags, unsigned int
length)
{
- Eina_Bool mask;
unsigned int i;
-
- mask = ~((_JUST_ADDED << 4) | _JUST_ADDED);
-
- length >>= 1;
for (i = 0; i < length; ++i)
- flags[i] &= mask;
+ flags[i].just_added = EINA_FALSE;
}
--
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
