Skip to content

Fixes to GlobAsyncRef #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fuchsto merged 1 commit into from
Apr 18, 2017
Merged

Fixes to GlobAsyncRef #358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 38 additions & 18 deletions dash/include/dash/GlobAsyncRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,14 @@ class GlobAsyncRef
private:
typedef GlobAsyncRef<T>
self_t;
typedef typename std::remove_const<T>::type
nonconst_value_type;

private:
/// Value of the referenced element, initially not loaded
mutable T _value;
/// Pointer to referenced element in global memory
dart_gptr_t _gptr;
dart_gptr_t _gptr = DART_GPTR_NULL;
/// Pointer to referenced element in local memory
T * _lptr = nullptr;
/// Whether the value of the reference has been changed
bool _has_changed = false;
/// Value of the referenced element, initially not loaded
mutable T _value;
/// Whether the referenced element is located local memory
bool _is_local = false;
/// Whether the value of the referenced element is known
Expand All @@ -73,7 +69,7 @@ class GlobAsyncRef
* Conctructor, creates an GlobRefAsync object referencing an element in
* local memory.
*/
explicit GlobAsyncRef(
explicit constexpr GlobAsyncRef(
/// Pointer to referenced object in local memory
T * lptr)
: _value(*lptr),
Expand All @@ -94,9 +90,7 @@ class GlobAsyncRef
{
_is_local = gptr.is_local();
if (_is_local) {
_value = *gptr;
_lptr = (T*)(gptr);
_has_value = true;
}
}

Expand All @@ -112,9 +106,7 @@ class GlobAsyncRef
GlobConstPtr<T> gptr(dart_gptr);
_is_local = gptr.is_local();
if (_is_local) {
_value = *gptr;
_lptr = (T*)(gptr);
_has_value = true;
}
}

Expand Down Expand Up @@ -153,9 +145,18 @@ class GlobAsyncRef
operator T() const
{
DASH_LOG_TRACE_VAR("GlobAsyncRef.T()", _gptr);
if (!_is_local) {
dart_storage_t ds = dash::dart_storage<T>(1);
dart_get(static_cast<void *>(&_value), _gptr, ds.nelem, ds.dtype);
if (!_has_value) {
if (_is_local) {
_value = *_lptr;
} else {
dart_storage_t ds = dash::dart_storage<T>(1);
DASH_ASSERT_RETURNS(
dart_get_blocking(
static_cast<void *>(&_value), _gptr, ds.nelem, ds.dtype),
DART_OK
);
}
_has_value = true;
}
return _value;
}
Expand All @@ -181,14 +182,16 @@ class GlobAsyncRef
// TODO: Comparison with current value could be inconsistent
if (!_has_value || _value != new_value) {
_value = new_value;
_has_changed = true;
_has_value = true;
if (_is_local) {
*_lptr = _value;
} else {
dart_storage_t ds = dash::dart_storage<T>(1);
dart_put_blocking(
_gptr, static_cast<const void *>(&_value), ds.nelem, ds.dtype);
DASH_ASSERT_RETURNS(
dart_put(
_gptr, static_cast<const void *>(&_value), ds.nelem, ds.dtype),
DART_OK
);
}
}
return *this;
Expand Down Expand Up @@ -262,6 +265,23 @@ class GlobAsyncRef
return result;
}

/**
* Flush all pending assignments on this asynchronous reference and
* invalidate cached copies.
*/
void flush()
{
// perform a flush irregardless of whether the reference is local or not
if (!DART_GPTR_ISNULL(_gptr)) {
DASH_ASSERT_RETURNS(
dart_flush(_gptr),
DART_OK
);
// require a re-read upon next reference
_has_value = false;
}
}

}; // class GlobAsyncRef

template<typename T>
Expand Down