From 4edf4c8f3c35c2adae110aa3cef925051690b83e Mon Sep 17 00:00:00 2001 From: geemus Date: Sun, 23 May 2010 14:56:34 -0700 Subject: [PATCH] update benchmarks to get them running again --- benchs/fog_vs.rb | 66 ++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/benchs/fog_vs.rb b/benchs/fog_vs.rb index c522786da..3136f9bca 100644 --- a/benchs/fog_vs.rb +++ b/benchs/fog_vs.rb @@ -5,20 +5,20 @@ require 'right_aws' require File.join(File.dirname(__FILE__), '..', 'lib', 'fog') -data = File.open(File.join(File.dirname(__FILE__), '..', 'spec', 'credentials.yml')).read -config = YAML.load(data) +data = File.open(File.expand_path('~/.fog')).read +config = YAML.load(data)[:default] fog = Fog::AWS::S3.new( - :aws_access_key_id => config['aws_access_key_id'], - :aws_secret_access_key => config['aws_secret_access_key'] + :aws_access_key_id => config[:aws_access_key_id], + :aws_secret_access_key => config[:aws_secret_access_key] ) raws = RightAws::S3Interface.new( - config['aws_access_key_id'], - config['aws_secret_access_key'] + config[:aws_access_key_id], + config[:aws_secret_access_key] ) raws.logger.level = 3 # ERROR awss3 = AWS::S3::Base.establish_connection!( - :access_key_id => config['aws_access_key_id'], - :secret_access_key => config['aws_secret_access_key'], + :access_key_id => config[:aws_access_key_id], + :secret_access_key => config[:aws_secret_access_key], :persistent => true ) @@ -106,30 +106,30 @@ Benchmark.bmbm(25) do |bench| end # Rehearsal ------------------------------------------------------------ -# fog.put_bucket 0.010000 0.000000 0.010000 ( 4.981517) -# raws.create_bucket 0.030000 0.040000 0.070000 ( 10.035029) -# awss3::Bucket.create 0.020000 0.020000 0.040000 ( 7.402162) -# fog.put_object 0.080000 0.080000 0.160000 ( 8.757062) -# raws.put 0.180000 0.080000 0.260000 ( 12.307371) -# awss3::S3Object.create 0.170000 0.070000 0.240000 ( 14.028887) -# fog.delete_object 0.080000 0.050000 0.130000 ( 5.481744) -# raws.delete 0.140000 0.070000 0.210000 ( 7.709116) -# awss3::S3Object.delete 0.100000 0.040000 0.140000 ( 5.533884) -# fog.delete_bucket 0.010000 0.010000 0.020000 ( 1.861061) -# raws.delete_bucket 0.030000 0.020000 0.050000 ( 3.146836) -# awss3::Bucket.delete 0.050000 0.010000 0.060000 ( 1.877064) -# --------------------------------------------------- total: 1.390000sec +# fog.put_bucket 0.030000 0.010000 0.040000 ( 4.797287) +# raws.create_bucket 0.040000 0.030000 0.070000 ( 10.037626) +# awss3::Bucket.create 0.010000 0.000000 0.010000 ( 1.732033) +# fog.put_object 0.350000 0.220000 0.570000 ( 27.430128) +# raws.put 0.180000 0.050000 0.230000 ( 11.320939) +# awss3::S3Object.create 0.170000 0.040000 0.210000 ( 13.903928) +# fog.delete_object 0.280000 0.170000 0.450000 ( 21.327174) +# raws.delete 0.130000 0.040000 0.170000 ( 8.872263) +# awss3::S3Object.delete 0.130000 0.020000 0.150000 ( 4.700452) +# fog.delete_bucket 0.030000 0.020000 0.050000 ( 3.395838) +# raws.delete_bucket 0.040000 0.020000 0.060000 ( 4.616931) +# awss3::Bucket.delete 0.010000 0.010000 0.020000 ( 2.152023) +# --------------------------------------------------- total: 2.030000sec # # user system total real -# fog.put_bucket 0.010000 0.020000 0.030000 ( 1.949933) -# raws.create_bucket 0.030000 0.020000 0.050000 ( 4.766058) -# awss3::Bucket.create 0.010000 0.010000 0.020000 ( 2.093764) -# fog.put_object 0.090000 0.080000 0.170000 ( 9.352868) -# raws.put 0.150000 0.080000 0.230000 ( 12.981112) -# awss3::S3Object.create 0.130000 0.070000 0.200000 ( 14.442972) -# fog.delete_object 0.060000 0.060000 0.120000 ( 5.657752) -# raws.delete 0.130000 0.050000 0.180000 ( 6.598221) -# awss3::S3Object.delete 0.110000 0.030000 0.140000 ( 5.709799) -# fog.delete_bucket 0.010000 0.010000 0.020000 ( 1.864573) -# raws.delete_bucket 0.040000 0.030000 0.070000 ( 4.120572) -# awss3::Bucket.delete 0.020000 0.000000 0.020000 ( 1.947711) +# fog.put_bucket 0.030000 0.030000 0.060000 ( 4.369874) +# raws.create_bucket 0.040000 0.020000 0.060000 ( 5.406727) +# awss3::Bucket.create 0.010000 0.000000 0.010000 ( 2.230434) +# fog.put_object 0.310000 0.200000 0.510000 ( 25.419315) +# raws.put 0.170000 0.050000 0.220000 ( 11.554947) +# awss3::S3Object.create 0.160000 0.030000 0.190000 ( 12.573148) +# fog.delete_object 0.260000 0.160000 0.420000 ( 21.045432) +# raws.delete 0.120000 0.050000 0.170000 ( 16.278677) +# awss3::S3Object.delete 0.090000 0.020000 0.110000 ( 4.521777) +# fog.delete_bucket 0.030000 0.020000 0.050000 ( 4.028921) +# raws.delete_bucket 0.030000 0.030000 0.060000 ( 5.447169) +# awss3::Bucket.delete 0.010000 0.000000 0.010000 ( 1.662223) \ No newline at end of file