sassc 2.1.0.pre3 → 2.4.0

data/ext/libsass/src/memory/allocator.hpp

@@ -0,0 +1,138 @@
+#ifndef SASS_ALLOCATOR_H
+#define SASS_ALLOCATOR_H
+
+#include "config.hpp"
+#include "../settings.hpp"
+#include "../MurmurHash2.hpp"
+
+#include <vector>
+#include <limits>
+#include <iostream>
+#include <algorithm>
+#include <functional>
+
+namespace Sass {
+
+#ifndef SASS_CUSTOM_ALLOCATOR
+
+  template <typename T> using Allocator = std::allocator<T>;
+
+#else
+
+  void* allocateMem(size_t size);
+
+  void deallocateMem(void* ptr, size_t size = 1);
+
+  template<typename T>
+  class Allocator
+  {
+  public:
+
+    // Allocator traits
+    typedef T                 type;            
+    typedef type              value_type;      
+    typedef value_type*       pointer;         
+    typedef value_type const* const_pointer;   
+    typedef value_type&       reference;       
+    typedef value_type const& const_reference; 
+    typedef std::size_t       size_type;       
+    typedef std::ptrdiff_t    difference_type; 
+
+    template<typename U>
+    struct rebind
+    {
+      typedef Allocator<U> other;
+    };
+
+    // Constructor
+    Allocator(void) {}
+
+    // Copy Constructor
+    template<typename U>
+    Allocator(Allocator<U> const&)
+    {}
+
+    // allocate but don't initialize count of elements of type T
+    pointer allocate(size_type count, const_pointer /* hint */ = 0)
+    {
+      return (pointer)(Sass::allocateMem(count * sizeof(T)));
+    }
+
+    // deallocate storage ptr of deleted elements
+    void deallocate(pointer ptr, size_type count)
+    {
+      Sass::deallocateMem(ptr, count);
+    }
+
+    // return maximum number of elements that can be allocated
+    size_type max_size() const throw()
+    {
+      return std::numeric_limits<size_type>::max() / sizeof(T);
+    }
+
+    // Address of object
+    type* address(type& obj) const { return &obj; }
+    type const* address(type const& obj) const { return &obj; }
+
+    // Construct object
+    void construct(type* ptr, type const& ref) const
+    {
+      // In-place copy construct
+      new(ptr) type(ref);
+    }
+
+    // Destroy object
+    void destroy(type* ptr) const
+    {
+      // Call destructor
+      ptr->~type();
+    }
+
+  };
+
+  template<typename T, typename U>
+    bool operator==(Allocator<T> const& left,
+      Allocator<U> const& right)
+  {
+    return true;
+  }
+
+  template<typename T, typename U>
+    bool operator!=(Allocator<T> const& left,
+      Allocator<U> const& right)
+  {
+    return !(left == right);
+  }
+
+#endif
+
+  namespace sass {
+    template <typename T> using vector = std::vector<T, Sass::Allocator<T>>;
+    using string = std::basic_string<char, std::char_traits<char>, Sass::Allocator<char>>;
+    using sstream = std::basic_stringstream<char, std::char_traits<char>, Sass::Allocator<char>>;
+    using ostream = std::basic_ostringstream<char, std::char_traits<char>, Sass::Allocator<char>>;
+    using istream = std::basic_istringstream<char, std::char_traits<char>, Sass::Allocator<char>>;
+  }
+
+}
+
+#ifdef SASS_CUSTOM_ALLOCATOR
+
+namespace std {
+  // Only GCC seems to need this specialization!?
+  template <> struct hash<Sass::sass::string> {
+  public:
+    inline size_t operator()(
+      const Sass::sass::string& name) const
+    {
+      return MurmurHash2(
+        (void*)name.c_str(),
+        (int)name.size(),
+        0x73617373);
+    }
+  };
+}
+
+#endif
+
+#endif

data/ext/libsass/src/memory/config.hpp

@@ -0,0 +1,20 @@
+#ifndef SASS_MEMORY_CONFIG_H
+#define SASS_MEMORY_CONFIG_H
+
+// Define memory alignment requirements
+#define SASS_MEM_ALIGN sizeof(unsigned int)
+
+// Minimal alignment for memory fragments. Must be a multiple
+// of `SASS_MEM_ALIGN` and should not be too big (maybe 1 or 2)
+#define SassAllocatorHeadSize sizeof(unsigned int)
+
+// The number of bytes we use for our book-keeping before every
+// memory fragment. Needed to know to which bucket we belongs on
+// deallocations, or if it should go directly to the `free` call.
+#define SassAllocatorBookSize sizeof(unsigned int)
+
+// Bytes reserve for book-keeping on the arenas
+// Currently unused and for later optimization
+#define SassAllocatorArenaHeadSize 0
+
+#endif

data/ext/libsass/src/memory/memory_pool.hpp

@@ -0,0 +1,186 @@
+#ifndef SASS_MEMORY_POOL_H
+#define SASS_MEMORY_POOL_H
+
+#include <stdlib.h>
+#include <iostream>
+#include <algorithm>
+#include <climits>
+#include <vector>
+
+namespace Sass {
+
+  // SIMPLE MEMORY-POOL ALLOCATOR WITH FREE-LIST ON TOP
+
+  // This is a memory pool allocator with a free list on top.
+  // We only allocate memory arenas from the system in specific
+  // sizes (`SassAllocatorArenaSize`). Users claim memory slices
+  // of certain sizes from the pool. If the allocation is too big
+  // to fit into our buckets, we use regular malloc/free instead.
+
+  // When the systems starts, we allocate the first arena and then
+  // start to give out addresses to memory slices. During that
+  // we steadily increase `offset` until the current arena is full.
+  // Once that happens we allocate a new arena and continue.
+  // https://en.wikipedia.org/wiki/Memory_pool
+
+  // Fragments that get deallocated are not really freed, we put
+  // them on our free-list. For every bucket we have a pointer to
+  // the first item for reuse. That item itself holds a pointer to
+  // the previously free item (regular free-list implementation).
+  // https://en.wikipedia.org/wiki/Free_list
+
+  // On allocation calls we first check if there is any suitable
+  // item on the free-list. If there is we pop it from the stack
+  // and return it to the caller. Otherwise we have to take out
+  // a new slice from the current `arena` and increase `offset`.
+
+  // Note that this is not thread safe. This is on purpose as we
+  // want to use the memory pool in a thread local usage. In order
+  // to get this thread safe you need to only allocate one pool
+  // per thread. This can be achieved by using thread local PODs.
+  // Simply create a pool on the first allocation and dispose
+  // it once all allocations have been returned. E.g. by using:
+  // static thread_local size_t allocations;
+  // static thread_local MemoryPool* pool;
+
+  class MemoryPool {
+
+    // Current arena we fill up
+    char* arena;
+
+    // Position into the arena
+    size_t offset = std::string::npos;
+
+    // A list of full arenas
+    std::vector<void*> arenas;
+
+    // One pointer for every bucket (zero init)
+    #ifdef _MSC_VER
+    #pragma warning (suppress:4351)
+    #endif
+    void* freeList[SassAllocatorBuckets]{};
+
+    // Increase the address until it sits on a
+    // memory aligned address (maybe use `aligned`).
+    inline static size_t alignMemAddr(size_t addr) {
+      return (addr + SASS_MEM_ALIGN - 1) & ~(SASS_MEM_ALIGN - 1);
+    }
+
+  public:
+
+    // Default ctor
+    MemoryPool() :
+      // Wait for first allocation
+      arena(nullptr),
+      // Set to maximum value in order to
+      // make an allocation on the first run
+      offset(std::string::npos)
+    {
+    }
+
+    // Destructor
+    ~MemoryPool() {
+      // Delete full arenas
+      for (auto area : arenas) {
+        free(area);
+      }
+      // Delete current arena
+      free(arena);
+
+    }
+
+    // Allocate a slice of the memory pool
+    void* allocate(size_t size)
+    {
+
+      // Increase size so its memory is aligned
+      size = alignMemAddr(
+        // Make sure we have enough space for us to
+        // create the pointer to the free list later
+        std::max(sizeof(void*), size)
+        // and the size needed for our book-keeping
+        + SassAllocatorBookSize);
+
+      // Size must be multiple of alignment
+      // So we can derive bucket index from it
+      size_t bucket = size / SASS_MEM_ALIGN;
+
+      // Everything bigger is allocated via malloc
+      // Malloc is optimized for exactly this case
+      if (bucket >= SassAllocatorBuckets) {
+        char* buffer = (char*)malloc(size);
+        if (buffer == nullptr) {
+          throw std::bad_alloc();
+        }
+        // Mark it for deallocation via free
+        ((unsigned int*)buffer)[0] = UINT_MAX;
+        // Return pointer after our book-keeping space
+        return (void*)(buffer + SassAllocatorBookSize);
+      }
+      // Use custom allocator
+      else {
+        // Get item from free list
+        void*& free = freeList[bucket];
+        // Do we have a free item?
+        if (free != nullptr) {
+          // Copy pointer to return
+          void* ptr = free;
+          // Update free list pointer
+          free = ((void**)ptr)[0];
+          // Return popped item
+          return ptr;
+        }
+      }
+
+      // Make sure we have enough space in the arena
+      if (!arena || offset > SassAllocatorArenaSize - size) {
+        if (arena) arenas.emplace_back(arena);
+        arena = (char*)malloc(SassAllocatorArenaSize);
+        if (arena == nullptr) throw std::bad_alloc();
+        offset = SassAllocatorArenaHeadSize;
+      }
+
+      // Get pointer into the arena
+      char* buffer = arena + offset;
+      // Consume object size
+      offset += size;
+
+      // Set the bucket index for this slice
+      ((unsigned int*)buffer)[0] = (unsigned int)bucket;
+
+      // Return pointer after our book-keeping space
+      return (void*)(buffer + SassAllocatorBookSize);
+
+    }
+    // EO allocate
+
+    void deallocate(void* ptr)
+    {
+
+      // Rewind buffer from pointer
+      char* buffer = (char*)ptr -
+        SassAllocatorBookSize;
+
+      // Get the bucket index stored in the header
+      unsigned int bucket = ((unsigned int*)buffer)[0];
+
+      // Check allocation method
+      if (bucket != UINT_MAX) {
+        // Let memory point to previous item in free list
+        ((void**)ptr)[0] = freeList[bucket];
+        // Free list now points to our memory
+        freeList[bucket] = (void*)ptr;
+      }
+      else {
+        // Release memory
+        free(buffer);
+      }
+
+    }
+    // EO deallocate
+
+  };
+
+}
+
+#endif

data/ext/libsass/src/memory/{SharedPtr.cpp → shared_ptr.cpp}

@@ -2,7 +2,7 @@
 #include <iostream>
 #include <typeinfo>
 
-#include "SharedPtr.hpp"
+#include "shared_ptr.hpp"
 #include "../ast_fwd_decl.hpp"
 
 #ifdef DEBUG_SHARED_PTR
@@ -26,7 +26,7 @@ namespace Sass {
       }
     }
   }
-  std::vector<SharedObj*> SharedObj::all;
+  sass::vector<SharedObj*> SharedObj::all;
   #endif
 
   bool SharedObj::taint = false;

data/ext/libsass/src/memory/{SharedPtr.hpp → shared_ptr.hpp}

@@ -3,14 +3,21 @@
 
 #include "sass/base.h"
 
+#include "../sass.hpp"
+#include "allocator.hpp"
 #include <cstddef>
 #include <iostream>
 #include <string>
 #include <type_traits>
 #include <vector>
 
+// https://lokiastari.com/blog/2014/12/30/c-plus-plus-by-example-smart-pointer/index.html
+// https://lokiastari.com/blog/2015/01/15/c-plus-plus-by-example-smart-pointer-part-ii/index.html
+// https://lokiastari.com/blog/2015/01/23/c-plus-plus-by-example-smart-pointer-part-iii/index.html
+
 namespace Sass {
 
+  // Forward declaration
   class SharedPtr;
 
   ///////////////////////////////////////////////////////////////////////////////
@@ -42,6 +49,16 @@ namespace Sass {
 
   #endif
 
+  // SharedObj is the base class for all objects that can be stored as a shared object
+  // It adds the reference counter and other values directly to the objects
+  // This gives a slight overhead when directly used as a stack object, but has some
+  // advantages for our code. It is safe to create two shared pointers from the same
+  // objects, as the "control block" is directly attached to it. This would lead
+  // to undefined behavior with std::shared_ptr. This also avoids the need to
+  // allocate additional control blocks and/or the need to dereference two
+  // pointers on each operation. This can be optimized in `std::shared_ptr`
+  // too by using `std::make_shared` (where the control block and the actual
+  // object are allocated in one continuous memory block via one single call).
   class SharedObj {
    public:
     SharedObj() : refcount(0), detached(false) {
@@ -51,18 +68,23 @@ namespace Sass {
     }
     virtual ~SharedObj() {
       #ifdef DEBUG_SHARED_PTR
-      all.clear();
+      for (size_t i = 0; i < all.size(); i++) {
+        if (all[i] == this) {
+          all.erase(all.begin() + i);
+          break;
+        }
+      }
       #endif
     }
 
     #ifdef DEBUG_SHARED_PTR
     static void dumpMemLeaks();
-    SharedObj* trace(std::string file, size_t line) {
+    SharedObj* trace(sass::string file, size_t line) {
       this->file = file;
       this->line = line;
       return this;
     }
-    std::string getDbgFile() { return file; }
+    sass::string getDbgFile() { return file; }
     size_t getDbgLine() { return line; }
     void setDbg(bool dbg) { this->dbg = dbg; }
     size_t getRefCount() const { return refcount; }
@@ -70,7 +92,16 @@ namespace Sass {
 
     static void setTaint(bool val) { taint = val; }
 
-    virtual const std::string to_string() const = 0;
+    #ifdef SASS_CUSTOM_ALLOCATOR
+    inline void* operator new(size_t nbytes) {
+      return allocateMem(nbytes);
+    }
+    inline void operator delete(void* ptr) {
+      return deallocateMem(ptr);
+    }
+    #endif
+
+    virtual sass::string to_string() const = 0;
    protected:
     friend class SharedPtr;
     friend class Memory_Manager;
@@ -78,13 +109,16 @@ namespace Sass {
     bool detached;
     static bool taint;
     #ifdef DEBUG_SHARED_PTR
-    std::string file;
+    sass::string file;
     size_t line;
     bool dbg = false;
-    static std::vector<SharedObj*> all;
+    static sass::vector<SharedObj*> all;
     #endif
   };
 
+  // SharedPtr is a intermediate (template-less) base class for SharedImpl.
+  // ToDo: there should be a way to include this in SharedImpl and to get
+  // ToDo: rid of all the static_cast that are now needed in SharedImpl.
   class SharedPtr {
    public:
     SharedPtr() : node(nullptr) {}
@@ -114,6 +148,11 @@ namespace Sass {
     // Prevents all SharedPtrs from freeing this node until it is assigned to another SharedPtr.
     SharedObj* detach() {
       if (node != nullptr) node->detached = true;
+      #ifdef DEBUG_SHARED_PTR
+      if (node->dbg) {
+        std::cerr << "DETACHING NODE\n";
+      }
+      #endif 
       return node;
     }
 
@@ -136,6 +175,11 @@ namespace Sass {
         #endif
         delete node;
       }
+      else if (node->refcount == 0) {
+        #ifdef DEBUG_SHARED_PTR
+        if (node->dbg) std::cerr << "NODE EVAEDED DELETE " << node << "\n";
+        #endif
+      }
     }
     void incRefCount() {
       if (node == nullptr) return;
@@ -149,7 +193,8 @@ namespace Sass {
 
   template <class T>
   class SharedImpl : private SharedPtr {
-   public:
+
+  public:
     SharedImpl() : SharedPtr(nullptr) {}
 
     template <class U>
@@ -172,9 +217,9 @@ namespace Sass {
         SharedPtr::operator=(static_cast<const SharedImpl<T>&>(rhs)));
     }
 
-    operator const std::string() const {
+    operator sass::string() const {
       if (node) return node->to_string();
-      return "[nullptr]";
+      return "null";
     }
 
     using SharedPtr::isNull;
@@ -185,6 +230,7 @@ namespace Sass {
     T* operator-> () const { return static_cast<T*>(this->obj()); };
     T* ptr () const { return static_cast<T*>(this->obj()); };
     T* detach() { return static_cast<T*>(SharedPtr::detach()); }
+
   };
 
   // Comparison operators, based on: