Skip to content

Commit a33b104

Browse files
committed
test xindex-r
1 parent 0bc5b4b commit a33b104

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2531
-7639
lines changed

CMakeLists.txt

-4
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ set(COMBO_TREE_SRC
103103
src/mempool.cc
104104
src/nvm-common.cc
105105
src/tree.cc
106-
107-
# src/lbtree_wrapper.cc
108-
109-
# src/lbtree_wrapper.hpp
110106
)
111107

112108
add_library(combotree SHARED ${COMBO_TREE_SRC})

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@
1515
- XIndex(https://ipads.se.sjtu.edu.cn:1312/opensource/xindex.git)
1616
- PGM (https://github.com/gvinciguerra/PGM-index)
1717

18-
### 测试工具
19-
20-
- YCSB (https://github.com/basicthinker/YCSB-C)
21-
2218

2319
### 测试负载
20+
21+
- LLT 数据集
2422
- uniform负载
2523

2624
### 测试指标

include/helper.h

+8-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
COUT_POS(); \
3737
abort();
3838
#define INVARIANT(cond) \
39-
if (!(cond)) { \
39+
if (!(cond)) \
40+
{ \
4041
COUT_THIS(#cond << " failed"); \
4142
COUT_POS(); \
4243
abort(); \
@@ -50,15 +51,16 @@
5051

5152
#define UNUSED(var) ((void)var)
5253

53-
// #define CACHELINE_SIZE (1 << 6)
54+
// #define X_X_CACHELINE_SIZE (1 << 6)
5455

5556
#define PACKED __attribute__((packed))
5657

5758
#define likely(x) __builtin_expect(!!(x), 1)
5859
#define unlikely(x) __builtin_expect(!!(x), 0)
5960

6061
inline uint64_t cmpxchg(uint64_t *object, uint64_t expected,
61-
uint64_t desired) {
62+
uint64_t desired)
63+
{
6264
asm volatile("lock; cmpxchgq %2,%1"
6365
: "+a"(expected), "+m"(*object)
6466
: "r"(desired)
@@ -68,7 +70,8 @@ inline uint64_t cmpxchg(uint64_t *object, uint64_t expected,
6870
}
6971

7072
inline uint8_t cmpxchgb(uint8_t *object, uint8_t expected,
71-
uint8_t desired) {
73+
uint8_t desired)
74+
{
7275
asm volatile("lock; cmpxchgb %2,%1"
7376
: "+a"(expected), "+m"(*object)
7477
: "r"(desired)
@@ -77,4 +80,4 @@ inline uint8_t cmpxchgb(uint8_t *object, uint8_t expected,
7780
return expected;
7881
}
7982

80-
#endif // HELPER_H
83+
#endif // HELPER_H

include/mem/xindex/.gitignore

-9
This file was deleted.

include/mem/xindex/LICENCE

-202
This file was deleted.

include/mem/xindex/README.md

-65
This file was deleted.

0 commit comments

Comments
 (0)