Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 11 Dec 2003 21:39:50 -0000 1.21 +++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 29 Dec 2003 20:08:52 -0000 1.22 @@ -127,15 +127,15 @@ } } if { $counter > 0 } { - append out "$counter database command[ad_decode $counter 1 " taking" "s totalling"] [format "%.f" [expr { $total / 1000 }]] ms" + append out "$counter database command[ad_decode $counter 1 " taking" "s totalling"] [format "%.f" [expr { $total }]] ms" } } if { [nsv_exists ds_request "$ad_conn(request).conn"] } { array set conn [nsv_get ds_request "$ad_conn(request).conn"] if { [info exists conn(startclicks)] } { append out "page served in - [format "%.f" [expr { ([clock clicks] - $conn(startclicks)) / 1000 }]] ms\n" + [format "%.f" [expr { ([clock clicks -milliseconds] - $conn(startclicks)) }]] ms\n" } } @@ -214,7 +214,7 @@ } } - ds_add db $db $command $statement_name $bound_sql $start_time [clock clicks] $errno $error + ds_add db $db $command $statement_name $bound_sql $start_time [clock clicks -milliseconds] $errno $error } } @@ -277,7 +277,7 @@ ad_proc -private ds_trace_filter { conn args why } { Adds developer-support information about the end of sessions.} { if { [ds_enabled_p] && [ds_collection_enabled_p] } { - ds_add conn end [ns_time] endclicks [clock clicks] + ds_add conn end [ns_time] endclicks [clock clicks -milliseconds] for { set i 0 } { $i < [ns_set size [ad_conn outputheaders]] } { incr i } { ds_add oheaders [ns_set key [ad_conn outputheaders] $i] [ns_set value [ad_conn outputheaders] $i] Index: openacs-4/packages/acs-ldap-authentication/www/examples/ldap-test.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-ldap-authentication/www/examples/ldap-test.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-ldap-authentication/www/examples/ldap-test.tcl 20 Apr 2001 20:51:09 -0000 1.1 +++ openacs-4/packages/acs-ldap-authentication/www/examples/ldap-test.tcl 29 Dec 2003 20:08:52 -0000 1.2 @@ -1,10 +1,10 @@ -set startclicks [clock clicks] +set startclicks [clock clicks -milliseconds] ReturnHeaders text/plain ns_write " ldap_set_environment: [ldap_set_environment] -[expr ($startclicks - [clock clicks]) / 1000]: +[expr ($startclicks - [clock clicks -milliseconds])]: " util_unlist [ldap_set_environment] url rootdn rootpw basedn security_method @@ -23,42 +23,42 @@ ns_write " ldap_user_exists: [ldap_user_exists foo@bar.com] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return 1 ns_write " ldap_user_exists: [ldap_user_exists fool@bar.com] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return 0 ns_write " get_dn_from_email: [ldap_get_dn_from_email foo@bar.com] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return cn=Joe User, $basedn ns_write " get_dn_from_email: [ldap_get_dn_from_email fool@bar.com] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return "" ns_write " ldap_change_password: [ldap_change_password [ldap_get_dn_from_email foo@bar.com] dennis1] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return 1 ns_write " ldap_check_password: [ldap_check_password foo@bar.com dennis] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return 0 ns_write " ldap_check_password: [ldap_check_password fool@bar.com dennis] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return 0 ns_write " ldap_check_password: [ldap_check_password foo@bar.com dennis1] -[expr ($startclicks - [clock clicks]) / 1000]: " +[expr ($startclicks - [clock clicks -milliseconds])]: " #should return 1 Index: openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/Attic/00-database-procs.tcl,v diff -u -r1.45 -r1.46 --- openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 11 Dec 2003 21:39:56 -0000 1.45 +++ openacs-4/packages/acs-tcl/tcl/00-database-procs.tcl 29 Dec 2003 20:08:52 -0000 1.46 @@ -468,7 +468,7 @@ } if { $db_state(n_handles_used) >= [llength $db_state(handles)] } { set pool [db_nth_pool_name -dbn $dbn $db_state(n_handles_used)] - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] set errno [catch { set db [ns_db gethandle $pool] } error] @@ -743,7 +743,7 @@ @see db_exec_plsql } { - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] set sql [db_qd_replace_sql $statement_name $pre_sql] @@ -886,7 +886,7 @@ break } - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] ns_db releasehandle $db ad_call_proc_if_exists ds_collect_db_call $db releasehandle "" "" $start_time 0 "" incr index_to_examine -1 @@ -902,7 +902,7 @@ routines as necessary. } { - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] set errno [catch { return [ns_db getrow $db $selection] } error] ad_call_proc_if_exists ds_collect_db_call $db getrow "" "" $start_time $errno $error if { $errno == 2 } { @@ -920,7 +920,7 @@ (if set). } { - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] set driverkey [db_driverkey -handle_p 1 $db] # Note: Although marked as private, db_exec is in fact called @@ -2930,7 +2930,7 @@ depending on the value of the $bind variable in the calling environment (if set). } { - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] set sql [db_qd_replace_sql $statement_name $pre_sql] @@ -3049,7 +3049,7 @@ Low level replacement for db_exec which emulates blob handling. } { - set start_time [clock clicks] + set start_time [clock clicks -milliseconds] # Query Dispatcher (OpenACS - ben) set sql [db_qd_replace_sql $statement_name $pre_sql] Index: openacs-4/packages/acs-tcl/tcl/document-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/document-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/acs-tcl/tcl/document-procs.tcl 10 Sep 2002 22:22:14 -0000 1.2 +++ openacs-4/packages/acs-tcl/tcl/document-procs.tcl 29 Dec 2003 20:08:52 -0000 1.3 @@ -135,7 +135,7 @@ proc_doc doc_find_template { filename } { Finds a master.adp file which can be used as a master template, looking in the directory containing $filename and working our way down the directory tree. } { set path_root [acs_root_dir] - set start [clock clicks] + set start [clock clicks -milliseconds] set dir [file dirname $filename] while { [string length $dir] > 1 && [string first $path_root $dir] == 0 } { Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v diff -u -r1.53 -r1.54 --- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 22 Dec 2003 21:44:44 -0000 1.53 +++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl 29 Dec 2003 20:08:52 -0000 1.54 @@ -227,7 +227,7 @@ the browser if it fails (unless kind is trace). } { - set startclicks [clock clicks] + set startclicks [clock clicks -milliseconds] util_unlist $filter_info filter_index debug_p arg_count proc arg @@ -252,21 +252,21 @@ if { $errno } { # Uh-oh - an error occurred. global errorInfo - ad_call_proc_if_exists ds_add rp [list filter [list $why [ns_conn method] [ns_conn url] $proc $arg] $startclicks [clock clicks] "error" $errorInfo] + ad_call_proc_if_exists ds_add rp [list filter [list $why [ns_conn method] [ns_conn url] $proc $arg] $startclicks [clock clicks -milliseconds] "error" $errorInfo] # make sure you report catching the error! rp_debug "error in filter $proc for [ns_conn method] [ns_conn url]?[ns_conn query] errno is $errno message is $errorInfo" rp_report_error set result "filter_return" } elseif { [string compare $result "filter_ok"] && [string compare $result "filter_break"] && \ [string compare $result "filter_return"] } { set error_msg "error in filter $proc for [ns_conn method] [ns_conn url]?[ns_conn query]. Filter returned invalid result \"$result\"" - ad_call_proc_if_exists ds_add rp [list filter [list $why [ns_conn method] [ns_conn url] $proc $arg] $startclicks [clock clicks] "error" $error_msg] + ad_call_proc_if_exists ds_add rp [list filter [list $why [ns_conn method] [ns_conn url] $proc $arg] $startclicks [clock clicks -milliseconds] "error" $error_msg] # report the bad filter_return message rp_debug -debug t error $error_msg rp_report_error -message $error_msg set result "filter_return" } else { - ad_call_proc_if_exists ds_add rp [list filter [list $why [ns_conn method] [ns_conn url] $proc $arg] $startclicks [clock clicks] $result] + ad_call_proc_if_exists ds_add rp [list filter [list $why [ns_conn method] [ns_conn url] $proc $arg] $startclicks [clock clicks -milliseconds] $result] } rp_debug -debug $debug_p "Done invoking $why filter $proc (returning $result)" @@ -285,7 +285,7 @@ Invokes a registered procedure. } { - set startclicks [clock clicks] + set startclicks [clock clicks -milliseconds] util_unlist $argv proc_index debug_p arg_count proc arg @@ -307,11 +307,11 @@ if { $errno } { # Uh-oh - an error occurred. global errorInfo - ad_call_proc_if_exists ds_add rp [list registered_proc [list $proc $arg] $startclicks [clock clicks] "error" $errorInfo] + ad_call_proc_if_exists ds_add rp [list registered_proc [list $proc $arg] $startclicks [clock clicks -milliseconds] "error" $errorInfo] rp_debug "error in $proc for [ns_conn method] [ns_conn url]?[ns_conn query] errno is $errno message is $errorInfo" rp_report_error } else { - ad_call_proc_if_exists ds_add rp [list registered_proc [list $proc $arg] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list registered_proc [list $proc $arg] $startclicks [clock clicks -milliseconds]] } rp_debug -debug $debug_p "Done Invoking registered procedure $proc" @@ -495,7 +495,7 @@ ad_conn -reset ad_conn -set request [nsv_incr rp_properties request_count] ad_conn -set user_id 0 - ad_conn -set start_clicks [clock clicks] + ad_conn -set start_clicks [clock clicks -milliseconds] ad_call_proc_if_exists ds_collect_connection_info @@ -679,7 +679,7 @@ } { if { [ad_parameter -package_id [ad_acs_kernel_id] DebugP request-processor 0] } { global ad_conn - set clicks [clock clicks] + set clicks [clock clicks -milliseconds] ad_call_proc_if_exists ds_add rp [list debug $string $clicks $clicks] } if { [ad_parameter -package_id [ad_acs_kernel_id] LogDebugP request-processor 0] @@ -688,7 +688,7 @@ } { global ad_conn if { [info exists ad_conn(start_clicks)] } { - set timing " ([expr {([clock clicks] - $ad_conn(start_clicks))/1000.0}] ms)" + set timing " ([expr {([clock clicks -milliseconds] - $ad_conn(start_clicks))}] ms)" } else { set timing "" } @@ -761,7 +761,7 @@ set recursion_count [ad_conn recursion_count] ad_conn -set recursion_count [incr recursion_count] - set startclicks [clock clicks] + set startclicks [clock clicks -milliseconds] rp_debug "rp_handler: handling request: [ns_conn method] [ns_conn url]?[ns_conn query]" if { [set code [catch { if { [rp_performance_mode] } { @@ -796,15 +796,15 @@ set tcl_url2path_info([ad_conn url]) [ad_conn path_info] } notfound val { ad_call_proc_if_exists ds_comment "rp_handler: not found" - ad_call_proc_if_exists ds_add rp [list transformation [list notfound "$root / $path" $val] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list notfound "$root / $path" $val] $startclicks [clock clicks -milliseconds]] continue } redirect url { ad_call_proc_if_exists ds_comment "rp_handler: redirect" - ad_call_proc_if_exists ds_add rp [list transformation [list redirect $root/$path $url] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list redirect $root/$path $url] $startclicks [clock clicks -milliseconds]] ad_returnredirect $url } directory dir_index { ad_call_proc_if_exists ds_comment "rp_handler: dir_index" - ad_call_proc_if_exists ds_add rp [list transformation [list directory $root/$path $dir_index] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list directory $root/$path $dir_index] $startclicks [clock clicks -milliseconds]] continue } @@ -858,21 +858,21 @@ set tcl_url2file([ad_conn url]) [ad_conn file] set tcl_url2path_info([ad_conn url]) [ad_conn path_info] } notfound val { - ad_call_proc_if_exists ds_add rp [list transformation [list notfound $root/$path $val] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list notfound $root/$path $val] $startclicks [clock clicks -milliseconds]] continue } redirect url { - ad_call_proc_if_exists ds_add rp [list transformation [list redirect $root/$path $url] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list redirect $root/$path $url] $startclicks [clock clicks -milliseconds]] ad_returnredirect $url } directory dir_index { - ad_call_proc_if_exists ds_add rp [list transformation [list directory $root/$path $dir_index] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list directory $root/$path $dir_index] $startclicks [clock clicks -milliseconds]] continue } return } } - ad_call_proc_if_exists ds_add rp [list transformation [list notfound $root/$path notfound] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list transformation [list notfound $root/$path notfound] $startclicks [clock clicks -milliseconds]] ns_returnnotfound } errmsg]] } { if {$code == 1} { @@ -970,7 +970,7 @@ Serves a file. } { set extension [file extension $file] - set startclicks [clock clicks] + set startclicks [clock clicks -milliseconds] if { [nsv_exists rp_extension_handlers $extension] } { set handler [nsv_get rp_extension_handlers $extension] @@ -982,10 +982,10 @@ # do nothing } rp_finish_serving_page - ad_call_proc_if_exists ds_add rp [list serve_file [list $file $handler] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list serve_file [list $file $handler] $startclicks [clock clicks -milliseconds]] } error]] } { global errorCode errorInfo - ad_call_proc_if_exists ds_add rp [list serve_file [list $file $handler] $startclicks [clock clicks] error "$errorCode: $errorInfo"] + ad_call_proc_if_exists ds_add rp [list serve_file [list $file $handler] $startclicks [clock clicks -milliseconds] error "$errorCode: $errorInfo"] return -code $errno -errorcode $errorCode -errorinfo $errorInfo $error } } else { @@ -1002,7 +1002,7 @@ ad_raise notfound } else { set type [ns_guesstype $file] - ad_call_proc_if_exists ds_add rp [list serve_file [list $file $type] $startclicks [clock clicks]] + ad_call_proc_if_exists ds_add rp [list serve_file [list $file $type] $startclicks [clock clicks -milliseconds]] ns_returnfile 200 $type $file } } Index: openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl,v diff -u -r1.63 -r1.64 --- openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 18 Dec 2003 15:44:07 -0000 1.63 +++ openacs-4/packages/acs-tcl/tcl/utilities-procs.tcl 29 Dec 2003 20:08:52 -0000 1.64 @@ -3528,7 +3528,7 @@ } } - set boundary [ns_sha1 [list [clock clicks] [clock seconds]]] + set boundary [ns_sha1 [list [clock clicks -milliseconds] [clock seconds]]] set payload {} if {[info exists data] && [string length $data]} { Index: openacs-4/packages/acs-templating/tcl/filter-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/filter-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/acs-templating/tcl/filter-procs.tcl 1 Nov 2003 08:45:37 -0000 1.12 +++ openacs-4/packages/acs-templating/tcl/filter-procs.tcl 29 Dec 2003 20:08:52 -0000 1.13 @@ -79,12 +79,12 @@ regexp {^/([^/]*)(.*)} $url_stub all package_key rest set file_stub "[acs_root_dir]/packages/$package_key/www$rest" - set beginTime [clock clicks] + set beginTime [clock clicks -milliseconds] set output "
[ns_quotehtml \
       [template::adp_compile -file $file_stub.adp]]
" - set timeElapsed [expr ([clock clicks] - $beginTime) / 1000] + set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)] ns_log debug "cmp_page_filter: Time elapsed: $timeElapsed" } errMsg] } { @@ -106,13 +106,13 @@ regexp {^/([^/]*)(.*)} $url_stub all package_key rest set code_stub "[acs_root_dir]/packages/$package_key/www$rest" - set beginTime [clock clicks] + set beginTime [clock clicks -milliseconds] set file_stub [template::get_resource_path]/messages/datasources set output [template::adp_parse $file_stub [list code_stub $code_stub]] - set timeElapsed [expr ([clock clicks] - $beginTime) / 1000] + set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)] ns_log debug " dat_page_filter: Time elapsed: $timeElapsed" } errMsg] } { @@ -155,11 +155,11 @@ ad_proc -public frm_page_filter { why } { if { [catch { - set beginTime [clock clicks] + set beginTime [clock clicks -milliseconds] set output [template::frm_page_handler] - set timeElapsed [expr ([clock clicks] - $beginTime) / 1000.] + set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)] ns_log debug "frm_page_filter: Time elapsed: $timeElapsed" } errMsg] } { Index: openacs-4/packages/acs-templating/tcl/query-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/query-procs.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/acs-templating/tcl/query-procs.tcl 11 Dec 2003 21:39:57 -0000 1.18 +++ openacs-4/packages/acs-templating/tcl/query-procs.tcl 29 Dec 2003 20:08:52 -0000 1.19 @@ -79,7 +79,7 @@ set sql [string trim $sql] set full_statement_name [db_qd_get_fullname $statement_name] - #set beginTime [clock clicks] + #set beginTime [clock clicks -milliseconds] template::util::get_opts $args @@ -110,7 +110,7 @@ set_cached_result } - #set timeElapsed [expr ([clock clicks] - $beginTime) / 1000] + #set timeElapsed [expr ([clock clicks -milliseconds] - $beginTime)] #ns_log Notice "Query performed in: $timeElapsed ms" return $ret_code Index: openacs-4/packages/acs-templating/www/doc/demo/error.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/error.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/error.tcl 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/error.tcl 29 Dec 2003 20:08:52 -0000 1.2 @@ -1,5 +1,5 @@ -if { [clock clicks] % 2 } { +if { [clock clicks -milliseconds] % 2 } { lappend problems is_odd "You caught the page on an odd tick." lappend problems another_thing "This is just another error." } Index: openacs-4/packages/acs-templating/www/doc/demo/implicit_escape.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/www/doc/demo/implicit_escape.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/acs-templating/www/doc/demo/implicit_escape.adp 13 Mar 2001 22:59:27 -0000 1.1 +++ openacs-4/packages/acs-templating/www/doc/demo/implicit_escape.adp 29 Dec 2003 20:08:52 -0000 1.2 @@ -1,6 +1,6 @@

<%=$x%>

-

The current date and time is: <%=[clock format [clock clicks]]%> +

The current date and time is: <%=[clock format [clock clicks -milliseconds]]%> Index: openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl 14 Dec 2003 15:56:16 -0000 1.2 +++ openacs-4/packages/xml-rpc/tcl/xml-rpc-procs.tcl 29 Dec 2003 20:08:52 -0000 1.3 @@ -59,7 +59,7 @@ # be thread/process safe. Hence spin till success set fp "" while {$fp == ""} { - set filename "[ns_tmpnam][clock clicks].xmlrpc2" + set filename "[ns_tmpnam][clock clicks -milliseconds].xmlrpc2" set fp [ns_openexcl $filename] }