my changes

baotonglu · Jul 7, 2022 · 9e6b05e · 9e6b05e
1 parent 4a76259
commit 9e6b05e
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/include/Common.h b/include/Common.h
@@ -85,7 +85,7 @@ static_assert(kRootPointerStoreOffest % sizeof(uint64_t) == 0, "XX");
 
 // lock on-chip memory
 constexpr uint64_t kLockStartAddr = 0;
-constexpr uint64_t kLockChipMemSize = 256 * 1024;
+constexpr uint64_t kLockChipMemSize = 64 * 1024;
 
 // number of locks
 // we do not use 16-bit locks, since 64-bit locks can provide enough concurrency.

diff --git a/include/Rdma.h b/include/Rdma.h
@@ -57,7 +57,7 @@ struct Region {
 };
 
 //// Resource.cpp
-bool createContext(RdmaContext *context, uint8_t port = 1, int gidIndex = 1,
+bool createContext(RdmaContext *context, uint8_t port = 1, int gidIndex = 0,
                    uint8_t devIndex = 0);
 bool destoryContext(RdmaContext *context);
 

diff --git a/memcached.conf b/memcached.conf
@@ -1,2 +1,2 @@
-10.0.2.114
-2378
+10.150.240.28
+11211
diff --git a/script/hugepage.sh b/script/hugepage.sh
diff --git a/src/Tree.cpp b/src/Tree.cpp
@@ -83,7 +83,7 @@ void Tree::print_verbose() {
 
   int kLeafHdrOffset = STRUCT_OFFSET(LeafPage, hdr);
   int kInternalHdrOffset = STRUCT_OFFSET(InternalPage, hdr);
-  static_assert(kLeafHdrOffset == kInternalHdrOffset, "XXX");
+  // static_assert(kLeafHdrOffset == kInternalHdrOffset, "XXX");
 
   if (dsm->getMyNodeID() == 0) {
     std::cout << "Header size: " << sizeof(Header) << std::endl;

diff --git a/src/rdma/Resource.cpp b/src/rdma/Resource.cpp
@@ -25,7 +25,9 @@ bool createContext(RdmaContext *context, uint8_t port, int gidIndex,
 
   for (int i = 0; i < devicesNum; ++i) {
     // printf("Device %d: %s\n", i, ibv_get_device_name(deviceList[i]));
-    if (ibv_get_device_name(deviceList[i])[5] == '0') {
+    if (ibv_get_device_name(deviceList[i])[5] == '1') {
+    //if (ibv_get_device_name(deviceList[i]) == "mlx5_1") {
+      printf("Device %d: %s\n", i, ibv_get_device_name(deviceList[i]));
       devIndex = i;
       break;
     }