added uname case for 'Darwin';

added seconds case for ck_uptime();
completed ck_time() function to allow different commands for checking time;
reverted t_meas estimation to basic subtraction method;
adjusted sleep timer from mod 30 to mod 60 in ckt0.sh;

1 files changed, 6 insertions, 6 deletions

diff --git a/ckt0.sh b/ckt0.sh
index cf54ad0..2983881 100644
--- a/ckt0.sh
+++ b/ckt0.sh
@@ -8,7 +8,7 @@ set -e
 
 # raw input data
 #date +%s
-#sysctl_t0_str=$( sysctl kern.boottime | mawk -F= '{print($NF)}' )
+#sysctl_t0_str=$( sysctl kern.boottime | awk -F= '{print($NF)}' )
 #sysctl_t0=$( date -jf "%a %b %d %H:%M:%S %G" "${sysctl_t0_str}" +%s )
 
 
@@ -23,11 +23,11 @@ printf "n t_est t_unc t_up_est t_up_unc t0_est t0_unc\n" | column -t
 for N in $(seq 0 10080) ; do
 
     printf "${N} ${t0_est}\n" | column -t
-    t0_est=$( mawk -f ckt0.awk ${t0_est} | tail -n2 )
-    #mawk -f ckt0.awk
-    #sleep $( mawk 'BEGIN {print(sqrt( rand()^2.0 + 1.0 ))}' )
-    #sleep $( echo $t0_est | mawk '{print(sqrt( ((60.0*$4)/(60.0 + $4))^2.0 + rand()^2.0 ))}' )
-    sleep $( echo $t0_est | mawk '{print( sqrt($2^2.0 + $4^2.0 + $6^2.0 + rand()^2.0)%30.0 )}' )
+    t0_est=$( awk -f ckt0.awk ${t0_est} | tail -n2 )
+    #awk -f ckt0.awk
+    #sleep $( awk 'BEGIN {print(sqrt( rand()^2.0 + 1.0 ))}' )
+    #sleep $( echo $t0_est | awk '{print(sqrt( ((60.0*$4)/(60.0 + $4))^2.0 + rand()^2.0 ))}' )
+    sleep $( echo $t0_est | awk '{print( sqrt($2^2.0 + $4^2.0 + $6^2.0 + rand()^2.0)%60.0 )}' )
 
 done