[AOLSERVER-COMMITS] aolserver/tcl stats.tcl,1.3,1.4

[<gne...@us...>]

Update of /cvsroot/aolserver/aolserver/tcl
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv17325

Modified Files:
	stats.tcl 
Log Message:
- fixed Tcl expressions such they are compiled into byte code


Index: stats.tcl
===================================================================
RCS file: /cvsroot/aolserver/aolserver/tcl/stats.tcl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** stats.tcl	1 Feb 2003 23:44:25 -0000	1.3
--- stats.tcl	12 Oct 2008 09:00:34 -0000	1.4
***************
*** 37,41 ****
  
  proc _ns_stats.handleUrl {} {
!     set page [ns_conn urlv [expr [ns_conn urlc] - 1]]
      
      switch -exact $page {
--- 37,41 ----
  
  proc _ns_stats.handleUrl {} {
!     set page [ns_conn urlv [expr {[ns_conn urlc] - 1}]]
      
      switch -exact $page {
***************
*** 68,72 ****
  
  proc _ns_stats.header {{stat ""}} {
!     if [string length $stat] {
          set title "AOLserver Stats: [ns_info hostname] - $stat"
          set nav "<a href=index.adp><font color=#ffffff>Main Menu</font></a> &gt; <font color=#ffcc00>$stat</font>"
--- 68,72 ----
  
  proc _ns_stats.header {{stat ""}} {
!     if {[string length $stat]} {
          set title "AOLserver Stats: [ns_info hostname] - $stat"
          set nav "<a href=index.adp><font color=#ffffff>Main Menu</font></a> &gt; <font color=#ffcc00>$stat</font>"
***************
*** 142,146 ****
  
          foreach {k v} $stats {
!             if {[string match mtime $k]} {
                  lappend s [_ns_stats.fmtTime $v]
              } else {
--- 142,146 ----
  
          foreach {k v} $stats {
!             if {"mtime" eq $k} {
                  lappend s [_ns_stats.fmtTime $v]
              } else {
***************
*** 151,155 ****
      }
  
!     set rows [_ns_stats.sortResults $results [expr $col - 1] $numericSort $reverseSort]
  
      set html [_ns_stats.header ADP]
--- 151,155 ----
      }
  
!     set rows [_ns_stats.sortResults $results [expr {$col - 1}] $numericSort $reverseSort]
  
      set html [_ns_stats.header ADP]
***************
*** 182,186 ****
  
      set colTitles   [list Cache Max Current Entries Flushes Hits Misses "Hit Rate"]
!     set rows        [_ns_stats.sortResults $results [expr $col - 1] $numericSort $reverseSort]
      
      set html [_ns_stats.header Cache]
--- 182,186 ----
  
      set colTitles   [list Cache Max Current Entries Flushes Hits Misses "Hit Rate"]
!     set rows        [_ns_stats.sortResults $results [expr {$col - 1}] $numericSort $reverseSort]
      
      set html [_ns_stats.header Cache]
***************
*** 215,219 ****
              set contention 0.0
          } else {
!             set contention [expr double($nbusy*100.0/$nlock)]
          }
  
--- 215,219 ----
              set contention 0.0
          } else {
!             set contention [expr {double($nbusy*100.0/$nlock)}]
          }
  
***************
*** 221,225 ****
      }
  
!     foreach result [_ns_stats.sortResults $results [expr $col - 1] $numericSort $reverseSort] {
          set name        [lindex $result 0]
          set owner       [lindex $result 1]
--- 221,225 ----
      }
  
!     foreach result [_ns_stats.sortResults $results [expr {$col - 1}] $numericSort $reverseSort] {
          set name        [lindex $result 0]
          set owner       [lindex $result 1]
***************
*** 265,269 ****
          set f [open [ns_info log]]
          seek $f 0 end
!         set n [expr [tell $f] -4000]
  
          if {$n < 0} {
--- 265,269 ----
          set f [open [ns_info log]]
          seek $f 0 end
!         set n [expr {[tell $f] -4000}]
  
          if {$n < 0} {
***************
*** 326,336 ****
  		    set np [lindex $b 3]
  		    set nr [lindex $b 4]
! 		    set nu [expr $ng - $np]
! 		    set na [expr $nu * $bs]
  
! 		    incr tops [expr $ng + $np]
  		    incr tlocks [lindex $b 5]
  		    incr twaits [lindex $b 6]
! 		    incr tfree [expr $bs * $nf]
  		    incr talloc $na
  		    incr trequest $nr
--- 326,336 ----
  		    set np [lindex $b 3]
  		    set nr [lindex $b 4]
! 		    set nu [expr {$ng - $np}]
! 		    set na [expr {$nu * $bs}]
  
! 		    incr tops [expr {$ng + $np}]
  		    incr tlocks [lindex $b 5]
  		    incr twaits [lindex $b 6]
! 		    incr tfree [expr {$bs * $nf}]
  		    incr talloc $na
  		    incr trequest $nr
***************
*** 338,343 ****
  
  		    if {$nr != 0} {
! 			    set ov [expr $na - $nr]
! 			    set op [format %4.2f%% [expr $ov.0 * 100 / $nr.0]]
  		    } else {
  			    set ov "N/A"
--- 338,343 ----
  
  		    if {$nr != 0} {
! 			    set ov [expr {$na - $nr}]
! 			    set op [format %4.2f%% [expr {$ov * 100.0} / $nr]]
  		    } else {
  			    set ov "N/A"
***************
*** 362,371 ****
      }
  
!     set ov [expr $talloc - $trequest]
!     set op [format %4.2f [expr $ov.0 * 100 / $trequest.0]]
!     set av [format %4.2f [expr 100.0 - ($tlocks.0 * 100) / $tops.0]]
  
      if {$tlocks > 0} {
! 	    set wr [format %4.2f [expr $twaits.0 / $tlocks.0]]
      } else {
  	    set wr N/A
--- 362,371 ----
      }
  
!     set ov [expr {$talloc - $trequest}]
!     set op [format %4.2f [expr {$ov * 100.0 / $trequest}]]
!     set av [format %4.2f [expr {100.0 - ($tlocks * 100.0) / $tops}]]
  
      if {$tlocks > 0} {
! 	    set wr [format %4.2f [expr {$twaits*1.0 / $tlocks}]]
      } else {
  	    set wr N/A
***************
*** 467,471 ****
  
          if [catch {
!             set duration [expr $lastend - $laststart]
          }] {
              set duration "0"
--- 467,471 ----
  
          if [catch {
!             set duration [expr {$lastend - $laststart}]
          }] {
              set duration "0"
***************
*** 474,482 ****
          set state "pending"
  
!         if [_ns_stats.isThreadSuspended $flags] {
              set state suspended
          }
  
!         if [_ns_stats.isThreadRunning $flags] {
              set state running
          }
--- 474,482 ----
          set state "pending"
  
!         if {[_ns_stats.isThreadSuspended $flags]} {
              set state suspended
          }
  
!         if {[_ns_stats.isThreadRunning $flags]} {
              set state running
          }
***************
*** 487,491 ****
      set rows ""
  
!     foreach s [_ns_stats.sortResults $scheduledProcs [expr $col - 1] $numericSort $reverseSort] {
          set id          [lindex $s 0]
          set state       [lindex $s 1]
--- 487,491 ----
      set rows ""
  
!     foreach s [_ns_stats.sortResults $scheduledProcs [expr {$col - 1}] $numericSort $reverseSort] {
          set id          [lindex $s 0]
          set state       [lindex $s 1]
***************
*** 525,529 ****
      set rows ""
  
!     foreach t [_ns_stats.sortResults [ns_info threads] [expr $col - 1] $numericSort $reverseSort] {
          set thread  [lindex $t 0]
          set parent  [lindex $t 1]
--- 525,529 ----
      set rows ""
  
!     foreach t [_ns_stats.sortResults [ns_info threads] [expr {$col - 1}] $numericSort $reverseSort] {
          set thread  [lindex $t 0]
          set parent  [lindex $t 1]
***************
*** 534,542 ****
          set arg     [lindex $t 6]
          
!         if {[string match "p:0x0" $proc]} {
              set proc "NULL"
          }
          
!         if {[string match "a:0x0" $arg]} {
              set arg "NULL"
          }
--- 534,542 ----
          set arg     [lindex $t 6]
          
!         if {"p:0x0" eq $proc} {
              set proc "NULL"
          }
          
!         if {"a:0x0" eq $arg} {
              set arg "NULL"
          }
***************
*** 555,559 ****
      set numCols [llength $colTitles]
  
!     for {set colNum 1} {$colNum < [expr $numCols + 1]} {incr colNum} {
          if {$colNum == $selectedColNum} {
              set colHdrColor($colNum)        "#666666"
--- 555,559 ----
      set numCols [llength $colTitles]
  
!     for {set colNum 1} {$colNum < [expr {$numCols + 1}]} {incr colNum} {
          if {$colNum == $selectedColNum} {
              set colHdrColor($colNum)        "#666666"
***************
*** 580,584 ****
  
          if {$i == $selectedColNum} {
!             if $reverseSort {
                  append url "?reversesort=0"
              } else {
--- 580,584 ----
  
          if {$i == $selectedColNum} {
!             if {$reverseSort} {
                  append url "?reversesort=0"
              } else {
***************
*** 591,598 ****
          set colAlign "left"
  
!         if [llength $colAlignment] {
!             set align [lindex $colAlignment [expr $i - 1]]
  
!             if [string length $align] {
                  set colAlign $align
              }
--- 591,598 ----
          set colAlign "left"
  
!         if {[llength $colAlignment]} {
!             set align [lindex $colAlignment [expr {$i - 1}]]
  
!             if {[string length $align]} {
                  set colAlign $align
              }
***************
*** 614,621 ****
              set colAlign "left"
  
!             if [llength $colAlignment] {
!                 set align [lindex $colAlignment [expr $i - 1]]
  
!                 if [string length $align] {
                      set colAlign $align
                  }
--- 614,621 ----
              set colAlign "left"
  
!             if {[llength $colAlignment]} {
!                 set align [lindex $colAlignment [expr {$i - 1}]]
  
!                 if {[string length $align]} {
                      set colAlign $align
                  }
***************
*** 679,691 ****
  
  proc _ns_stats.isThreadSuspended {flags} {
!     return [expr $flags & [_ns_stats.getSchedFlag paused]]
  }
  
  proc _ns_stats.isThreadRunning {flags} {
!     return [expr $flags & [_ns_stats.getSchedFlag running]]
  }
  
  proc _ns_stats.getSchedFlagTypes {flags} {
!     if [expr $flags & [_ns_stats.getSchedFlag once]] {
          set types "once"
      } else {
--- 679,691 ----
  
  proc _ns_stats.isThreadSuspended {flags} {
!     return [expr {$flags & [_ns_stats.getSchedFlag paused]}]
  }
  
  proc _ns_stats.isThreadRunning {flags} {
!     return [expr {$flags & [_ns_stats.getSchedFlag running]}]
  }
  
  proc _ns_stats.getSchedFlagTypes {flags} {
!     if [expr {$flags & [_ns_stats.getSchedFlag once]}] {
          set types "once"
      } else {
***************
*** 693,705 ****
      }
  
!     if [expr $flags & [_ns_stats.getSchedFlag daily]] {
          lappend types "daily"
      }
  
!     if [expr $flags & [_ns_stats.getSchedFlag weekly]] {
          lappend types "weekly"
      }
  
!     if [expr $flags & [_ns_stats.getSchedFlag thread]] {
          lappend types "thread"
      }
--- 693,705 ----
      }
  
!     if [expr {$flags & [_ns_stats.getSchedFlag daily]}] {
          lappend types "daily"
      }
  
!     if [expr {$flags & [_ns_stats.getSchedFlag weekly]}] {
          lappend types "weekly"
      }
  
!     if [expr {$flags & [_ns_stats.getSchedFlag thread]}] {
          lappend types "thread"
      }
***************
*** 714,726 ****
  
      if {$seconds < 3600} {
!         set mins [expr $seconds/60]
!         set secs [expr $seconds - ($mins * 60)]
  
          return "${mins}:${secs} (m:s)"
      }
  
!     set hours [expr $seconds/3600]
      set mins [expr ($seconds - ($hours * 3600))/60]
!     set secs [expr $seconds - (($hours * 3600) + ($mins * 60))]
  
      return "${hours}:${mins}:${secs} (h:m:s)"
--- 714,726 ----
  
      if {$seconds < 3600} {
!         set mins [expr {$seconds/60}]
!         set secs [expr {$seconds - ($mins * 60)}]
  
          return "${mins}:${secs} (m:s)"
      }
  
!     set hours [expr {$seconds/3600}]
      set mins [expr ($seconds - ($hours * 3600))/60]
!     set secs [expr {$seconds - (($hours * 3600) + ($mins * 60))}]
  
      return "${hours}:${mins}:${secs} (h:m:s)"
***************
*** 751,756 ****
      set v2  [lindex $v2 $_sortListTmp(field)]
  
!     if $_sortListTmp(numeric) {
!         if $_sortListTmp(reverse) {
              set cmp [_ns_stats.cmpNumeric $v2 $v1]
          } else {
--- 751,756 ----
      set v2  [lindex $v2 $_sortListTmp(field)]
  
!     if {$_sortListTmp(numeric)} {
!         if {$_sortListTmp(reverse)} {
              set cmp [_ns_stats.cmpNumeric $v2 $v1]
          } else {
***************
*** 758,762 ****
          }
      } else {
!         if $_sortListTmp(reverse) { 
              set cmp [string compare $v2 $v1]
          } else {
--- 758,762 ----
          }
      } else {
!         if {$_sortListTmp(reverse)} { 
              set cmp [string compare $v2 $v1]
          } else {