Index: openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl,v diff -u -r1.67.2.52 -r1.67.2.53 --- openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 24 Nov 2022 13:36:42 -0000 1.67.2.52 +++ openacs-4/packages/xotcl-request-monitor/tcl/throttle_mod-procs.tcl 24 Nov 2022 19:26:45 -0000 1.67.2.53 @@ -1683,18 +1683,22 @@ # Older version of NaviServer or AOLserver # throttle proc partialtimes {} { - set t [ns_time diff [ns_time get] [ns_conn start]] + set s [ns_conn start] + set t [ns_time diff [ns_time get] $s] set ms [expr {[ns_time seconds $t]*1000 + [ns_time microseconds $t]/1000}] - return [list ms $ms runtime [expr {$ms/1000.0}] filtertime 0 queuetime 0 accepttime 0] + return [list start $s ms $ms runtime [expr {$ms/1000.0}] filtertime 0 queuetime 0 accepttime 0] } } else { # # Use variant based on "ns_conn partialtimes" # throttle proc partialtimes {} { + set s [ns_conn start] set d [ns_conn partialtimes] - set t [ns_time diff [ns_time get] [ns_conn start]] - lappend d ms [expr {[ns_time seconds $t]*1000 + [ns_time microseconds $t]/1000}] + set t [ns_time diff [ns_time get] $s] + lappend d \ + ms [expr {[ns_time seconds $t]*1000 + [ns_time microseconds $t]/1000}] \ + start $s return $d } } Index: openacs-4/packages/xotcl-request-monitor/www/long-calls.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/long-calls.adp,v diff -u -r1.3.2.5 -r1.3.2.6 --- openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 24 Nov 2022 13:36:42 -0000 1.3.2.5 +++ openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 24 Nov 2022 19:26:45 -0000 1.3.2.6 @@ -34,6 +34,7 @@
Request Start | Queuetime | Filtertime | Runtime | Index: openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl,v diff -u -r1.4.2.10 -r1.4.2.11 --- openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 31 Oct 2022 07:14:03 -0000 1.4.2.10 +++ openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 24 Nov 2022 19:26:45 -0000 1.4.2.11 @@ -119,14 +119,23 @@ set queuetime [dict get $time queuetime] set filtertime [dict get $time filtertime] set runtime [dict get $time runtime] + if {[dict exists $time start]} { + set s0 [dict get $time start] + set start_secs [ns_time seconds $s0] + set start_msecs [string range [ns_time format $s0] end-6 end] + set start [clock format $start_secs -format %H:%M:%S]$start_msecs + } else { + set start "" + } set totaltime [format %8.6f [expr {$queuetime + $filtertime + $runtime}]] set color(queuetime) [::xo::colorize_slow_calls -fast 0.001 -warning 0.50 -danger 1.00 $queuetime] set color(filtertime) [::xo::colorize_slow_calls -fast 0.010 -warning 1.00 -danger 2.00 $filtertime] set color(runtime) [::xo::colorize_slow_calls -fast 0.010 -warning 5.00 -danger 10.00 $runtime] set color(totaltime) [::xo::colorize_slow_calls -fast 0.010 -warning 5.00 -danger 10.00 $totaltime] + set color(start) "small info bg-info bg-opacity-10" } else { - lassign {"" "" ""} queuetime filtertime runtime - lassign {"" "" ""} color(queuetime) color(filtertime) color(runtime) + lassign {"" "" "" ""} start queuetime filtertime runtime + lassign {"" "" "" ""} color(start) color(queuetime) color(filtertime) color(runtime) set totaltime $time set color(totaltime) [::xo::colorize_slow_calls -fast 0.010 -warning 3.00 -danger 10.00 $totaltime] } @@ -140,12 +149,13 @@ set request [ns_quotehtml $url] set request [::xo::regsub_eval {user_id=([0-9]+)} $request {::xo::subst_user_link user_id= \1} user_id=] append rows "||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
$queuetime | " \ - "$filtertime | " \ - "$runtime | " \ - "$totaltime | " \ - "$year $mon $day $hours | " \ - "$userinfo | " \ + "$start | " \ + "$queuetime | " \ + "$filtertime | " \ + "$runtime | " \ + "$totaltime | " \ + "$year $mon $day $hours | " \ + "$userinfo | " \ "$iplink | " \ "$pool | " \ "$request | " \