[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5203: Remove stats.pl and friends; they are unused.
- From: noreply@xxxxxxxxxxxxx
- To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
- Date: Mon, 29 Nov 2010 12:11:29 -0000
------------------------------------------------------------
revno: 5203
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-11-29 13:09:22 +0100
message:
Remove stats.pl and friends; they are unused.
removed:
test/auth_eval.sh
test/auth_measure.sh
test/stats.pl
modified:
Makefile.am
--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk
Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'Makefile.am'
--- Makefile.am 2010-11-29 09:03:16 +0000
+++ Makefile.am 2010-11-29 12:09:22 +0000
@@ -30,7 +30,6 @@
EXTRA_DIST += packaging process_modules.py tools/maintainer
EXTRA_DIST += $(wildcard modules/*/module_info.xml)
EXTRA_DIST += $(wildcard modules/*/Makefile.am) $(wildcard modules/*/*/*.c)
-EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/test/,*.pl *.sh))
EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/tools/,*.cfg *.pl *.sh))
EXTRA_DIST += $(wildcard $(addprefix $(srcdir)/firewall/,*.cfg))
EXTRA_DIST += $(HIPL_HEADER_LIST)
=== removed file 'test/auth_eval.sh'
--- test/auth_eval.sh 2010-05-04 16:52:38 +0000
+++ test/auth_eval.sh 1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-#!/bin/sh
-# useful for debugging: -xv
-
-HIPL_DIR=~/dev/hipl--esp--2.6
-BASE_DIR=~/dev/measurements
-DEVICE_TYPE=endhost
-
-# needed by the script - don't change these variables
-EXT_BASE_DIR=$BASE_DIR/auth_performance2
-TEST_DIR=$HIPL_DIR/test
-OUTPUT_DIR=$EXT_BASE_DIR/output
-STAGING_DIR=$EXT_BASE_DIR/staging
-RESULTS_DIR=$EXT_BASE_DIR/results
-
-
-if [ ! -e $BASE_DIR ]
-then
- echo $BASE_DIR "not found"
- exit 1
-fi
-
-if [ ! -e $EXT_BASE_DIR ]
-then
- echo $EXT_BASE_DIR "not found"
- exit 1
-fi
-
-if [ ! -e $OUTPUT_DIR ]
-then
- echo $OUTPUT_DIR "not found"
- exit 1
-fi
-
-if [ ! -e $OUTPUT_DIR/$DEVICE_TYPE ]
-then
- echo $OUTPUT_DIR/$DEVICE_TYPE "not found"
- exit 1
-fi
-
-if [ ! -e $STAGING_DIR ]
-then
- mkdir $STAGING_DIR
-fi
-
-if [ ! -e $STAGING_DIR/$DEVICE_TYPE ]
-then
- mkdir $STAGING_DIR/$DEVICE_TYPE
-fi
-
-if [ ! -e $RESULTS_DIR ]
-then
- mkdir $RESULTS_DIR
-fi
-
-if [ ! -e $RESULTS_DIR/$DEVICE_TYPE ]
-then
- mkdir $RESULTS_DIR/$DEVICE_TYPE
-fi
-
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "sha1-20:") printf("%.3f ms\n",
$3);}' | tee $STAGING_DIR/$DEVICE_TYPE/sha1-20
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "sha1-40:") printf("%.3f ms\n",
$3);}' | tee $STAGING_DIR/$DEVICE_TYPE/sha1-40
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "sha1-1280:") printf("%.3f
ms\n", $3);}' | tee $STAGING_DIR/$DEVICE_TYPE/sha1-1280
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "sha1-hmac:") printf("%.3f
ms\n", $3);}' | tee $STAGING_DIR/$DEVICE_TYPE/sha1-hmac
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "AES" && $3 == "encrypt:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/aes_enc
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "AES" && $3 == "decrypt:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/aes_dec
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "rsa" && $3 == "signature:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/rsa_sign
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "rsa" && $3 == "verification:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/rsa_verify
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "dsa" && $3 == "signature:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/dsa_sign
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "dsa" && $3 == "verification:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/dsa_verify
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "ecdsa" && $3 == "signature:")
printf("%.3f ms\n", $4);}' | tee $STAGING_DIR/$DEVICE_TYPE/ecdsa_sign
-cat $OUTPUT_DIR/$DEVICE_TYPE | awk '{if ($2 == "ecdsa" && $3 ==
"verification:") printf("%.3f ms\n", $4);}' | tee
$STAGING_DIR/$DEVICE_TYPE/ecdsa_verify
-
-cat $STAGING_DIR/$DEVICE_TYPE/sha1-20 | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/sha1-20
-cat $STAGING_DIR/$DEVICE_TYPE/sha1-40 | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/sha1-40
-cat $STAGING_DIR/$DEVICE_TYPE/sha1-1280 | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/sha1-1280
-cat $STAGING_DIR/$DEVICE_TYPE/sha1-hmac | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/sha1-hmac
-cat $STAGING_DIR/$DEVICE_TYPE/aes_enc | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/aes_enc
-cat $STAGING_DIR/$DEVICE_TYPE/aes_dec | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/aes_dec
-cat $STAGING_DIR/$DEVICE_TYPE/rsa_sign | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/rsa_sign
-cat $STAGING_DIR/$DEVICE_TYPE/rsa_verify | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/rsa_verify
-cat $STAGING_DIR/$DEVICE_TYPE/dsa_sign | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/dsa_sign
-cat $STAGING_DIR/$DEVICE_TYPE/dsa_verify | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/dsa_verify
-cat $STAGING_DIR/$DEVICE_TYPE/ecdsa_sign | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/ecdsa_sign
-cat $STAGING_DIR/$DEVICE_TYPE/ecdsa_verify | $TEST_DIR/stats.pl 95 value
'(\S+)\s+(ms)' | awk '{if ($1 == "ms") {printf("avg\tstd_dev\tper_sec\n");
printf("%.3f\t%.3f\t%.3f\n", $2, $3, 1000/$2);}}' | tee
$RESULTS_DIR/$DEVICE_TYPE/ecdsa_verify
=== removed file 'test/auth_measure.sh'
--- test/auth_measure.sh 2009-03-19 13:07:55 +0000
+++ test/auth_measure.sh 1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#!/bin/sh
-# useful for debugging: -xv
-
-HIPL_DIR=~/dev/hipl--esp--2.6
-BASE_DIR=~/dev/measurements
-DEVICE_TYPE=endhost-256_3072
-
-# needed by the script - don't change these variables
-EXT_BASE_DIR=$BASE_DIR/auth_performance
-TEST_DIR=$HIPL_DIR/test
-OUTPUT_DIR=$EXT_BASE_DIR/output
-
-if [ ! -e $BASE_DIR ]
-then
- mkdir $BASE_DIR
-fi
-
-if [ ! -e $EXT_BASE_DIR ]
-then
- mkdir $EXT_BASE_DIR
-fi
-
-if [ ! -e $OUTPUT_DIR ]
-then
- mkdir $OUTPUT_DIR
-fi
-
-
-$TEST_DIR/auth_performance | tee $OUTPUT_DIR/$DEVICE_TYPE
=== removed file 'test/stats.pl'
--- test/stats.pl 2010-07-04 17:54:18 +0000
+++ test/stats.pl 1970-01-01 00:00:00 +0000
@@ -1,314 +0,0 @@
-#!/usr/bin/perl -w
-#
-# name: stats.pl
-# purpose: generate statistics from a logfile encoded in {type,val} format
-# usage: see gethelp sub or run with no args
-# author: miika@xxxxxx
-#
-# requires: Statics::Distribution. This is how you can install it:
-# adamo# perl -MCPAN -e shell
-# # Are you ready for manual configuration? [yes] no
-# cpan> install Statistics::Distributions
-# cpan> install Scalar::Util::Numeric
-#
-# todo:
-# - xx
-#
-# licence: MIT (Expat)
-#
-# Copyright (c) 2010 Aalto University and RWTH Aachen University.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use,
-# copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following
-# conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-
-### MODULES ##################################################################
-
-use English;
-# Use strict causes:
-use strict;
-use Statistics::Distributions qw(udistr);
-use Scalar::Util::Numeric qw(:all);
-
-### GLOBAL VARIABLES - DO NOT TOUCH ##########################################
-
-my $confidence = 0; # confidence interval in procents
-
-my %val = (); # $value{type} contains a list of the values of "type"
-my %avg = (); # $avg{type} is the average of the values of "type"
-my %std_dev = (); # $std_dev{type} is the standard deviation of "type"
-my %conf = (); # the confidence interval pair calculated of the values
-my $regexp = '\s*(\S+)\s+(\S+)\s*'; # default regexp
-my %regexp_order = ( 'type' => '$1', 'value' => '$2' ); # default order
-
-# filtered values, averages, standard deviations
-#
-my %filt_val = ();
-my %filt_avg = ();
-my %filt_std_dev = ();
-my %filt_sum = (); # e.g. $sum{'avg'} is the sum of all averages
-
-
-# The input/output streams are read/written from these file descriptors.
-#
-my $inputfd = \*STDIN;
-my $outputfd = \*STDOUT;
-
-### MAIN PROGRAM #############################################################
-
-# Check args.
-#
-die gethelp() unless getargs();
-
-# Load values into %value. After this $value{type} contains a list of
-# the corresponding values.
-#
-%val = read_values($inputfd, $regexp, \%regexp_order);
-die("No data to read\n") if (scalar(keys(%val)) < 1);
-
-# Count averages and standard deviations of each type of value list.
-#
-foreach my $type (keys(%val)) {
- $avg{$type} = average(@{ $val{$type} });
- $std_dev{$type} = standard_deviation($avg{$type}, @{ $val{$type} });
- push(@{ $conf{$type} }, confidence_interval($avg{$type},
- $std_dev{$type},
- $confidence));
-}
-
-# Filter the values that are not in the confidence interval.
-#
-foreach my $type (keys(%val)) {
- if ($confidence == 100) {
- # no values will be filtered
- push(@{ $filt_val{$type} }, @{ $val{$type} });
- } else {
- push(@{ $filt_val{$type} }, filter(@{ $conf{$type} },
- @{ $val{$type} }));
- }
-
- # Average/stddev cannot be calculated if there are no values left
- # (division by zero).
- if ($#{ $filt_val{$type} } != -1) {
- $filt_avg{$type} = average(@{ $filt_val{$type} });
- $filt_std_dev{$type} = standard_deviation($filt_avg{$type},
- @{ $filt_val{$type} });
- }
-}
-
-# Count the sums of average, deviations, etc
-#
-$filt_sum{'avg'} = 0;
-$filt_sum{'std_dev'} = 0;
-$filt_sum{'dropped'} = 0;
-$filt_sum{'nbr'} = 0;
-foreach my $type (keys(%filt_val)) {
- $filt_sum{'avg'} += $filt_avg{$type} if (defined($filt_avg{$type}));
- $filt_sum{'std_dev'} += $filt_std_dev{$type}
- if (defined($filt_std_dev{$type}));
- $filt_sum{'dropped'} += $#{$val{$type}} - $#{$filt_val{$type}};
- $filt_sum{'nbr'} += $#{$val{$type}} + 1;
-}
-
-# Print the results.
-#
-print($outputfd "Filtered results:\ntype\tavg\tstd_dev\tdropped\tnbr\n");
-foreach my $type (keys(%filt_val)) {
- my ($filt_avg, $filt_std_dev) = ($filt_avg{$type}, $filt_std_dev{$type});
- $filt_avg = "N/A" unless (defined($filt_avg));
- $filt_std_dev = "N/A" unless (defined($filt_std_dev));
- print($outputfd
- $type . "\t" .
- $filt_avg . "\t" .
- $filt_std_dev . "\t" .
- ($#{$val{$type}} - $#{$filt_val{$type}}) . "\t" .
- ($#{$val{$type}} + 1) . "\n");
-}
-
-# Print sums.
-#
-$filt_sum{'avg'} = "N/A" if (!defined($filt_sum{'avg'}));
-$filt_sum{'std_dev'} = "N/A" if (!defined($filt_sum{'std_dev'}));
-print($outputfd "Sums:\n\t" .
- $filt_sum{'avg'} . "\t" .
- $filt_sum{'std_dev'} . "\t" .
- $filt_sum{'dropped'} . "\t" .
- $filt_sum{'nbr'} . "\n");
-
-### SUBROUTINES ##############################################################
-
-# Purpose: Get the usage help
-# Params: None
-# Returns: The formatted string of usage string
-#
-sub gethelp {
- return "Usage: stats <conf_interval> [order regexp]\n\n" .
- "conf_interval: confindence interval in procents.\n" .
- "order: type|value, denoting which is read first\n" .
- "regexp: regular experession containing (type and (val).\n" .
- "The data to be analyzed is read from stdin.\n\n" .
- "EXAMPLE: stats 95 type '\\s*(\\S+)\\s+(\\S+)\\s*'\n" .
- " Reads a input with 'type value' lines separated\n" .
- " by whitespaces, assuming that type field is first.\n" .
- " Outputs the values that are within the confidece\n" .
- " interval of 95 procent. This is the default.\n";
-}
-
-# Purpose: Get, check and parse the arguments given for the program
-# Params: None
-# Returns: 1 if args were ok, else 0
-# Depends: $ARGV, $confidence
-#
-sub getargs {
- my $ret = 1;
-
- if (!($#ARGV == 0 || $#ARGV == 2) || $ARGV[0] eq "-h") {
- return 0;
- }
-
- if ($ARGV[0] >= 0 || $ARGV[0] <= 100) {
- $confidence = $ARGV[0];
- } else {
- print("Confidence value must be between [0..100]\n");
- return 0;
- }
-
- if ($#ARGV == 0) {
- return 1;
- }
-
- if ($ARGV[1] =~ /type/) {
- %regexp_order = ( 'type' => '$1', 'value' => '$2' );
- } elsif ($ARGV[1] =~ /value/) {
- %regexp_order = ( 'type' => '$2', 'value' => '$1' );
- } else {
- return 0;
- }
-
- if (defined($ARGV[2])) {
- $regexp = $ARGV[2];
- }
-
- return 1;
-}
-
-# Purpose: Read the values for types from the filehandle
-# Params: $inputfd A filehandle where the input data will be read
-# $regexp A regexp for catching type values
-# \%regexp_order A refererence to the hash of the order of the
-# type values
-# Returns: Returns the hash of arrays of values (hash key = type of value)
-#
-sub read_values {
- my %values = ();
- my ($inputfd, $regexp) = (shift(@ARG), shift(@ARG));
- my %regexp_order = %{ shift(@ARG) };
- my $lineno = 1;
-
- while (defined(my $line = <$inputfd>)) {
- $line =~ /$regexp/;
- my ($type, $val) = (eval($regexp_order{'type'}),
- eval($regexp_order{'value'}));
- if (isnum($val)) {
- push (@{ $values{$type} }, $val);
- } else {
- print("Non-numeric value ($val) at line $lineno, aborting\n");
- print "Type was $type\n";
- print "Regexp was $regexp\n";
- print "Line was $regexp\n";
- return ();
- }
- $lineno++;
- }
-
- return %values;
-}
-
-# Purpose: Count the average of values.
-# Params: @value List of values
-# Returns: The average of values
-#
-sub average {
- my @value = @ARG;
- return eval(join(" + ", @value)) / ($#value + 1);
-}
-
-# Purpose: Calculate standard deviation of the given values
-# Params: $avg the average of @val
-# @val the values
-# Returns:
-#
-sub standard_deviation {
- my $avg = shift(@ARG);
- my @val = @ARG;
- my $sum = 0;
-
- foreach my $val (@val) {
- my $delta = $val - $avg;
- $sum += $delta * $delta;
- }
-
- return sqrt($sum / ( $#val + 1));
-}
-
-# Purpose: Calculate confidence interval
-# Params: $avg the average
-# $std_dev standard deviation
-# $conf confidence interval in procents [0..100]
-# Returns: (lower, upper) confidence interval value pair
-#
-sub confidence_interval {
- my ($avg, $std_dev, $conf) = @ARG;
- my ($udist_val, $udist_res, $upper, $lower, $diff);
-
- $udist_val = (100 - (100 - $conf) / 2) / 100;
- if ($udist_val == 1) {
- $udist_res = 1;
- } else {
- $udist_res = udistr($udist_val);
- }
- $diff = abs($udist_res * $std_dev);
- $lower = $avg - $diff;
- $upper = $avg + $diff;
-
- return ($lower, $upper);
-}
-
-# Purpose: Filter off the values from a list that are not within the
-# given range
-# Params: $lower Lower limit of the range
-# $upper Upper limit of the range
-# @val The values to be filtered
-#
-# Returns: The list of filtered values.
-#
-sub filter {
- my ($lower, $upper, @val) = @ARG;
- my @filtered_val = ();
- foreach my $val (@val) {
- if ($val >= $lower && $val <= $upper) {
- push(@filtered_val, $val);
- } else {
- print("$val was filtered\n");
- }
- }
-
- return @filtered_val;
-}
Other related posts:
- » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5203: Remove stats.pl and friends; they are unused. - noreply
