RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-10 19:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

common/buffer: pass NULL buffer instead of a zero-filled one

Browse Source 
This is about 2x faster on my box using the sctp code.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2013-09-27 21:07:17 -07:00
parent 9626aaf43b
commit d9e30775c0
1 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/common/buffer.cc
View File

@ -31,18 +31,6 @@
namespace ceph { namespace ceph {
// some zeros; used when concatenating buffers with cached crc
static unsigned char zbuf[128] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
};
#ifdef BUFFER_DEBUG #ifdef BUFFER_DEBUG
static uint32_t simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER; static uint32_t simple_spinlock_t buffer_debug_lock = SIMPLE_SPINLOCK_INITIALIZER;
# define bdout { simple_spin_lock(&buffer_debug_lock); std::cout # define bdout { simple_spin_lock(&buffer_debug_lock); std::cout
@ -1346,14 +1334,7 @@ __u32 buffer::list::crc32c(__u32 crc) const
* http://crcutil.googlecode.com/files/crc-doc.1.0.pdf * http://crcutil.googlecode.com/files/crc-doc.1.0.pdf
* note, u for our crc32c implementation is 0 * note, u for our crc32c implementation is 0
*/ */
int64_t adjustment = ccrc.first ^ crc; crc = ccrc.second ^ ceph_crc32c(ccrc.first ^ crc, NULL, it->length());
size_t remaining = it->length();
for (; remaining > sizeof(zbuf); remaining -= sizeof(zbuf)) {
adjustment = ceph_crc32c(adjustment, zbuf, sizeof(zbuf));
}
if (remaining)
adjustment = ceph_crc32c(adjustment, zbuf, remaining);
crc = ccrc.second ^ adjustment;
if (buffer_track_crc) if (buffer_track_crc)
buffer_cached_crc_adjusted.inc(); buffer_cached_crc_adjusted.inc();
} }