common/buffer.cc \
common/debug.cc \
include/ceph_fs.cc \
+ include/ceph_hash.cc \
include/ceph_strings.cc \
include/ceph_frag.cc \
config.cc \
include/byteorder.h\
include/ceph_frag.h\
include/ceph_fs.h\
+ include/ceph_hash.h\
include/color.h\
include/crc32c.h\
include/cstring.h\
}
return 0;
}
-
-/*
- * Robert Jenkin's hash function.
- * http://burtleburtle.net/bob/hash/evahash.html
- * This is in the public domain.
- */
-#define mix(a, b, c) \
- do { \
- a = a - b; a = a - c; a = a ^ (c >> 13); \
- b = b - c; b = b - a; b = b ^ (a << 8); \
- c = c - a; c = c - b; c = c ^ (b >> 13); \
- a = a - b; a = a - c; a = a ^ (c >> 12); \
- b = b - c; b = b - a; b = b ^ (a << 16); \
- c = c - a; c = c - b; c = c ^ (b >> 5); \
- a = a - b; a = a - c; a = a ^ (c >> 3); \
- b = b - c; b = b - a; b = b ^ (a << 10); \
- c = c - a; c = c - b; c = c ^ (b >> 15); \
- } while (0)
-
-unsigned int ceph_full_name_hash(const char *str, unsigned int length)
-{
- const unsigned char *k = (const unsigned char *)str;
- __u32 a, b, c; /* the internal state */
- __u32 len; /* how many key bytes still need mixing */
-
- /* Set up the internal state */
- len = length;
- a = 0x9e3779b9; /* the golden ratio; an arbitrary value */
- b = a;
- c = 0; /* variable initialization of internal state */
-
- /* handle most of the key */
- while (len >= 12) {
- a = a + (k[0] + ((__u32)k[1] << 8) + ((__u32)k[2] << 16) +
- ((__u32)k[3] << 24));
- b = b + (k[4] + ((__u32)k[5] << 8) + ((__u32)k[6] << 16) +
- ((__u32)k[7] << 24));
- c = c + (k[8] + ((__u32)k[9] << 8) + ((__u32)k[10] << 16) +
- ((__u32)k[11] << 24));
- mix(a, b, c);
- k = k + 12;
- len = len - 12;
- }
-
- /* handle the last 11 bytes */
- c = c + length;
- switch (len) { /* all the case statements fall through */
- case 11:
- c = c + ((__u32)k[10] << 24);
- case 10:
- c = c + ((__u32)k[9] << 16);
- case 9:
- c = c + ((__u32)k[8] << 8);
- /* the first byte of c is reserved for the length */
- case 8:
- b = b + ((__u32)k[7] << 24);
- case 7:
- b = b + ((__u32)k[6] << 16);
- case 6:
- b = b + ((__u32)k[5] << 8);
- case 5:
- b = b + k[4];
- case 4:
- a = a + ((__u32)k[3] << 24);
- case 3:
- a = a + ((__u32)k[2] << 16);
- case 2:
- a = a + ((__u32)k[1] << 8);
- case 1:
- a = a + k[0];
- /* case 0: nothing left to add */
- }
- mix(a, b, c);
-
- return c;
-}
-
#define CEPH_MAX_MON 31
-unsigned int ceph_full_name_hash(const char *name, unsigned int len);
-
/*
* ceph_file_layout - describe data layout for a file/inode
--- /dev/null
+
+#include "types.h"
+
+/*
+ * Robert Jenkin's hash function.
+ * http://burtleburtle.net/bob/hash/evahash.html
+ * This is in the public domain.
+ */
+#define mix(a, b, c) \
+ do { \
+ a = a - b; a = a - c; a = a ^ (c >> 13); \
+ b = b - c; b = b - a; b = b ^ (a << 8); \
+ c = c - a; c = c - b; c = c ^ (b >> 13); \
+ a = a - b; a = a - c; a = a ^ (c >> 12); \
+ b = b - c; b = b - a; b = b ^ (a << 16); \
+ c = c - a; c = c - b; c = c ^ (b >> 5); \
+ a = a - b; a = a - c; a = a ^ (c >> 3); \
+ b = b - c; b = b - a; b = b ^ (a << 10); \
+ c = c - a; c = c - b; c = c ^ (b >> 15); \
+ } while (0)
+
+unsigned ceph_str_hash_rjenkins(const char *str, unsigned length)
+{
+ const unsigned char *k = (const unsigned char *)str;
+ __u32 a, b, c; /* the internal state */
+ __u32 len; /* how many key bytes still need mixing */
+
+ /* Set up the internal state */
+ len = length;
+ a = 0x9e3779b9; /* the golden ratio; an arbitrary value */
+ b = a;
+ c = 0; /* variable initialization of internal state */
+
+ /* handle most of the key */
+ while (len >= 12) {
+ a = a + (k[0] + ((__u32)k[1] << 8) + ((__u32)k[2] << 16) +
+ ((__u32)k[3] << 24));
+ b = b + (k[4] + ((__u32)k[5] << 8) + ((__u32)k[6] << 16) +
+ ((__u32)k[7] << 24));
+ c = c + (k[8] + ((__u32)k[9] << 8) + ((__u32)k[10] << 16) +
+ ((__u32)k[11] << 24));
+ mix(a, b, c);
+ k = k + 12;
+ len = len - 12;
+ }
+
+ /* handle the last 11 bytes */
+ c = c + length;
+ switch (len) { /* all the case statements fall through */
+ case 11:
+ c = c + ((__u32)k[10] << 24);
+ case 10:
+ c = c + ((__u32)k[9] << 16);
+ case 9:
+ c = c + ((__u32)k[8] << 8);
+ /* the first byte of c is reserved for the length */
+ case 8:
+ b = b + ((__u32)k[7] << 24);
+ case 7:
+ b = b + ((__u32)k[6] << 16);
+ case 6:
+ b = b + ((__u32)k[5] << 8);
+ case 5:
+ b = b + k[4];
+ case 4:
+ a = a + ((__u32)k[3] << 24);
+ case 3:
+ a = a + ((__u32)k[2] << 16);
+ case 2:
+ a = a + ((__u32)k[1] << 8);
+ case 1:
+ a = a + k[0];
+ /* case 0: nothing left to add */
+ }
+ mix(a, b, c);
+
+ return c;
+}
+
+/*
+ * linux dcache hash
+ */
+unsigned ceph_str_hash_linux(const char *str, unsigned length)
+{
+ unsigned long hash = 0;
+ unsigned char c;
+
+ while (length-- > 0) {
+ c = *str++;
+ hash = (hash + (c << 4) + (c >> 4)) * 11;
+ }
+ return hash;
+}
+
+
+unsigned ceph_str_hash(int type, const char *s, unsigned len)
+{
+ switch (type) {
+ case CEPH_STR_HASH_LINUX:
+ return ceph_str_hash_linux(s, len);
+ case CEPH_STR_HASH_RJENKINS:
+ return ceph_str_hash_rjenkins(s, len);
+ default:
+ return -1;
+ }
+}
+
+const char *ceph_str_hash_name(int type)
+{
+ switch (type) {
+ case CEPH_STR_HASH_LINUX:
+ return "linux";
+ case CEPH_STR_HASH_RJENKINS:
+ return "rjenkins";
+ default:
+ return "unknown";
+ }
+}
--- /dev/null
+#ifndef _FS_CEPH_HASH_H
+#define _FS_CEPH_HASH_H
+
+#define CEPH_STR_HASH_LINUX 0x1 /* linux dcache hash */
+#define CEPH_STR_HASH_RJENKINS 0x2 /* robert jenkins' */
+
+extern unsigned ceph_str_hash_linux(const char *s, unsigned len);
+extern unsigned ceph_str_hash_rjenkins(const char *s, unsigned len);
+
+extern unsigned ceph_str_hash(int type, const char *s, unsigned len);
+extern const char *ceph_str_hash_name(int type);
+
+#endif
typedef cstring nstring;
#endif
+#include "ceph_hash.h"
+
static inline bool operator==(const nstring &l, const char *s) {
return strcmp(l.c_str(), s) == 0;
}
{
//static hash<const char*> H;
//return H(x.c_str());
- return ceph_full_name_hash(x.c_str(), x.length());
+ return ceph_str_hash_linux(x.c_str(), x.length());
}
};
}
size_t operator()(const object_t& r) const {
//static hash<nstring> H;
//return H(r.name);
- return ceph_full_name_hash(r.name.c_str(), r.name.length());
+ return ceph_str_hash_linux(r.name.c_str(), r.name.length());
}
};
}
__u8 type; /* CEPH_PG_TYPE_* */
__u8 size; /* number of osds in each pg */
__u8 crush_ruleset; /* crush placement rule */
+ __u8 object_hash; /* hash mapping object name to ps */
__le32 pg_num, pgp_num; /* number of pg's */
__le32 lpg_num, lpgp_num; /* number of localized pg's */
__le32 last_change; /* most recent epoch changed */
ino(i), dirino(di), dn_hash(hash), nref(nr), updated(u) { }
Anchor(inodeno_t i, inodeno_t di, const nstring &dname, int nr, version_t u) :
ino(i), dirino(di),
- dn_hash(ceph_full_name_hash(dname.data(), dname.length())),
+ dn_hash(ceph_str_hash_linux(dname.data(), dname.length())),
nref(nr), updated(u) { }
void encode(bufferlist &bl) const {
if (dirfragtree.empty())
return frag_t(); // avoid the string hash if we can.
- __u32 h = ceph_full_name_hash(dn.data(), dn.length());
+ __u32 h = ceph_str_hash_linux(dn.data(), dn.length());
return dirfragtree[h];
}
pools[pool].v.type = CEPH_PG_TYPE_REP;
pools[pool].v.size = 2;
pools[pool].v.crush_ruleset = p->first;
+ pools[pool].v.object_hash = CEPH_STR_HASH_RJENKINS;
pools[pool].v.pg_num = num_osd << pg_bits;
pools[pool].v.pgp_num = num_osd << pg_bits;
pools[pool].v.lpg_num = lpg_bits ? (1 << (lpg_bits-1)) : 0;
ceph_object_layout make_object_layout(object_t oid, int pg_pool, int preferred=-1, int object_stripe_unit = 0) {
// calculate ps (placement seed)
- static hash<object_t> H;
- ps_t ps = H(oid);
+ pg_pool_t pool = get_pg_pool(pg_pool);
+ ps_t ps = ceph_str_hash(pool.v.object_hash, oid.name.c_str(), oid.name.length());
// mix in preferred osd, so we don't get the same peers for all of the placement pgs (e.g. 0.0p*)
if (preferred >= 0)
unsigned get_type() const { return v.type; }
unsigned get_size() const { return v.size; }
int get_crush_ruleset() const { return v.crush_ruleset; }
+ int get_object_hash() const { return v.object_hash; }
+ const char *get_object_hash_name() const {
+ return ceph_str_hash_name(get_object_hash());
+ }
epoch_t get_last_change() const { return v.last_change; }
epoch_t get_snap_epoch() const { return v.snap_epoch; }
snapid_t get_snap_seq() const { return snapid_t(v.snap_seq); }
}
out << " pg_size " << p.get_size()
<< " crush_ruleset " << p.get_crush_ruleset()
+ << " object_hash " << p.get_object_hash_name()
<< " pg_num " << p.get_pg_num()
<< " pgp_num " << p.get_pgp_num()
<< " lpg_num " << p.get_lpg_num()
projects / ceph.git / commitdiff