Merge branch 'master' of ssh://cvs/~/litmus/tools

6 files changed, 188 insertions, 0 deletions

diff --git a/kvm-pull-traces.sh b/kvm-pull-traces.sh
new file mode 100755
index 0000000..f823360
--- /dev/null
+++ b/kvm-pull-traces.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Simple script to download files from a KVM image to the local system.
+# Originally written by Andrea Bastoni.
+# Config file support added by Bjoern Brandenburg.
+
+SSH_PORT=2222      # default
+SSH_USER=root      # what to log in as
+SSH_HOST=localhost # where is the forwarded port?
+DATA_DIR="~/liblitmus2010/" # where are the traces in the image?
+FILE_GLOB="test*.bin" # which files to copy
+DOWNLOADS=.        # where to copy the files
+
+# include config file
+[ -f ~/.litmus_kvm ] && source ~/.litmus_kvm
+
+#SRC="${SSH_USER}@${SSH_HOST}:${DATA_DIR}${FILE_GLOB}"
+#echo scp -P $SSH_PORT ${SRC} ${DOWNLOADS}
+#scp -P $SSH_PORT ${SRC} ${DOWNLOADS}
+
+
+CMD="ssh -l ${SSH_USER} -p ${SSH_PORT}"
+SRC="${SSH_HOST}:${DATA_DIR}${FILE_GLOB}"
+echo rsync -ah -z --progress -e "$CMD" ${SRC} ${DOWNLOADS}
+rsync -ah -z --progress -e "$CMD" ${SRC} ${DOWNLOADS}
diff --git a/kvm-push-liblitmus.sh b/kvm-push-liblitmus.sh
new file mode 100755
index 0000000..0073efd
--- /dev/null
+++ b/kvm-push-liblitmus.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+#
+# Simple script to push a compiled version of liblitmus2010 to a KVM instance.
+# Originally written by Andrea Bastoni.
+# Config file support added by Bjoern Brandenburg.
+
+SSH_PORT=2222      # default
+SSH_USER=root      # what to log in as
+SSH_HOST=localhost # where is the forwarded port?
+HOST_LIBLITMUS_DIR="~/liblitmus2010"     # where is the compilation unit
+KVM_WORKSPACE="~/" # where to copy the files
+
+# include config file
+[ -f ~/.litmus_kvm ] && source ~/.litmus_kvm
+
+#SRC="${SSH_USER}@${SSH_HOST}:${DATA_DIR}${FILE_GLOB}"
+#echo scp -P $SSH_PORT ${SRC} ${DOWNLOADS}
+#scp -P $SSH_PORT ${SRC} ${DOWNLOADS}
+
+
+CMD="ssh -l ${SSH_USER} -p ${SSH_PORT}"
+TARGET="${SSH_HOST}:${KVM_WORKSPACE}"
+echo rsync -ah -z --progress -e "$CMD" ${HOST_LIBLITMUS_DIR} ${TARGET}
+rsync -ah -z --progress -e "$CMD" ${HOST_LIBLITMUS_DIR} ${TARGET}
diff --git a/kvm-run-kernel.sh b/kvm-run-kernel.sh
new file mode 100755
index 0000000..5f75bcb
--- /dev/null
+++ b/kvm-run-kernel.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Launch a kernel with GDB support.
+# Originally written by Andrea Bastoni.
+# Config file support and option parsing added by Bjoern Brandenburg.
+
+function info() {
+    echo "(ii) $*"
+}
+
+while true
+do
+    case $1 in
+        --gdb)
+            shift
+            WANT_GDB=1
+            ;;
+        *) # unknown argument
+            break
+            ;;
+    esac
+done
+
+if [ $# -lt 2 ]; then
+        echo "Usage: run_kvm [--gdb] <vmlinuz> <nr cpu> [other kernel parameters]"
+        exit 1
+fi
+
+SSH_PORT=2222  # default
+GDB_PORT=6666  # override in config file
+KVM_IMAGE=~/kvm_debian_images/debian_amd64_lib.qcow2
+
+# include config file
+[ -f ~/.litmus_kvm ] && source ~/.litmus_kvm
+
+info "Simulating $2 CPUs."
+info "Running on top of image ${KVM_IMAGE}."
+info "Launching kernel $1."
+info "Redirecting SSH to port ${SSH_PORT}."
+
+if [ ! -z "$WANT_GDB" ]
+then
+    info "Opening remote GDB port ${GDB_PORT}."
+    GDB_OPT="-gdb tcp::${GDB_PORT} -S"
+else
+    GDB_OPT=
+fi
+
+# Newer versions of KVM may refuse to load a proper serial interface if both -nographic and -serial stdio are specified (koruna does this).
+# In such cases, remove "-serial stdio"
+qemu-system-x86_64 ${GDB_OPT} -smp $2 -cpu core2duo -hda ${KVM_IMAGE} -m 2000 -net nic,model=e1000 -net user -k en-us -kernel $1 -append "console=ttyS0 root=/dev/hda1 $3" ro -nographic -serial stdio -redir tcp:${SSH_PORT}::22
diff --git a/resolve-symlink.py b/resolve-symlink.py
new file mode 100755
index 0000000..a9107a9
--- /dev/null
+++ b/resolve-symlink.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import shutil
+
+def resolve_symlinks(links):
+    for f in links:
+        try:
+            target = os.readlink(f)
+            if target[0] != '/':
+                # make absolute
+                target = os.path.join(os.path.dirname(f), target)
+            os.unlink(f)
+            shutil.move(target, f)
+        except OSError, err:
+            print "Failed: %s (%s)" % (f, err)
+
+
+if __name__ == '__main__':
+    resolve_symlinks(sys.argv[1:])
diff --git a/sample-config/litmus-kvm b/sample-config/litmus-kvm
new file mode 100644
index 0000000..b724a85
--- /dev/null
+++ b/sample-config/litmus-kvm
@@ -0,0 +1,16 @@
+# Simple Litmus KVM tools config file.
+# Copy this to ~/.litmus_kvm
+
+# how to connect to the VM
+SSH_PORT=1234 # CHANGE THIS
+GDB_PORT=4321 # CHANGE THIS
+SSH_HOST=localhost
+
+# for pull
+DATA_DIR="~/liblitmus2010/traces/"
+FILE_GLOB="*"
+DOWNLOADS=~/downloads
+
+# for push
+HOST_LIBLITMUS_DIR=~/dev/liblitmus2010
+KVM_WORKSPACE="~/"
diff --git a/tex-un-include b/tex-un-include
new file mode 100755
index 0000000..72d7998
--- /dev/null
+++ b/tex-un-include
@@ -0,0 +1,51 @@
+#!/usr/bin/env python
+
+import sys
+import re
+
+comment_re = re.compile(r'([^\\]|^)%')
+input_re   = re.compile(r'\\input\{([^}]*)\}')
+
+def strip_comment(line):
+    g = comment_re.search(line)
+    if g:
+        # we matched some non-\ character
+        return line[0:g.start() + 1]
+    else:
+        return line
+
+def chomp(line):
+    if line and line[-1] == '\n':
+        return line[:-1]
+    else:
+        return line
+
+def open_tex_file(fname, mode='r'):
+    try:
+        f = open(fname, mode)
+    except IOError:
+        # try again with .tex appended
+        f = open(fname + '.tex', mode)
+    return f
+
+def process_file(fname, out=sys.stdout):
+    for line in open_tex_file(fname):
+        line = chomp(strip_comment(line))
+        idx = 0
+        for g in input_re.finditer(line):
+            out.write(line[idx:g.start()])
+            fname = g.group(1)
+            # recurse into file
+            out.write("%%!!!!! processing %s !!!!!\n" % fname)
+            process_file(fname, out)
+            idx = g.end()
+        out.write(line[idx:])
+        out.write('\n')
+
+
+def main(args=sys.argv[1:]):
+    for fname in args:
+        process_file(fname)
+
+if __name__ == '__main__':
+    main()