Index: net/disk_cache/disk_cache_perftest.cc |
=================================================================== |
--- net/disk_cache/disk_cache_perftest.cc (revision 9323) |
+++ net/disk_cache/disk_cache_perftest.cc (working copy) |
@@ -11,6 +11,7 @@ |
#include "base/string_util.h" |
#include "base/test_file_util.h" |
#include "base/timer.h" |
+#include "net/base/io_buffer.h" |
#include "net/base/net_errors.h" |
#include "net/disk_cache/block_files.h" |
#include "net/disk_cache/disk_cache.h" |
@@ -41,11 +42,12 @@ |
// to kMaxSize of data to each entry. |
int TimeWrite(int num_entries, disk_cache::Backend* cache, |
TestEntries* entries) { |
- char buffer1[200]; |
- char buffer2[kMaxSize]; |
+ const int kSize1 = 200; |
+ scoped_refptr<net::IOBuffer> buffer1 = new net::IOBuffer(kSize1); |
+ scoped_refptr<net::IOBuffer> buffer2 = new net::IOBuffer(kMaxSize); |
- CacheTestFillBuffer(buffer1, sizeof(buffer1), false); |
- CacheTestFillBuffer(buffer2, sizeof(buffer2), false); |
+ CacheTestFillBuffer(buffer1->data(), kSize1, false); |
+ CacheTestFillBuffer(buffer2->data(), kMaxSize, false); |
CallbackTest callback(1); |
g_cache_tests_error = false; |
@@ -60,17 +62,16 @@ |
for (int i = 0; i < num_entries; i++) { |
TestEntry entry; |
entry.key = GenerateKey(true); |
- entry.data_len = rand() % sizeof(buffer2); |
+ entry.data_len = rand() % kMaxSize; |
entries->push_back(entry); |
disk_cache::Entry* cache_entry; |
if (!cache->CreateEntry(entry.key, &cache_entry)) |
break; |
- int ret = cache_entry->WriteData(0, 0, buffer1, sizeof(buffer1), &callback, |
- false); |
+ int ret = cache_entry->WriteData(0, 0, buffer1, kSize1, &callback, false); |
if (net::ERR_IO_PENDING == ret) |
expected++; |
- else if (sizeof(buffer1) != ret) |
+ else if (kSize1 != ret) |
break; |
ret = cache_entry->WriteData(1, 0, buffer2, entry.data_len, &callback, |
@@ -91,11 +92,12 @@ |
// Reads the data and metadata from each entry listed on |entries|. |
int TimeRead(int num_entries, disk_cache::Backend* cache, |
const TestEntries& entries, bool cold) { |
- char buffer1[200]; |
- char buffer2[kMaxSize]; |
+ const int kSize1 = 200; |
+ scoped_refptr<net::IOBuffer> buffer1 = new net::IOBuffer(kSize1); |
+ scoped_refptr<net::IOBuffer> buffer2 = new net::IOBuffer(kMaxSize); |
- CacheTestFillBuffer(buffer1, sizeof(buffer1), false); |
- CacheTestFillBuffer(buffer2, sizeof(buffer2), false); |
+ CacheTestFillBuffer(buffer1->data(), kSize1, false); |
+ CacheTestFillBuffer(buffer2->data(), kMaxSize, false); |
CallbackTest callback(1); |
g_cache_tests_error = false; |
@@ -113,10 +115,10 @@ |
disk_cache::Entry* cache_entry; |
if (!cache->OpenEntry(entries[i].key, &cache_entry)) |
break; |
- int ret = cache_entry->ReadData(0, 0, buffer1, sizeof(buffer1), &callback); |
+ int ret = cache_entry->ReadData(0, 0, buffer1, kSize1, &callback); |
if (net::ERR_IO_PENDING == ret) |
expected++; |
- else if (sizeof(buffer1) != ret) |
+ else if (kSize1 != ret) |
break; |
ret = cache_entry->ReadData(1, 0, buffer2, entries[i].data_len, &callback); |