From 0f201cda8d5099018379b44273a695d07761052d Mon Sep 17 00:00:00 2001 From: wukong Date: Sat, 7 Feb 2026 22:26:57 -0800 Subject: fixed text substitution on ck_uptime() on Darwin to allow sec counter in first minute after bootup; added (+ 0.0) in days, hrs, mins, sec cases to change string to float for comparison in if condition; --- ckt0.awk | 22 +++++++++++++--------- ckt0.sh | 2 +- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ckt0.awk b/ckt0.awk index 1511d04..740903c 100644 --- a/ckt0.awk +++ b/ckt0.awk @@ -127,9 +127,13 @@ function ck_uptime(unm) { t_up_meas[1] = 0.0 t_up_meas[2] = ck_time(unm) - sub("^.*[AP]M ", "", t_up_cmd) - sub("^.*up ", "", t_up_cmd) + # print($0) + sub("^[ ]*[0-9]*:[0-9]*[ ]", "", t_up_cmd) + #print(t_up_cmd) + sub("^.* up ", "", t_up_cmd) + #print(t_up_cmd) sub(", load.*$", "", t_up_cmd) + #print(t_up_cmd) split(t_up_cmd, t_up_cmd_arr, ",") for (i in t_up_cmd_arr) { @@ -137,33 +141,33 @@ function ck_uptime(unm) { if (t_up_cmd_arr[i] ~ /day/) { split(t_up_cmd_arr[i], days) t_up_meas[1] += 86400.0*(days[1] + 0.0) - (t_up_meas[2] > 86400.0) ? t_up_meas[2] = 86400.0 : t_up_meas[2] += 0.0 + (t_up_meas[2] + 0.0) > 86400.0 ? t_up_meas[2] = 86400.0 : t_up_meas[2] += 0.0 } if (t_up_cmd_arr[i] ~ /hr/) { split(t_up_cmd_arr[i], hrs) t_up_meas[1] += 3600.0*(hrs[1] + 0.0) - (t_up_meas[2] > 3600.0) ? t_up_meas[2] = 3600.0 : t_up_meas[2] += 0.0 + (t_up_meas[2] + 0.0) > 3600.0 ? t_up_meas[2] = 3600.0 : t_up_meas[2] += 0.0 } if (t_up_cmd_arr[i] ~ /min/) { split(t_up_cmd_arr[i], mins) - t_up_meas[1] += (60.0*(mins[1] + 0.0)) - (t_up_meas[2] > 60.0) ? t_up_meas[2] = 60.0 : t_up_meas[2] += 0.0 + t_up_meas[1] += 60.0*(mins[1] + 0.0) + (t_up_meas[2] + 0.0) > 60.0 ? t_up_meas[2] = 60.0 : t_up_meas[2] += 0.0 } if (t_up_cmd_arr[i] ~ /sec/) { split(t_up_cmd_arr[i], sec) t_up_meas[1] += sec[1] - (t_up_meas[2] > 1.0) ? t_up_meas[2] = 1.0 : t_up_meas[2] += 0.0 + (t_up_meas[2] + 0.0) > 1.0 ? t_up_meas[2] = 1.0 : t_up_meas[2] += 0.0 } if (t_up_cmd_arr[i] ~ /:/) { split(t_up_cmd_arr[i], hrs_min, ":") t_up_meas[1] += 3600.0*(hrs_min[1] + 0.0) - (t_up_meas[2] > 3600.0) ? t_up_meas[2] = 3600.0 : t_up_meas[2] += 0.0 + (t_up_meas[2] + 0.0) > 3600.0 ? t_up_meas[2] = 3600.0 : t_up_meas[2] += 0.0 t_up_meas[1] += 60.0*(hrs_min[2] + 0.0) - (t_up_meas[2] > 60.0) ? t_up_meas[2] = 60.0 : t_up_meas[2] += 0.0 + (t_up_meas[2] + 0.0) > 60.0 ? t_up_meas[2] = 60.0 : t_up_meas[2] += 0.0 } } diff --git a/ckt0.sh b/ckt0.sh index ecb46ae..7d58bd6 100644 --- a/ckt0.sh +++ b/ckt0.sh @@ -27,7 +27,7 @@ for N in $(seq 0 10080) ; do #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 )}' ) + sleep $( echo $t0_est | awk '{print( sqrt($2^2.0 + $4^2.0 + $6^2.0 + rand()^2.0)%30.0 )}' ) done -- cgit v1.2.3