Updated GlobPtr.local()

dash-project · Mar 28, 2017 · 22b0007 · 22b0007
1 parent 3b469ef
commit 22b0007
Showing 1 changed file with 47 additions and 48 deletions.
diff --git a/dash/include/dash/GlobPtr.h b/dash/include/dash/GlobPtr.h
@@ -223,6 +223,26 @@ class GlobPtr
    */
   self_t & operator=(self_t && rhs)            = default;
 
+  /**
+   * Converts pointer to its referenced native pointer or
+   * \c nullptr if the \c GlobPtr does not point to a local
+   * address.
+   */
+  explicit operator value_type*() const noexcept {
+    return local();
+  }
+
+  /**
+   * Conversion operator to local pointer.
+   *
+   * \returns  A native pointer to the local element referenced by this
+   *           GlobPtr instance, or \c nullptr if the referenced element
+   *           is not local to the calling unit.
+   */
+  explicit operator value_type*() noexcept {
+    return local();
+  }
+
   /**
    * Converts pointer to its underlying global address.
    */
@@ -248,13 +268,11 @@ class GlobPtr
   }
 
   /**
-   * Converts pointer to its referenced native pointer or
-   * \c nullptr if the \c GlobPtr does not point to a local
-   * address.
+   * Pointer offset difference operator.
    */
-  explicit constexpr operator value_type *() const noexcept
+  constexpr index_type operator-(const self_t & rhs) const noexcept
   {
-    return local();
+    return dash::distance(rhs, *this);
   }
 
   /**
@@ -271,25 +289,25 @@ class GlobPtr
    */
   self_t operator++(int)
   {
-    self_t res = *this;
+    self_t res(*this);
     increment(1);
     return res;
   }
 
   /**
    * Pointer increment operator.
    */
-  self_t operator+(gptrdiff_t n) const
+  self_t operator+(index_type n) const
   {
-    self_t res = *this;
+    self_t res(*this);
     res += n;
     return res;
   }
 
   /**
    * Pointer increment operator.
    */
-  self_t & operator+=(gptrdiff_t n)
+  self_t & operator+=(index_type n)
   {
     increment(n);
     return *this;
@@ -309,25 +327,17 @@ class GlobPtr
    */
   self_t operator--(int)
   {
-    self_t res = *this;
+    self_t res(*this);
     decrement(1);
     return res;
   }
 
-  /**
-   * Pointer offset difference operator.
-   */
-  constexpr index_type operator-(const self_t & rhs) const noexcept
-  {
-    return dash::distance(rhs, *this);
-  }
-
   /**
    * Pointer decrement operator.
    */
   self_t operator-(index_type n) const
   {
-    self_t res = *this;
+    self_t res(*this);
     res -= n;
     return res;
   }
@@ -427,21 +437,6 @@ class GlobPtr
     return GlobRef<const value_type>(*this);
   }
 
-  /**
-   * Conversion operator to local pointer.
-   *
-   * \returns  A native pointer to the local element referenced by this
-   *           GlobPtr instance, or \c nullptr if the referenced element
-   *           is not local to the calling unit.
-   */
-  explicit operator value_type*() {
-    void *addr = 0;
-    DASH_ASSERT_RETURNS(
-      dart_gptr_getaddr(_rbegin_gptr, &addr),
-      DART_OK);
-    return static_cast<value_type*>(addr);
-  }
-
   /**
    * Conversion to local pointer.
    *
@@ -451,10 +446,10 @@ class GlobPtr
    */
   value_type * local() {
     void *addr = 0;
-    DASH_ASSERT_RETURNS(
-      dart_gptr_getaddr(_rbegin_gptr, &addr),
-      DART_OK);
-    return static_cast<value_type*>(addr);
+    if (dart_gptr_getaddr(_rbegin_gptr, &addr) == DART_OK) {
+      return static_cast<value_type*>(addr);
+    }
+    return nullptr;
   }
 
   /**
@@ -466,10 +461,10 @@ class GlobPtr
    */
   const value_type * local() const {
     void *addr = 0;
-    DASH_ASSERT_RETURNS(
-      dart_gptr_getaddr(_rbegin_gptr, &addr),
-      DART_OK);
-    return static_cast<const value_type*>(addr);
+    if (dart_gptr_getaddr(_rbegin_gptr, &addr) = DART_OK) {
+      return static_cast<const value_type*>(addr);
+    }
+    return nullptr;
   }
 
   /**
@@ -479,6 +474,7 @@ class GlobPtr
     DASH_ASSERT_RETURNS(
       dart_gptr_setunit(&_rbegin_gptr, unit_id),
       DART_OK);
+    _lsize = _mem_space.local_size(dart_team_unit_t { _rbegin_gptr.unitid });
   }
 
   /**
@@ -561,7 +557,10 @@ std::ostream & operator<<(
 #ifndef DOXYGEN
 
 /**
- * Wraps underlying global address as global const pointer.
+ * Internal type.
+ * 
+ * Specialization of \c dash::GlobPtr, wraps underlying global address
+ * as global const pointer (not pointer to const).
  *
  * As pointer arithmetics are inaccessible for const pointer types,
  * no coupling to global memory space is required.
@@ -805,18 +804,18 @@ dash::gptrdiff_t distance(
     sizeof(val_type_b) == sizeof(val_type_e),
     "value types of global pointers are not compatible for dash::distance");
 
-  // If unit of begin pointer is after unit of end pointer,
-  // return negative distance with swapped argument order:
-  if (gbegin._rbegin_gptr.unitid > gend._rbegin_gptr.unitid) {
-    return -(dash::distance(gend, gbegin));
-  }
   // Both pointers in same unit space:
   if (gbegin._rbegin_gptr.unitid == gend._rbegin_gptr.unitid ||
       gbegin._mem_space == nullptr) {
     return ( gend._rbegin_gptr.addr_or_offs.offset -
              gbegin._rbegin_gptr.addr_or_offs.offset )
            / sizeof(value_type);
   }
+  // If unit of begin pointer is after unit of end pointer,
+  // return negative distance with swapped argument order:
+  if (gbegin._rbegin_gptr.unitid > gend._rbegin_gptr.unitid) {
+    return -(dash::distance(gend, gbegin));
+  }
   // Pointers span multiple unit spaces, accumulate sizes of
   // local unit memory ranges in the pointer range:
   index_type dist = gbegin._mem_space->local_size(