Add alignment

Author: mjp41

CMakeLists.txt

@@ -180,7 +180,7 @@ add_custom_target(generated ALL
 add_library(redirect_small STATIC src/redirect/redirect.cc)
 target_link_libraries(redirect_small snmalloc_lib)
 target_include_directories(redirect_small PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-
+add_dependencies(redirect_small generated)
 
 # To build with just the header library target define SNMALLOC_ONLY_HEADER_LIBRARY
 # in containing Cmake file.

src/redirect/generate.cc

@@ -15,19 +15,23 @@ int main(int argc, char* argv[])
   ofstream outfile;
   outfile.open(argv[1]);
 
-  for (size_t size = 1024; size > 0; size -= 16)
+  for (size_t align = 0; align < 10; align++)
   {
-    auto sizeclass = snmalloc::size_to_sizeclass(size);
-    auto rsize = snmalloc::sizeclass_to_size(sizeclass);
-    if (rsize == size)
+    for (size_t size = 1024; size > 0; size -= 16)
     {
-      outfile << "DEFINE_MALLOC_SIZE(malloc_size_" << size << ", " << size
-              << ");" << std::endl;
-    }
-    else
-    {
-      outfile << "REDIRECT_MALLOC_SIZE(malloc_size_" << size << ", malloc_size_"
-              << rsize << ");" << std::endl;
+      auto asize = snmalloc::aligned_size(1ULL << align, size);
+      auto sizeclass = snmalloc::size_to_sizeclass(asize);
+      auto rsize = snmalloc::sizeclass_to_size(sizeclass);
+      if (rsize == size && align == 0)
+      {
+        outfile << "DEFINE_MALLOC_SIZE(malloc_size_" << size << "_" << align << ", " << size
+                << ");" << std::endl;
+      }
+      else
+      {
+        outfile << "REDIRECT_MALLOC_SIZE(malloc_size_" << size << "_" << align << ", malloc_size_"
+                << rsize << "_" << 0 << ");" << std::endl;
+      }
     }
   }
 

src/redirect/redirect.cc

@@ -14,8 +14,8 @@
     __attribute__((alias(#b))) extern "C" void* a()
 #endif
 
-#define DEFINE_MALLOC_SIZE(a, s) \
-  extern "C" void* a() \
+#define DEFINE_MALLOC_SIZE(name, s) \
+  extern "C" void* name() \
   { \
     return snmalloc::ThreadAlloc::get_noncachable()->template alloc<s>(); \
   }