Merge branch 'master' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/tools

4 files changed, 302 insertions, 0 deletions

diff --git a/enable-cycle-counter.district10 b/enable-cycle-counter.district10
new file mode 100755
index 0000000..11d1d7e
--- /dev/null
+++ b/enable-cycle-counter.district10
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+die() {
+    echo "Error: $*"
+    exit 1
+}
+
+# if perf is not given in environment, then check path
+[ -z "$PERF" ] && PERF=`which perf 2> /dev/null`
+# otherwise, assume default location
+[ -z "$PERF" ] && PERF=~/dev/litmus2010/tools/perf/perf
+
+[ -f "$PERF" ] && [ -x "$PERF" ] || die "Could not find perf tool."
+
+# works for sparc64 and Intel x86 if all CPUs are online
+NUM_CPUS=`egrep -c '^processor|online'   /proc/cpuinfo`
+
+# Keep cycle counter active for a loooong time.
+
+for x in `seq 0 $(($NUM_CPUS - 1))`
+do
+    schedtool -a $x  -e "$PERF" record -o /dev/null sleep $((60 * 60 * 24 * 365)) > /dev/null &
+done
diff --git a/etc_grub.d_10_linux.bonham b/etc_grub.d_10_linux.bonham
new file mode 100755
index 0000000..89a4d1f
--- /dev/null
+++ b/etc_grub.d_10_linux.bonham
@@ -0,0 +1,159 @@
+#! /bin/sh -e
+
+# grub-mkconfig helper script.
+# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
+#
+# GRUB is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+prefix=/usr
+exec_prefix=${prefix}
+bindir=${exec_prefix}/bin
+libdir=${exec_prefix}/lib
+. ${libdir}/grub/grub-mkconfig_lib
+
+export TEXTDOMAIN=grub
+export TEXTDOMAINDIR=@LOCALEDIR@
+
+CLASS="--class gnu-linux --class gnu --class os"
+
+if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+  OS=GNU/Linux
+else
+  OS="${GRUB_DISTRIBUTOR}"
+  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr '[A-Z]' '[a-z]' | cut -d' ' -f1) ${CLASS}"
+fi
+
+# loop-AES arranges things so that /dev/loop/X can be our root device, but
+# the initrds that Linux uses don't like that.
+case ${GRUB_DEVICE} in
+  /dev/loop/*|/dev/loop[0-9])
+    GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
+    # We can't cope with devices loop-mounted from files here.
+    case ${GRUB_DEVICE} in
+      /dev/*) ;;
+      *) exit 0 ;;
+    esac
+  ;;
+esac
+
+if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+    || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+    || [ "`grub-probe -t abstraction --device ${GRUB_DEVICE} | sed -e 's,.*\(lvm\).*,\1,'`" = "lvm"  ] ; then
+  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+else
+  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+fi
+
+# add crashkernel option if we have the required tools
+if [ -x "/usr/bin/makedumpfile" ] && [ -x "/sbin/kexec" ]; then
+    GRUB_CMDLINE_EXTRA="$GRUB_CMDLINE_EXTRA crashkernel=384M-2G:64M,2G-:128M"
+fi
+
+linux_entry ()
+{
+  os="$1"
+  version="$2"
+  recovery="$3"
+  args="$4"
+  if ${recovery} ; then
+    title="$(gettext_quoted "%s, with Linux %s (recovery mode)")"
+  else
+    title="$(gettext_quoted "%s, with Linux %s")"
+  fi
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}"
+  cat << EOF
+        recordfail
+EOF
+  save_default_entry | sed -e "s/^/\t/"
+
+  if [ "x$GRUB_GFXPAYLOAD_LINUX" != x ]; then
+          cat << EOF
+        set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
+EOF
+  fi
+
+  if [ -z "${prepare_boot_cache}" ]; then
+    prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+  fi
+  printf '%s\n' "${prepare_boot_cache}"
+  if [ "x$5" != "xquiet" ]; then
+    cat << EOF
+        echo    '$(printf "$(gettext_quoted "Loading Linux %s ...")" ${version})'
+EOF
+  fi
+  cat << EOF
+        linux   ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+EOF
+  if [ "x$5" != "xquiet" ]; then
+    cat << EOF
+        echo    '$(gettext_quoted "Loading initial ramdisk ...")'
+EOF
+  fi
+  if test -n "${initrd}" ; then
+    cat << EOF
+        initrd  ${rel_dirname}/${initrd}
+EOF
+  fi
+  cat << EOF
+}
+EOF
+}
+
+list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* ; do
+        if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
+      done`
+
+# Filter out litmus kernels
+list=`echo $list | tr ' ' '\n' | grep -v litmus | tr '\n' ' '`
+# Filter out custom vanilla kernels
+list=`echo $list | tr ' ' '\n' | grep -v vanilla | tr '\n' ' '`
+
+prepare_boot_cache=
+
+while [ "x$list" != "x" ] ; do
+  linux=`version_find_latest $list`
+  echo "Found linux image: $linux" >&2
+  basename=`basename $linux`
+  dirname=`dirname $linux`
+  rel_dirname=`make_system_path_relative_to_its_root $dirname`
+  version=`echo $basename | sed -e "s,^[^0-9]*-,,g"`
+  alt_version=`echo $version | sed -e "s,\.old$,,g"`
+  linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
+
+  initrd=
+  for i in "initrd.img-${version}" "initrd-${version}.img" \
+           "initrd-${version}" "initrd.img-${alt_version}" \
+           "initrd-${alt_version}.img" "initrd-${alt_version}"; do
+    if test -e "${dirname}/${i}" ; then
+      initrd="$i"
+      break
+    fi
+  done
+  if test -n "${initrd}" ; then
+    echo "Found initrd image: ${dirname}/${initrd}" >&2
+  else
+    # "UUID=" magic is parsed by initrds.  Since there's no initrd, it can't work here.
+    linux_root_device_thisversion=${GRUB_DEVICE}
+  fi
+
+  linux_entry "${OS}" "${version}" false \
+      "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_EXTRA} ${GRUB_CMDLINE_LINUX_DEFAULT}" \
+      quiet
+  if [ "x${GRUB_DISABLE_LINUX_RECOVERY}" != "xtrue" ]; then
+    linux_entry "${OS}" "${version}" true \
+        "single ${GRUB_CMDLINE_LINUX}"
+  fi
+
+  list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+done
diff --git a/etc_grub.d_15_litmus.bonham b/etc_grub.d_15_litmus.bonham
new file mode 100755
index 0000000..108668a
--- /dev/null
+++ b/etc_grub.d_15_litmus.bonham
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec tail -n +3 $0
+# Litmus Kernels. Be careful not to change the 'exec tail' line above.
+
diff --git a/install_kernel.bonham b/install_kernel.bonham
new file mode 100755
index 0000000..b7958e0
--- /dev/null
+++ b/install_kernel.bonham
@@ -0,0 +1,116 @@
+#!/bin/bash
+
+function die()
+{
+        echo " (EE) $1"
+        exit 1
+}
+
+function info()
+{
+        echo " (II) $1"
+}
+
+function silent()
+{
+        OUTPUT=`$*`
+        if [ "$?" != "0" ]; then
+                echo $OUTPUT
+                die "$* failed!"
+        fi
+}
+
+# Function to grab var from src
+function getvar() {
+  old=$(head -5 Makefile | grep "^$1")
+  echo $(echo ${old/"$1 ="/} | sed -e "s/[ ]*\(.*\)[ ]*/\1/g")
+  return 0
+}
+
+if [ ! -f "./.config" ]; then
+        CURDIR=`pwd`
+        die "No kernel .config exists in $CURDIR!"
+fi
+
+if [ ! -f "./Makefile" ]; then
+        die "No Makefile present!"
+fi
+
+VERSION=`getvar VERSION`
+PATCHLEVEL=`getvar PATCHLEVEL`
+SUBLEVEL=`getvar SUBLEVEL`
+EXTRAVERSION=`getvar EXTRAVERSION`
+
+. ./.config
+
+NAME="$VERSION.$PATCHLEVEL.$SUBLEVEL$EXTRAVERSION$CONFIG_LOCALVERSION"
+
+info "Detected kernel version $NAME"
+
+if [ $UID != "0" ]; then
+        die "Must be root to install kernel!"
+fi
+
+# (1) copy modules
+if [ "$1" != "-m" ]; then
+        info "Installing modules..."
+        silent make -j32 modules_install
+else
+        info "Skipping installing modules."
+fi
+
+# (2) copy kernel
+info "Installing kernel..."
+silent cp -v arch/x86_64/boot/bzImage /boot/vmlinuz-$NAME
+silent cp -v System.map             /boot/System.map-$NAME
+
+# (3) build ramdisk
+info "Building module dependencies"
+silent depmod -v $NAME
+
+if [ "$1" != "-m" ]; then
+        info "Building initial ramdisk..."
+        silent update-initramfs -c -k $NAME
+else
+        info "Skipping updating initial ramdisk..."
+fi
+
+# (4) make bootloader entry
+ALREADY_PRESENT=`grep "/vmlinuz-$NAME" /etc/grub.d/15_litmus `
+
+if [ ! -z "$ALREADY_PRESENT" ]; then
+        info "Bootloader entry appears to be already present."
+else
+        info "Creating bootloader entry..."
+
+        if [[ "$NAME" =~ "litmus" ]]; then
+                cat >> /etc/grub.d/15_litmus <<__EOE__
+
+menuentry 'Ubuntu/Litmus, with $NAME' --class ubuntu --class gnu-linux --class gnu --class os {
+        recordfail
+        insmod ext2
+        set root='(hd0,3)'
+        search --no-floppy --fs-uuid --set 08b4e70f-d536-45bc-8693-164891c8834b
+        linux   /vmlinuz-$NAME root=/dev/sda5 ro quanta=aligned
+        initrd  /initrd.img-$NAME
+}
+__EOE__
+        else
+                cat >> /etc/grub.d/15_litmus <<__EOE__
+
+menuentry 'Ubuntu/Custom Kernel, with $NAME' --class ubuntu --class gnu-linux --class gnu --class os {
+        recordfail
+        insmod ext2
+        set root='(hd0,3)'
+        search --no-floppy --fs-uuid --set 08b4e70f-d536-45bc-8693-164891c8834b
+        linux   /vmlinuz-$NAME root=/dev/sda5 ro
+        initrd  /initrd.img-$NAME
+}
+__EOE__
+        fi
+
+update-grub
+
+fi
+
+info "Kernel $NAME has been installed."