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.7 -r1.3.2.8 --- openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 27 Nov 2022 17:21:26 -0000 1.3.2.7 +++ openacs-4/packages/xotcl-request-monitor/www/long-calls.adp 15 Feb 2023 13:51:06 -0000 1.3.2.8 @@ -35,12 +35,12 @@ - - - - - - + + + + + + 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.13 -r1.4.2.14 --- openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 27 Nov 2022 18:50:07 -0000 1.4.2.13 +++ openacs-4/packages/xotcl-request-monitor/www/long-calls.tcl 15 Feb 2023 13:51:06 -0000 1.4.2.14 @@ -9,6 +9,7 @@ {readsize:naturalnum 100000} {pool:word,multiple ""} {by_starttime:boolean 0} + {order:word ""} } -properties { title:onevalue context:onevalue @@ -82,6 +83,7 @@ set toggle_request_start [expr {!$by_starttime}] set toggle_request_start_url [export_vars -base long-calls {pool:multiple lines {by_starttime $toggle_request_start}}] set toggle_request_time_title [expr {$by_starttime ? "Click to order by endtime" : "Click to order by starttime"}] +set base_sort_url [export_vars -base long-calls {pool:multiple lines}] # # Map in the found pools empty to "default" @@ -207,24 +209,31 @@ }] - if {!$by_starttime} { - append rows $row - } else { + if {$by_starttime} { append order_start($timestamp_start) $row \n + } elseif {$order in {queuetime filtertime runtime totaltime}} { + append order_${order}([set $order]) $row \n + } else { + append rows $row } } +set request_time_label "Request End" if {$by_starttime} { + set order "" foreach start_time [lsort -real -decreasing [array names order_start]] { append rows $order_start($start_time) } set request_time_label "Request Start" +} elseif {$order in {queuetime filtertime runtime totaltime}} { + set ordersign_$order "↓" + foreach t [lsort -real -decreasing [array names order_${order}]] { + append rows [set order_${order}($t)] + } } else { # rows are already in the order of end time - set request_time_label "Request End" } - set doc(title) "Long Calls" set context [list $doc(title)]
@request_time_label@QueuetimeFiltertimeRuntimeTotaltimeUser ID@request_time_label@Queuetime @ordersign_queuetime@Filtertime @ordersign_filtertime@Runtime @ordersign_runtime@Totaltime @ordersign_totaltime@User ID IP Pool URL$request