1 files changed, 16 insertions, 21 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_percentiles.sh b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_percentiles.sh
index 28ddaffd752..1ee71321146 100755
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_percentiles.sh
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/generate_percentiles.sh
@@ -2,16 +2,17 @@
 
 . parameters
 
-for t in $TYPES; do
-  cat /dev/null > ${t}.min.dat
+PERCENTILES="0 .25 .50 .75 .99 .999 .9999 1"
+
+for t in $*; do
   cat /dev/null > ${t}.avg.dat
-  cat /dev/null > ${t}.99.dat
-  cat /dev/null > ${t}.999.dat
-  cat /dev/null > ${t}.9999.dat
+  for p in $PERCENTILES; do
+    cat /dev/null > ${t}$p.percentile.dat
+  done
 
   for c in $NCONSUMERS; do
     echo $t $c
-    INPUT=${INPUT_BASE}.${t}.${c}.8.txt
+    INPUT=${t}.${c}.16.txt
     awk -v c=$c '/^HISTO/ {
                    n++;
                    s += $3
@@ -19,31 +20,25 @@ for t in $TYPES; do
                  END {
                    printf("%d %f\n", c, s/n);
                  }' $INPUT >> ${t}.avg.dat
-    awk -v c=$c 'BEGIN { n = 0; }
-                 /^HISTO/ {
-                  if (n == 0 || m > $3) {
-                    m = $3;
-                  }
-                  n++;
-                }
-                END {
-                  printf("%d %f\n", c, m);
-                }' $INPUT >> ${t}.min.dat
 
     TFILE=/tmp/${t}.$$
     awk '/^HISTO/ {print $3}' $INPUT | sort -n | uniq -c > $TFILE
-    for p in 99 999 9999; do
+    for p in $PERCENTILES; do
         awk -v N=$ITERATIONS '{print $2, $1 / N}' $TFILE |
-        awk -v c=$c -v p=0.${p} '\
-BEGIN { x = 0; }
+        awk -v c=$c -v p=${p} '\
+BEGIN { x = 0; l = 0; }
 { s += $2;
-  if (x == 0 && s > p) {
+  l = $1;
+  if (x == 0 && s >= p) {
       x = $1;
   }
 }
 END {
+  if (s < p) {
+    x = l;
+  }
   printf("%d %f\n", c, x);
-}' >> ${t}.${p}.dat
+}' >> ${t}${p}.percentile.dat
     done
     /bin/rm -f $TFILE