Changeset 1257

Timestamp:

Dec 10, 2008, 7:57:25 AM (16 years ago)

Author:

mmc

Message:

Added a new Rappture::sysinfo command for querying system load
information. Updated the p2p software to use that command to
gauge the load of workers and execute a "perftest" executable
from time to time to measure worker output.

Location:

trunk

Files:

• lang/tcl/src/Makefile.in (modified) (1 diff)
• lang/tcl/src/Rappture_Init.c (modified) (2 diffs)
• lang/tcl/src/RpSysinfo.c (added)
• lang/tcl/tests/sysinfo.test (added)
• p2p/Makefile (modified) (1 diff)
• p2p/authority.tcl (modified) (1 diff)
• p2p/client.tcl (modified) (1 diff)
• p2p/handler.tcl (modified) (1 diff)
• p2p/log.tcl (modified) (1 diff)
• p2p/perftest.c (added)
• p2p/random.tcl (modified) (1 diff)
• p2p/server.tcl (modified) (1 diff)
• p2p/tclIndex (modified) (1 diff)
• p2p/test.tcl (modified) (1 diff)
• p2p/worker.tcl (modified) (4 diffs)

trunk/lang/tcl/src/Makefile.in

@@ -55 +55 @@
                 RpRusage.o \
                 RpSignal.o  \
+                RpSysinfo.o  \
                 RpUnitsTclInterface.o \
                 RpUtilsTclInterface.o 

trunk/lang/tcl/src/Rappture_Init.c

@@ -25 +25 @@
 extern Tcl_AppInitProc RpRusage_Init;
 extern Tcl_AppInitProc RpSignal_Init;
+extern Tcl_AppInitProc RpSysinfo_Init;
 extern Tcl_AppInitProc RpDaemon_Init;
 
@@ -72 +73 @@
         return TCL_ERROR;
     }
+    if (RpSysinfo_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
     if (RpDaemon_Init(interp) != TCL_OK) {
         return TCL_ERROR;

trunk/p2p/Makefile

@@ +1 @@
+CC = gcc
+CFLAGS = -O3
+
 all:
+        $(CC) $(CFLAGS) perftest.c -o perftest
         ./mkindex handler.tcl server.tcl client.tcl log.tcl random.tcl

trunk/p2p/authority.tcl

@@ -9 +9 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 

trunk/p2p/client.tcl

@@ -6 +6 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 package require Itcl

trunk/p2p/handler.tcl

@@ -8 +8 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 package require Itcl

trunk/p2p/log.tcl

@@ -5 +5 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 # ----------------------------------------------------------------------

trunk/p2p/random.tcl

@@ -5 +5 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 

trunk/p2p/server.tcl

@@ -5 +5 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 package require Itcl

trunk/p2p/tclIndex

@@ -10 +10 @@
 set auto_index(::Handler::protocol) [list source [file join $dir handler.tcl]]
 set auto_index(::Handler::define) [list source [file join $dir handler.tcl]]
+set auto_index(::Handler::connectionName) [list source [file join $dir handler.tcl]]
 set auto_index(::Handler::connectionSpeaks) [list source [file join $dir handler.tcl]]
 set auto_index(::Handler::handle) [list source [file join $dir handler.tcl]]
 set auto_index(::Handler::finalize) [list source [file join $dir handler.tcl]]
+set auto_index(::Handler::handlerType) [list source [file join $dir handler.tcl]]
 set auto_index(Server) [list source [file join $dir server.tcl]]
 set auto_index(::Server::port) [list source [file join $dir server.tcl]]
 set auto_index(::Server::accept) [list source [file join $dir server.tcl]]
 set auto_index(::Server::connectionSpeaks) [list source [file join $dir server.tcl]]
+set auto_index(::Server::handlerType) [list source [file join $dir server.tcl]]
 set auto_index(Client) [list source [file join $dir client.tcl]]
 set auto_index(::Client::send) [list source [file join $dir client.tcl]]
 set auto_index(::Client::address) [list source [file join $dir client.tcl]]
+set auto_index(::Client::handlerType) [list source [file join $dir client.tcl]]
 set auto_index(log) [list source [file join $dir log.tcl]]
 set auto_index(randomize) [list source [file join $dir random.tcl]]

trunk/p2p/test.tcl

@@ -9 +9 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 # ======================================================================
 package require Itcl

trunk/p2p/worker.tcl

@@ -10 +10 @@
 # ======================================================================
 #  Copyright (c) 2008  Purdue Research Foundation
-# ======================================================================
+#
+#  See the file "license.terms" for information on usage and
+#  redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+# ======================================================================
+package require Rappture
 
 # recognize other library files in this same directory
@@ -41 +45 @@
 set options(max_peer_connections) 4
 
+# number of seconds between each check of system load
+set options(time_between_load_checks) 60000
+
 # ======================================================================
 #  PEERS
@@ -49 +56 @@
 # list of peers that we're testing connections with
 set peers(testing) ""
+
+# ======================================================================
+#  SYSTEM LOAD
+# ======================================================================
+# Check system load every so often.  When the load changes
+# significantly, execute a "perftest" run to compute the current
+# number of wonks available to this worker.
+
+set sysload(lastLoad) -1
+set sysload(wonks) -1
+set sysload(measured) -1
+
+after idle worker_load_check
 
 # ======================================================================
@@ -194 +214 @@
     # gets restarted in between.
     after $options(time_between_registers) worker_register
+}
+
+# ----------------------------------------------------------------------
+#  COMMAND:  worker_load_check
+#
+#  Invoked when this worker first starts up and periodically thereafter
+#  to compute the system load available to the worker.  If the system
+#  load has changed significantly, then the "perftest" program is
+#  executed to get a measure of performance available.  This program
+#  returns a number of "wonks" which we report to peers as our available
+#  performance.
+# ----------------------------------------------------------------------
+proc worker_load_check {} {
+    global options sysload dir
+
+    # see if the load has changed significantly
+    set changed 0
+    if {$sysload(lastLoad) < 0} {
+        set changed 1
+    } else {
+        set load [Rappture::sysinfo load5]
+        if {$load < 0.9*$sysload(lastLoad) || $load > 1.1*$sysload(lastLoad)} {
+            set changed 1
+        }
+    }
+
+    if {$changed} {
+        set sysload(lastLoad) [Rappture::sysinfo load5]
+puts "LOAD CHANGED: $sysload(lastLoad) [Rappture::sysinfo freeram freeswap]"
+        set sysload(measured) [clock seconds]
+
+        # Run the program, but don't use exec, since it blocks.
+        # Instead, run it in the background and harvest its output later.
+        set sysload(test) [open "| [file join $dir perftest]" r]
+        fileevent $sysload(test) readable worker_load_results
+    }
+
+    # monitor the system load at regular intervals
+    after $options(time_between_load_checks) worker_load_check
+}
+
+# ----------------------------------------------------------------------
+#  COMMAND:  worker_load_results
+#
+#  Invoked automatically when the "perftest" run finishes.  Reads the
+#  number of wonks reported on standard output and reports them to
+#  other peers.
+# ----------------------------------------------------------------------
+proc worker_load_results {} {
+    global sysload
+
+    if {[catch {read $sysload(test)} msg] == 0} {
+        if {[regexp {[0-9]+} $msg match]} {
+puts "WONKS: $match"
+            set sysload(wonks) $match
+        } else {
+            log system "ERROR: performance test failed: $msg"
+        }
+    }
+    catch {close $sysload(test)}
+    set sysload(test) ""
 }