From 4b814d41b816dc868590646d594ce701d3e13211 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 20 Feb 2015 13:01:36 -0800 Subject: ovs-sandbox: Add -d option to run ovsdb-server under GDB Signed-off-by: Andy Zhou Acked-by: Ben Pfaff --- tutorial/Tutorial.md | 3 ++- tutorial/ovs-sandbox | 9 +++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'tutorial') diff --git a/tutorial/Tutorial.md b/tutorial/Tutorial.md index d9e800475..1d8bbf5ec 100644 --- a/tutorial/Tutorial.md +++ b/tutorial/Tutorial.md @@ -115,7 +115,8 @@ GDB can already be used to debug any running process, with the usual 'ovs-sandbox' also has a '-g' option for launching ovs-vswitchd under GDB. This option can be handy for setting break points before ovs-vswitchd runs, -or for catching early segfaults. +or for catching early segfaults. Similarly, a '-d' option can be used to +run ovsdb-server under GDB. Both options can be specified at the same time. To avoid GDB mangling with the sandbox sub shell terminal, 'ovs-sandbox' starts a new xterm to run each GDB session. For systems that do not support diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index bced8f468..1504ea9f8 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -42,7 +42,8 @@ rungdb() { fi } -gdb_vswitchd=false; +gdb_vswitchd=false +gdb_ovsdb=false builddir= srcdir= schema= @@ -87,6 +88,7 @@ These options force ovs-sandbox to use a particular OVS build: These options force ovs-sandbox to use an installed Open vSwitch: -i, --installed use installed Open vSwitch -g, --gdb-vswitchd run ovs-vswitchd under gdb + -d, --gdb-ovsdb run ovsdb-server under gdb -S, --schema=FILE use FILE as vswitch.ovsschema Other options: @@ -125,6 +127,9 @@ EOF -g|--gdb-v*) gdb_vswitchd=true ;; + -d|--gdb-o*) + gdb_ovsdb=true + ;; -*) echo "unrecognized option $option (use --help for help)" >&2 exit 1 @@ -227,7 +232,7 @@ trap 'kill `cat "$sandbox"/*.pid`' 0 1 2 3 13 14 15 # Create database and start ovsdb-server. touch "$sandbox"/.conf.db.~lock~ run ovsdb-tool create conf.db "$schema" -run ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ +rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ --remote=punix:"$sandbox"/db.sock # Start ovs-vswitchd. -- cgit v1.2.1