fixed globiter to be trivially copyable and added test, remove member myid from globiter

Author: fmoessbauer

dash/include/dash/iterator/GlobIter.h

@@ -134,80 +134,62 @@ class GlobIter
 
 protected:
   /// Global memory used to dereference iterated values.
-  GlobMemType          * _globmem;
+  GlobMemType          * _globmem         = nullptr;
   /// Pattern that specifies the iteration order (access pattern).
-  const PatternType    * _pattern;
+  const PatternType    * _pattern         = nullptr;
   /// Current position of the iterator in global canonical index space.
   index_type             _idx             = 0;
   /// Maximum position allowed for this iterator.
   index_type             _max_idx         = 0;
-  /// Unit id of the active unit
-  team_unit_t            _myid;
   /// Pointer to first element in local memory
   local_pointer          _lbegin          = nullptr;
 
 public:
-  /**
-   * Default constructor.
-   */
-  constexpr GlobIter()
-  : _globmem(nullptr),
-    _pattern(nullptr),
-    _idx(0),
-    _max_idx(0),
-    _myid(dash::Team::All().myid()),
-    _lbegin(nullptr)
-  { }
+
+  constexpr GlobIter() = default;
 
   /**
    * Constructor, creates a global iterator on global memory following
    * the element order specified by the given pattern.
    */
   constexpr GlobIter(
     GlobMemType       * gmem,
-	  const PatternType & pat,
-	  index_type          position = 0)
+    const PatternType & pat,
+    index_type          position = 0)
   : _globmem(gmem),
     _pattern(&pat),
     _idx(position),
     _max_idx(pat.size() - 1),
-    _myid(pat.team().myid()),
     _lbegin(_globmem->lbegin())
   { }
 
   /**
    * Copy constructor.
    */
   template <
-    class    P_,
-    class    GM_,
     class    Ptr_,
     class    Ref_ >
   constexpr GlobIter(
-    const GlobIter<nonconst_value_type, P_, GM_, Ptr_, Ref_> & other)
+    const GlobIter<nonconst_value_type, PatternType, GlobMemType, Ptr_, Ref_> & other)
   : _globmem(other._globmem)
   , _pattern(other._pattern)
   , _idx    (other._idx)
   , _max_idx(other._max_idx)
-  , _myid   (other._myid)
   , _lbegin (other._lbegin)
   { }
 
   /**
    * Move constructor.
    */
   template <
-    class    P_,
-    class    GM_,
     class    Ptr_,
     class    Ref_ >
   constexpr GlobIter(
-    GlobIter<nonconst_value_type, P_, GM_, Ptr_, Ref_> && other)
+    GlobIter<nonconst_value_type, PatternType, GlobMemType, Ptr_, Ref_> && other)
   : _globmem(other._globmem)
   , _pattern(other._pattern)
   , _idx    (other._idx)
   , _max_idx(other._max_idx)
-  , _myid   (other._myid)
   , _lbegin (other._lbegin)
   { }
 
@@ -216,18 +198,15 @@ class GlobIter
    */
   template <
     typename T_,
-    class    P_,
-    class    GM_,
     class    Ptr_,
     class    Ref_ >
   self_t & operator=(
-    const GlobIter<T_, P_, GM_, Ptr_, Ref_ > & other)
+    const GlobIter<T_, PatternType, GlobMemType, Ptr_, Ref_ > & other)
   {
     _globmem = other._globmem;
     _pattern = other._pattern;
     _idx     = other._idx;
     _max_idx = other._max_idx;
-    _myid    = other._myid;
     _lbegin  = other._lbegin;
     return *this;
   }
@@ -237,18 +216,15 @@ class GlobIter
    */
   template <
     typename T_,
-    class    P_,
-    class    GM_,
     class    Ptr_,
     class    Ref_ >
   self_t & operator=(
-    GlobIter<T_, P_, GM_, Ptr_, Ref_ > && other)
+    GlobIter<T_, PatternType, GlobMemType, Ptr_, Ref_ > && other)
   {
     _globmem = other._globmem;
     _pattern = other._pattern;
     _idx     = other._idx;
     _max_idx = other._max_idx;
-    _myid    = other._myid;
     _lbegin  = other._lbegin;
     // no ownership to transfer
     return *this;
@@ -430,7 +406,7 @@ class GlobIter
    */
   constexpr bool is_local() const
   {
-    return (_myid == lpos().unit);
+    return (dash::Team::All().myid() == lpos().unit);
   }
 
   /**
@@ -466,7 +442,7 @@ class GlobIter
     local_pos_t local_pos = _pattern->local(idx);
     DASH_LOG_TRACE_VAR("GlobIter.local= >", local_pos.unit);
     DASH_LOG_TRACE_VAR("GlobIter.local= >", local_pos.index);
-    if (_myid != local_pos.unit) {
+    if (dash::Team::All().myid() != local_pos.unit) {
       // Iterator position does not point to local element
       return nullptr;
     }

dash/test/types/GlobIterTest.cc

@@ -0,0 +1,27 @@
+
+#include "../TestBase.h"
+#include "../TestLogHelpers.h"
+#include "GlobIterTest.h"
+
+#include <type_traits>
+#include <dash/Array.h>
+#include <dash/Atomic.h>
+
+
+TEST_F(GlobIterTest, IteratorTypes)
+{
+  {
+    using array_t = dash::Array<int>;
+    static_assert(std::is_trivially_copyable<array_t::iterator>::value,
+        "Array::iterator not trivially copyable");
+    static_assert(std::is_trivially_copyable<array_t::const_iterator>::value,
+        "Array::const_iterator not trivially copyable");
+  }
+  {
+    using array_t = dash::Array<dash::Atomic<int>>;
+    static_assert(std::is_trivially_copyable<array_t::iterator>::value,
+        "Array<Atomic<T>>::iterator not trivially copyable");
+    static_assert(std::is_trivially_copyable<array_t::const_iterator>::value,
+        "Array<Atomic<T>>::const_iterator not trivially copyable");
+  }
+}

dash/test/types/GlobIterTest.h

@@ -0,0 +1,15 @@
+#ifndef DASH__TEST__GLOBREF_TEST_H_
+#define DASH__TEST__GLOBREF_TEST_H_
+
+#include <gtest/gtest.h>
+
+#include "../TestBase.h"
+
+
+/**
+ * Test fixture for global iterators
+ */
+class GlobIterTest: public dash::test::TestBase {
+};
+
+#endif // DASH__TEST__GLOBREF_TEST_H_