ruby-eigen 0.0.11.pre1 → 0.0.11.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ac58897210d0170583b758c667314e889702126
-  data.tar.gz: edbaf00bd509f2977e7a09c9b7f3a69d1e97d835
+  metadata.gz: 71cf8652431e0c12cbc9dca81d95bad6910bcbcd
+  data.tar.gz: faeef922a3c18a650dca92cdfa9666ccf67d883f
 SHA512:
-  metadata.gz: 8dc87fb4bc8910e912198c7b2ca94258709199a74f2cec3e0278e09a7fd933c4ece8b5b219782cb16d74b58ecf7ce46a71651db8ab3dd76efad7ffe94b228d34
-  data.tar.gz: c0bcba831cae1396114edcc9b5b5d9067cf876dd782ea2d4c006f34af1966e7e045be8e31f9a7b0ae485596ec6565dc783fb736a6c07613ce376eddccd38d55f
+  metadata.gz: 2ad2d2cc715c66939ae5b41b8bd908bb7858a1b0c3026725b73ae3bba3d8b122f229bf15f19b8af116a68bf08e900c6884e568baaf485b3a873ba6469a86b059
+  data.tar.gz: 791be254a5cddba6c7d83750849d2921dbe380b3e28d5ccd4e1ee4ef34ee7b7576bee185334ab8690789c3f456924ed01f708be566543ad8ec6943429ea80d46

data/ext/eigen/eigen3/Eigen/src/Core/util/Memory.h

@@ -103,6 +103,7 @@ inline void throw_std_bad_alloc()
   */
 inline void* handmade_aligned_malloc(std::size_t size)
 {
+  rubyeigen_gc_add_count(size);
   void *original = std::malloc(size+16);
   if (original == 0) return 0;
   void *aligned = reinterpret_cast<void*>((reinterpret_cast<std::size_t>(original) & ~(std::size_t(15))) + 16);
@@ -212,7 +213,7 @@ inline void check_that_malloc_is_allowed()
 inline void* aligned_malloc(size_t size)
 {
   check_that_malloc_is_allowed();
-
+  rubyeigen_gc_add_count(size);
   void *result;
   #if !EIGEN_ALIGN
     result = std::malloc(size);
@@ -304,7 +305,7 @@ template<bool Align> inline void* conditional_aligned_malloc(size_t size)
 template<> inline void* conditional_aligned_malloc<false>(size_t size)
 {
   check_that_malloc_is_allowed();
-
+  rubyeigen_gc_add_count(size);
   void *result = std::malloc(size);
   if(!result && size)
     throw_std_bad_alloc();

data/ext/eigen/eigen3/Eigen/src/SparseCore/SparseMatrix.h

@@ -287,6 +287,7 @@ class SparseMatrix
     template<class SizesType>
     inline void reserveInnerVectors(const SizesType& reserveSizes)
     {
+      rubyeigen_gc_add_count(m_outerSize * sizeof(Index));
       if(isCompressed())
       {
         std::size_t totalReserveSize = 0;
@@ -479,6 +480,7 @@ class SparseMatrix
     {
       if(m_innerNonZeros != 0)
         return; 
+      rubyeigen_gc_add_count(m_outerSize * sizeof(Index));
       m_innerNonZeros = static_cast<Index*>(std::malloc(m_outerSize * sizeof(Index)));
       for (Index i = 0; i < m_outerSize; i++)
       {
@@ -555,6 +557,7 @@ class SparseMatrix
       else if (innerChange < 0) 
       {
         // Inner size decreased: allocate a new m_innerNonZeros
+        rubyeigen_gc_add_count(m_outerSize * sizeof(Index));
         m_innerNonZeros = static_cast<Index*>(std::malloc((m_outerSize+outerChange+1) * sizeof(Index)));
         if (!m_innerNonZeros) internal::throw_std_bad_alloc();
         for(Index i = 0; i < m_outerSize; i++)
@@ -601,6 +604,7 @@ class SparseMatrix
       if (m_outerSize != outerSize || m_outerSize==0)
       {
         std::free(m_outerIndex);
+        rubyeigen_gc_add_count(outerSize * sizeof(Index));
         m_outerIndex = static_cast<Index*>(std::malloc((outerSize + 1) * sizeof(Index)));
         if (!m_outerIndex) internal::throw_std_bad_alloc();