Updates; capture jiffies

1 files changed, 19 insertions, 7 deletions

diff --git a/measure b/measure
index 33d0683..c1dd8f2 100755
--- a/measure
+++ b/measure
@@ -6,6 +6,17 @@ do_smile=1
 do_typing=1
 
 CLICKAT=./clickat
+CMD="bash -c"
+
+function echo_jiffies()
+{
+$CMD bash << "EOF"
+xpid=`ps -C Xorg,Xtightvnc -o pid,args | grep ':3' | sed 's/^ *//' | cut -f 1 -d ' '`;
+jiffs=`cat /proc/$xpid/stat | cut -f 14,15,16,17 -d ' '`;
+echo Jiffies $jiffs
+EOF
+}
+
 
 wid=0
 xoffset=0
@@ -18,7 +29,7 @@ if [ $# -gt 0 ] ; then
         fname=spicegtk.ogv
     fi
 
-    if [ "$1" == "TightVNC: apevia:3" ] ; then
+    if [ "$1" == "TightVNC: jwhite's X desktop (spice1:3)" ] ; then
         xoffset=0
         yoffset=0
         fname=x11vnc.ogv
@@ -30,7 +41,6 @@ if [ $# -gt 0 ] ; then
         fname=spicec.ogv
     fi
 
-
     if [ "$1" == "Spice Javascript client - Google Chrome" ] ; then
         xoffset=24
         yoffset=122
@@ -45,13 +55,14 @@ if [ $# -gt 0 ] ; then
     CLICKAT="$CLICKAT --wid $wid --noprint"
 
     if [ $# -gt 1 ] ; then
-        fname="$2"
+        CMD="ssh $2"
     fi
 fi
 
-/sbin/ifconfig > $fname.ifconfig
+$CMD /sbin/ifconfig > $fname.ifconfig
 date >> $fname.ifconfig
-recordmydesktop --windowid $wid -x $xoffset -y $((yoffset+4)) --width 800 --height 592 --no-sound --overwrite --full-shots --output $fname &
+echo_jiffies >> $fname.ifconfig
+recordmydesktop --windowid $wid -x $xoffset -y $((yoffset+4)) --width 800 --height 592 --no-sound --overwrite --full-shots --v_quality 0 --output $fname &
 record_pid=$!
 
 $CLICKAT restore
@@ -118,7 +129,7 @@ $CLICKAT click --delay 50 --position $((540+xoffset))x$((240+yoffset)) --dragto
 
 # Export our smile
 echo  Export the smile
-rm -f /tmp/smile.png
+$CMD rm -f /tmp/smile.png
 $CLICKAT click --timed --timeout 100 --position $((10+xoffset))x$((37+yoffset))
 $CLICKAT key --delay-between-keystrokes 100 --keystroke 't\r'
 sleep 2
@@ -197,7 +208,8 @@ $CLICKAT key --delay-between-keystrokes 100 --keystroke 'd'
 fi
 
 echo  ... done
-/sbin/ifconfig >> $fname.ifconfig
+$CMD /sbin/ifconfig >> $fname.ifconfig
 date >> $fname.ifconfig
+echo_jiffies >> $fname.ifconfig
 
 kill -s INT $record_pid