From 26cc319274f9f7e99a56d55c3fd0872e2e2527a1 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Tue, 26 Sep 2006 13:52:53 +0200
Subject: Add unlikely macro

And use it for a really unlikely case
---
 inotail.c | 3 +--
 inotail.h | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/inotail.c b/inotail.c
index c0c5302..da881d4 100644
--- a/inotail.c
+++ b/inotail.c
@@ -245,8 +245,7 @@ static int watch_files(struct file_struct *f, int n_files)
 				}
 			}
 
-			/* Very unlikely! */
-			if (!fil)
+			if (unlikely(!fil))
 				break;
 
 			if (inev->mask & IN_MODIFY) {
diff --git a/inotail.h b/inotail.h
index d885855..f6e90e8 100644
--- a/inotail.h
+++ b/inotail.h
@@ -24,4 +24,7 @@ struct file_struct {
 # define dprintf(fmt, args...)
 #endif /* DEBUG */
 
+/* Taken from linux kernel source tree */
+#define unlikely(x) __builtin_expect(!!(x), 0)
+
 #endif /* _INOTAIL_H */
-- 
cgit v1.2.3-54-g00ecf

.git</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='fddc2c43c48d62f70553785d1220505f33aebe0e'/><input type='hidden' name='id2' value='bc6e2bdb71056607141ada309a185f0a50b1aeaf'/><select name='h' onchange='this.form.submit();'>
<option value='emaclite-cleanup'>emaclite-cleanup</option>
<option value='master' selected='selected'>master</option>
<option value='nds-private-remove'>nds-private-remove</option>
<option value='packet-loop-back'>packet-loop-back</option>
<option value='packet-rx-pump-back'>packet-rx-pump-back</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>net-next plumbings</td><td class='sub right'>Tobias Klauser</td></tr></table>
<table class='tabs'><tr><td>
<a href='/cgit.cgi/linux/net-next.git/'>summary</a><a href='/cgit.cgi/linux/net-next.git/refs/?id=fddc2c43c48d62f70553785d1220505f33aebe0e'>refs</a><a href='/cgit.cgi/linux/net-next.git/log/crypto/authencesn.c'>log</a><a href='/cgit.cgi/linux/net-next.git/tree/crypto/authencesn.c?id=fddc2c43c48d62f70553785d1220505f33aebe0e'>tree</a><a href='/cgit.cgi/linux/net-next.git/commit/crypto/authencesn.c?id=fddc2c43c48d62f70553785d1220505f33aebe0e'>commit</a><a class='active' href='/cgit.cgi/linux/net-next.git/diff/crypto/authencesn.c?id=fddc2c43c48d62f70553785d1220505f33aebe0e&amp;id2=bc6e2bdb71056607141ada309a185f0a50b1aeaf'>diff</a></td><td class='form'><form class='right' method='get' action='/cgit.cgi/linux/net-next.git/log/crypto/authencesn.c'>
<input type='hidden' name='id' value='fddc2c43c48d62f70553785d1220505f33aebe0e'/><input type='hidden' name='id2' value='bc6e2bdb71056607141ada309a185f0a50b1aeaf'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/cgit.cgi/linux/net-next.git/diff/?id=fddc2c43c48d62f70553785d1220505f33aebe0e&amp;id2=bc6e2bdb71056607141ada309a185f0a50b1aeaf'>root</a>/<a href='/cgit.cgi/linux/net-next.git/diff/crypto?id=fddc2c43c48d62f70553785d1220505f33aebe0e&amp;id2=bc6e2bdb71056607141ada309a185f0a50b1aeaf'>crypto</a>/<a href='/cgit.cgi/linux/net-next.git/diff/crypto/authencesn.c?id=fddc2c43c48d62f70553785d1220505f33aebe0e&amp;id2=bc6e2bdb71056607141ada309a185f0a50b1aeaf'>authencesn.c</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='fddc2c43c48d62f70553785d1220505f33aebe0e'/><input type='hidden' name='id2' value='bc6e2bdb71056607141ada309a185f0a50b1aeaf'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/cgit.cgi/linux/net-next.git/diff/?id=fddc2c43c48d62f70553785d1220505f33aebe0e&amp;id2=bc6e2bdb71056607141ada309a185f0a50b1aeaf'>Diffstat</a> (limited to 'crypto/authencesn.c')</div><table summary='diffstat' class='diffstat'>