summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-06-13 20:59:15 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-06-13 20:59:15 +0000
commitfca19e7635df53bf636d6d45c1bc6b610617690c (patch)
treecbe430cf815888e54ca03d695d90c0080af272a0
parenta6d0d0414163662ee4a2c3b6a1e8915ccded6ee5 (diff)
use a compiler builtin (which uses processor instructions) for this operation
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@33933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_agent.c11
-rw-r--r--translate.c14
2 files changed, 14 insertions, 11 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 6bbc89cb3..fb77a9456 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1334,12 +1334,13 @@ static struct ast_channel *agent_request(const char *type, int format, void *dat
return chan;
}
-static int powerof(unsigned int v)
+static force_inline int powerof(unsigned int d)
{
- int x;
- for (x=0;x<32;x++) {
- if (v & (1 << x)) return x;
- }
+ int x = ffs(d);
+
+ if (x)
+ return x - 1;
+
return 0;
}
diff --git a/translate.c b/translate.c
index 6bb313871..256130c82 100644
--- a/translate.c
+++ b/translate.c
@@ -74,13 +74,15 @@ static struct translator_path tr_matrix[MAX_FORMAT][MAX_FORMAT];
*/
/*! \brief returns the index of the lowest bit set */
-static int powerof(int d)
+static force_inline int powerof(unsigned int d)
{
- int x;
- for (x = 0; x < MAX_FORMAT; x++)
- if ((1 << x) & d)
- return x;
- ast_log(LOG_WARNING, "Powerof %d: No power??\n", d);
+ int x = ffs(d);
+
+ if (x)
+ return x - 1;
+
+ ast_log(LOG_WARNING, "No bits set? %d\n", d);
+
return -1;
}