projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Describe dummy test model. Work on OpenFlow intro.
[openvswitch]
/
utilities
/
ovs-lib.in
diff --git
a/utilities/ovs-lib.in
b/utilities/ovs-lib.in
index 50a59509419846a2b17a2f2808b625128b87e9d4..b787b1ce139384ce8213dded3fd5b541395e79e0 100644
(file)
--- a/
utilities/ovs-lib.in
+++ b/
utilities/ovs-lib.in
@@
-28,8
+28,19
@@
datadir=${OVS_PKGDATADIR-'@pkgdatadir@'} # /usr/share/openvswitch
bindir=${OVS_BINDIR-'@bindir@'} # /usr/bin
sbindir=${OVS_SBINDIR-'@sbindir@'} # /usr/sbin
bindir=${OVS_BINDIR-'@bindir@'} # /usr/bin
sbindir=${OVS_SBINDIR-'@sbindir@'} # /usr/sbin
+# /etc/openvswitch or /var/lib/openvswitch
+if test X"$OVS_DBDIR" != X; then
+ dbdir=$OVS_DBDIR
+elif test X"$OVS_SYSCONFDIR" != X; then
+ dbdir=$OVS_SYSCONFDIR/openvswitch
+else
+ dbdir='@DBDIR@'
+fi
+
VERSION='@VERSION@'
VERSION='@VERSION@'
+DAEMON_CWD=/
+
LC_ALL=C; export LC_ALL
## ------------- ##
LC_ALL=C; export LC_ALL
## ------------- ##
@@
-91,6
+102,7
@@
start_daemon () {
wrapper=$2
shift; shift
daemon=$1
wrapper=$2
shift; shift
daemon=$1
+ strace=""
# drop core files in a sensible place
test -d "$DAEMON_CWD" || install -d -m 755 -o root -g root "$DAEMON_CWD"
# drop core files in a sensible place
test -d "$DAEMON_CWD" || install -d -m 755 -o root -g root "$DAEMON_CWD"
@@
-110,7
+122,7
@@
start_daemon () {
case $wrapper in
valgrind)
if (valgrind --version) > /dev/null 2>&1; then
case $wrapper in
valgrind)
if (valgrind --version) > /dev/null 2>&1; then
- set valgrind -q --leak-check=full \
+ set valgrind -q --leak-check=full
--time-stamp=yes
\
--log-file="$logdir/$daemon.valgrind.log.%p" "$@"
else
log_failure_msg "valgrind not installed, running $daemon without it"
--log-file="$logdir/$daemon.valgrind.log.%p" "$@"
else
log_failure_msg "valgrind not installed, running $daemon without it"
@@
-118,11
+130,19
@@
start_daemon () {
;;
strace)
if (strace -V) > /dev/null 2>&1; then
;;
strace)
if (strace -V) > /dev/null 2>&1; then
- set strace -D -ff -o "$logdir/$daemon.strace.log" "$@"
+ strace="strace -tt -T -s 256 -ff"
+ if (strace -DV) > /dev/null 2>&1; then
+ # Has the -D option.
+ set $strace -D -o "$logdir/$daemon.strace.log" "$@"
+ strace=""
+ fi
else
log_failure_msg "strace not installed, running $daemon without it"
fi
;;
else
log_failure_msg "strace not installed, running $daemon without it"
fi
;;
+ glibc)
+ set env MALLOC_CHECK_=2 MALLOC_PERTURB_=165 "$@"
+ ;;
'')
;;
*)
'')
;;
*)
@@
-136,9
+156,14
@@
start_daemon () {
fi
action "Starting $daemon" "$@"
fi
action "Starting $daemon" "$@"
+
+ if test X"$strace" != X; then
+ # Strace doesn't have the -D option so we attach after the fact.
+ setsid $strace -o "$logdir/$daemon.strace.log" \
+ -p `cat $rundir/$daemon.pid` > /dev/null 2>&1 &
+ fi
}
}
-DAEMON_CWD=/
stop_daemon () {
if test -e "$rundir/$1.pid"; then
if pid=`cat "$rundir/$1.pid"`; then
stop_daemon () {
if test -e "$rundir/$1.pid"; then
if pid=`cat "$rundir/$1.pid"`; then