From bebc7ce35c2deba9fc933da4e759b6ec12618fb4 Mon Sep 17 00:00:00 2001
From: Christian Zimmermann <christian.zimmermann@ur.de>
Date: Fri, 15 Nov 2019 18:16:19 +0100
Subject: [PATCH] allocation warning + forwarding + remove unsave code
 regarding that (e.g. anonymousMove)

---
 src/include/allocator.h        |  6 ++++++
 src/include/multi_array.cc.h   | 19 +++++++++++--------
 src/include/multi_array.h      |  4 ++--
 src/include/multi_array_base.h |  2 +-
 src/include/slice.cc.h         |  4 ++--
 src/include/slice.h            |  2 +-
 6 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/include/allocator.h b/src/include/allocator.h
index a118eef..5d66dac 100644
--- a/src/include/allocator.h
+++ b/src/include/allocator.h
@@ -9,6 +9,9 @@
 #include <cassert>
 #include <iostream>
 
+#define MIB_SIZE 1024*1024 // 1MiB
+#define WARN_SIZE MIB_SIZE*100 // 100 MiB
+
 namespace MultiArrayHelper
 {
 
@@ -32,6 +35,9 @@ namespace MultiArrayHelper
 	T* allocate(size_t n)
 	{
 	    const size_t nn = n*type_size;
+            if(nn >= WARN_SIZE){
+                std::cout << __func__ << ": WARNING: allocating " << nn/(MIB_SIZE) << " MiB" << std::endl;
+            }
             const size_t off = nn%N;
             const size_t nnx = (off == 0) ? nn : nn + N - off;
             const size_t nnd = nnx/N;
diff --git a/src/include/multi_array.cc.h b/src/include/multi_array.cc.h
index facf01b..bff9f42 100644
--- a/src/include/multi_array.cc.h
+++ b/src/include/multi_array.cc.h
@@ -24,7 +24,7 @@ namespace MultiArrayTools
 
     template <typename T, class... SRanges>
     MultiArray<T,SRanges...>::MultiArray(const typename CRange::Space& space,
-					 vector<T>&& vec) :
+					 const vector<T>& vec) :
 	MutableMultiArrayBase<T,SRanges...>(space),
 	mCont(vec)
     {
@@ -65,7 +65,7 @@ namespace MultiArrayTools
     template <typename T, class... SRanges>
     MultiArray<T,SRanges...>::MultiArray(const std::shared_ptr<SRanges>&... ranges, vector<T>&& vec) :
 	MutableMultiArrayBase<T,SRanges...>(ranges...),
-	mCont(vec)
+	mCont(std::forward<vector<T>>(vec))
     {
 	MAB::mInit = true;
 	if(mCont.size() > MAB::mRange->size()){
@@ -82,6 +82,7 @@ namespace MultiArrayTools
         // maybe some checks here in the future...
         assert(mCont.size() == MAB::mRange->size());
 	MAB::mInit = true;
+        in.mInit = false;
     }
 
     template <typename T, class... SRanges>
@@ -91,6 +92,7 @@ namespace MultiArrayTools
 	mCont( std::move( ama.mCont ) )
     {
 	MAB::mInit = true;
+        ama.mInit = false;
     }
     
     /*
@@ -163,16 +165,16 @@ namespace MultiArrayTools
     template <class... SRanges2>
     MultiArray<T,SRanges2...> MultiArray<T,SRanges...>::format(const std::shared_ptr<SRanges2>&... nrs)
     {
-	MAB::mInit = false;
-	return MultiArray<T,SRanges2...>( nrs... , std::move(mCont) );
+	//MAB::mInit = false;
+	return MultiArray<T,SRanges2...>( nrs... , mCont );
     }
 
     template <typename T, class... SRanges>
     template <class... SRanges2>
     MultiArray<T,SRanges2...> MultiArray<T,SRanges...>::format(const std::tuple<std::shared_ptr<SRanges2>...>& nrs)
     {
-	MAB::mInit = false;
-	return MultiArray<T,SRanges2...>( nrs , std::move(mCont) );
+	//MAB::mInit = false;
+	return MultiArray<T,SRanges2...>( nrs , mCont );
     }
 
     template <typename T, class... SRanges>
@@ -215,8 +217,9 @@ namespace MultiArrayTools
 		( std::dynamic_pointer_cast<AnonymousRange>( arf.create() ),
 		  mCont );
 	}
-    }	
+    }
 
+    /*
     template <typename T, class... SRanges>
     std::shared_ptr<MultiArrayBase<T,AnonymousRange> > MultiArray<T,SRanges...>::anonymousMove()
     {
@@ -226,7 +229,7 @@ namespace MultiArrayTools
 	    ( std::dynamic_pointer_cast<AnonymousRange>( arf.create() ),
 	      std::move(mCont) );
     }	
-
+    */
     template <typename T, class... SRanges>
     MultiArray<T,SRanges...>& MultiArray<T,SRanges...>::operator=(const T& in)
     {
diff --git a/src/include/multi_array.h b/src/include/multi_array.h
index 955fe44..2e70431 100644
--- a/src/include/multi_array.h
+++ b/src/include/multi_array.h
@@ -47,7 +47,7 @@ namespace MultiArrayTools
 	MultiArray(const std::shared_ptr<SRanges>&... ranges, MultiArray<T,Ranges...>&& in); // same effect as format
 
         MultiArray(const typename CRange::Space& space);
-	MultiArray(const typename CRange::Space& space, vector<T>&& vec);
+	MultiArray(const typename CRange::Space& space, const vector<T>& vec);
 	MultiArray(MultiArray<T,AnonymousRange>&& ama, SIZET<SRanges>... sizes);
 	
 	// Only if ALL ranges have default extensions:
@@ -90,7 +90,7 @@ namespace MultiArrayTools
         vector<T>&& vmove() { MAB::mInit = false; return std::move(mCont); }
         
 	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymous(bool slice = false) const override;
-	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() override;
+	//virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() override;
 	
 	auto cat() const
 	    -> decltype(ArrayCatter<T>::cat(*this));
diff --git a/src/include/multi_array_base.h b/src/include/multi_array_base.h
index da4b8f7..b04ed8d 100644
--- a/src/include/multi_array_base.h
+++ b/src/include/multi_array_base.h
@@ -153,7 +153,7 @@ namespace MultiArrayTools
 
 	virtual bool isConst() const override;
 
-	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() = 0;
+	//virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() = 0;
 	
 	virtual ConstOperationRoot<T,SRanges...>
 	op(const std::shared_ptr<IndexType>& ind) const override;
diff --git a/src/include/slice.cc.h b/src/include/slice.cc.h
index 64cae6a..3d302f7 100644
--- a/src/include/slice.cc.h
+++ b/src/include/slice.cc.h
@@ -213,14 +213,14 @@ namespace MultiArrayTools
 	assert(0); // think about carefully!!!!
 	return nullptr;
     }
-    
+    /*
     template <typename T, class... SRanges>
     std::shared_ptr<MultiArrayBase<T,AnonymousRange> > Slice<T,SRanges...>::anonymousMove()
     {
 	assert(0); // think about carefully!!!!
 	return nullptr;
     }
-    
+    */
     template <typename T, class... SRanges>
     auto Slice<T,SRanges...>::define(const std::shared_ptr<typename SRanges::IndexType>&... inds)
 	-> SliceDef<T,SRanges...>
diff --git a/src/include/slice.h b/src/include/slice.h
index b801562..bd79d83 100644
--- a/src/include/slice.h
+++ b/src/include/slice.h
@@ -86,7 +86,7 @@ namespace MultiArrayTools
 	virtual auto end() const -> IType override;
 
 	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymous(bool slice = false) const override;
-	virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() override;
+	//virtual std::shared_ptr<MultiArrayBase<T,AnonymousRange> > anonymousMove() override;
 
 	auto define(const std::shared_ptr<typename SRanges::IndexType>&... inds)
 	    -> SliceDef<T,SRanges...>;