Changeset 7b2dc2a8 in freewrt for package/fwifupdown/files

Timestamp:

Jun 28, 2007, 6:27:03 PM (18 years ago)

Author:

Thorsten Glaser <tg@…>

Children:

b3aae94e

Parents:

14005bc

Message:

experimental: reduce number of calls to brctl by running only one watchdog
which handles all bridge interfaces at once, sequentially

spaetzle@ said it's okay if I lay hand on this script ☺
will be tested soon

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@3006 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• package/fwifupdown/files/ifupdown.sh (modified) (2 diffs)

package/fwifupdown/files/ifupdown.sh

@@ -6 +6 @@
 #
 # Christian Fischer <spaetzle@freewrt.org>
+# Thorsten Glaser <tg@freewrt.org>
 #
 
@@ -35 +36 @@
 
 # cleanup ifstate files
-rm -rf /tmp/ifupdown/ifstate/*
+rm -rf /tmp/ifupdown/ifstate
+mkdir -p /tmp/ifupdown/ifstate
 
 eval IFUPDOWN_ENV= $(grep '^FWIFUPDOWN_' /etc/rc.conf |sed "s/#.*//g") \
     busybox $what $@ $redirect
 
-grep -q initialize /tmp/ifupdown/ifstate/bridge/* 2>&- || exit 0
-
-mprint -n "Waiting for finishing bridge initialization"
-
-while grep -rq initialize /tmp/ifupdown/ifstate/bridge/*; do
-        sleep 1
+i=0     # did we print the initialisation message?
+j=0     # timeout in seconds
+rv=0    # exit status of this script
+while sleep 1; do
+        if test $j -gt 15; then
+                mprint -s "bridge initialisation timed out"
+                rv=1
+                break
+        fi
+        for x in /tmp/ifupdown/ifstate/bridge/*; do
+                # any bridges to check?
+                test -e "$x" || break 2         # no -> out of both loops
+                # print initialisatio message, but once only
+                test $i = 1 || mprint -n \
+                    "Waiting for bridge initialisation to finish"
+                i=1
+                # check this bridge for its states
+                s=ok
+                for state in $(brctl showstp ${x##*/} | \
+                    fgrep state | sed "s/^.*state//"); do
+                        test x"$state" = x"forwarding" && continue
+                        # if only one is not forwarding, wait
+                        s=no
+                        break
+                done
+                test $s = ok || break   # not ok? wait one second
+                rm -f $x                # this bridge done, check next ones
+        done
+        j=$(eval $j + 1)
 done
 
-if grep -rq timeout /tmp/ifupdown/ifstate/bridge/*; then
-        mstate 1
-        mprint -s "bridge init: timeout"
-        exit 1
-fi
-mstate 0
+mstate $rv
 
-# vim:ts=4
+# vim:ts=8