fix

oceanbase · May 10, 2024 · 46313e1 · 46313e1
1 parent 261715c
commit 46313e1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/deps/memtracer/allocator.h b/deps/memtracer/allocator.h
@@ -15,7 +15,7 @@ See the Mulan PSL v2 for more details. */
 #include <sys/mman.h>  // mmap/munmap
 
 using namespace memtracer;
-#if define __linux__
+#if defined(__linux__)
 #define MT_THROW __THROW
 #else
 #define MT_THROW

diff --git a/unittest/memtracer_test.cpp b/unittest/memtracer_test.cpp
@@ -64,22 +64,22 @@ TEST(test_mem_tracer, test_mem_tracer_basic)
     // if no use the memory that allocate by malloc,
     // the compiler may optimize it out,
     // so we need to use it here (even memset is also optimized)
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1024);
     free(ptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);
 
     ptr = malloc(1024 * 1024 * 1024);
     memset(ptr, 0, 1024 * 1024 * 1024);
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1024 * 1024 * 1024);
     free(ptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);
 
     for (int i = 0; i < 1024; ++i) {
       ptr = malloc(1);
       memset(ptr, 0, 1);
-      *(char*)ptr = 'f';
+      *(char *)ptr = 'f';
       ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1);
       free(ptr);
       ASSERT_EQ(memtracer::allocated_memory(), mem_base);
@@ -90,7 +90,7 @@ TEST(test_mem_tracer, test_mem_tracer_basic)
   // new/delete
   {
     char *ptr = new char;
-    *ptr = 'a';
+    *ptr      = 'a';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1);
     delete ptr;
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);
@@ -119,7 +119,7 @@ TEST(test_mem_tracer, test_mem_tracer_basic)
   {
     void *ptr = calloc(10, 100);
     memset(ptr, 0, 10 * 100);
-    *(char*)ptr ='a';
+    *(char *)ptr = 'a';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 10 * 100);
     free(ptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);
@@ -129,23 +129,23 @@ TEST(test_mem_tracer, test_mem_tracer_basic)
   {
     void *ptr = realloc(NULL, 10);
     memset(ptr, 0, 10);
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 10);
     ptr = realloc(ptr, 1);
     memset(ptr, 0, 1);
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 10);
     ptr = realloc(ptr, 100);
     memset(ptr, 0, 100);
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 100);
     free(ptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);
   }
   // mmap/munmap
   {
-    void *ptr = mmap(nullptr, 1024, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-    *(char*)ptr = 'f';
+    void *ptr    = mmap(nullptr, 1024, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+    *(char *)ptr = 'f';
     ASSERT_NE(ptr, nullptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1024);
     munmap(ptr, 1024);
@@ -157,7 +157,7 @@ TEST(test_mem_tracer, test_mem_tracer_basic)
   {
     void *ptr = __libc_malloc(1024);
     memset(ptr, 0, 1024);
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1024);
     free(ptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);
@@ -168,7 +168,7 @@ TEST(test_mem_tracer, test_mem_tracer_basic)
   {
     void *ptr = __builtin_malloc(1024);
     memset(ptr, 0, 1024);
-    *(char*)ptr = 'f';
+    *(char *)ptr = 'f';
     ASSERT_EQ(memtracer::allocated_memory(), mem_base + 1024);
     free(ptr);
     ASSERT_EQ(memtracer::allocated_memory(), mem_base);