some fixes more

intracom-telecom-sdn · May 4, 2015 · f3d9bb7 · f3d9bb7
1 parent ad36794
commit f3d9bb7
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 329 deletions.
diff --git a/emulators/cbench/build.sh b/emulators/cbench/build.sh
@@ -6,6 +6,7 @@
 # terms of the Eclipse Public License v1.0 which accompanies this distribution,
 # and is available at http://www.eclipse.org/legal/epl-v10.html
 
+
 SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 echo "Building Cbench generator."

diff --git a/emulators/mt_cbench/build.sh b/emulators/mt_cbench/build.sh
@@ -12,7 +12,6 @@ SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 echo "Building Cbench generator."
 echo "Building oflops/configure file"
 cd $SCRIPT_DIR/oflops
-find . -name '*.lo' | xargs rm -f 
 ./boot.sh 
 ./configure --with-openflow-src-dir=../openflow/ 
 make
diff --git a/emulators/mt_cbench/oflops/example_modules/oflops_debug/liboflops_debug.la b/emulators/mt_cbench/oflops/example_modules/oflops_debug/liboflops_debug.la
diff --git a/...rs/mt_cbench/oflops/example_modules/openflow_action_install/libopenflow_action_install.la b/...rs/mt_cbench/oflops/example_modules/openflow_action_install/libopenflow_action_install.la
diff --git a/...ench/oflops/example_modules/openflow_action_measurement/libopenflow_action_measurement.la b/...ench/oflops/example_modules/openflow_action_measurement/libopenflow_action_measurement.la
diff --git a/...rs/mt_cbench/oflops/example_modules/openflow_flow_dump_test/libopenflow_flow_dump_test.la b/...rs/mt_cbench/oflops/example_modules/openflow_flow_dump_test/libopenflow_flow_dump_test.la
diff --git a/emulators/mt_cbench/oflops/example_modules/openflow_packet_in/extract_packet_in_data.pl b/emulators/mt_cbench/oflops/example_modules/openflow_packet_in/extract_packet_in_data.pl
@@ -0,0 +1,30 @@
+#!/usr/bin/env perl
+
+#
+# Process the output log for oflops when the openflow_packet_in
+# module is used. The script will provide the per packet delay
+# for each packet.
+#
+
+if(@ARGV < 1) {
+    print "Please provide as a param the file to be processed\n";
+    exit 1;
+}
+
+my $file = $ARGV[0];
+
+if(! -e $file){
+    print "Input file not found\n";
+    exit 1;
+}
+
+open(FILE, "grep OFPT_PACKET_IN_MSG $file | ");
+
+while(!eof(FILE)) {
+    $_ = readline(FILE);
+    chomp();
+    my @data = split(/:/);
+    print "$data[4] ".int(($data[3]-$data[2])*(10**6)) ."\n"
+};
+
+close(FILE);
diff --git a/emulators/mt_cbench/oflops/example_modules/openflow_packet_in/libof_packet_in.la b/emulators/mt_cbench/oflops/example_modules/openflow_packet_in/libof_packet_in.la
diff --git a/emulators/mt_cbench/oflops/example_modules/openflow_port_status/libof_port_stat.la b/emulators/mt_cbench/oflops/example_modules/openflow_port_status/libof_port_stat.la
diff --git a/emulators/mt_cbench/oflops/example_modules/snmp_cpu/libof_snmp_cpu.la b/emulators/mt_cbench/oflops/example_modules/snmp_cpu/libof_snmp_cpu.la
diff --git a/emulators/mt_cbench/oflops/liboflops_test.la b/emulators/mt_cbench/oflops/liboflops_test.la