pvac::Monitor::cancel() don't clear data members

Clearing root, overrun, and changed makes it difficult
to avoid a race during an async. cancel (very common).
This commit is contained in:
Michael Davidsaver
2019-09-11 18:03:39 -07:00
parent 710bcde7be
commit 24e83daaba
2 changed files with 5 additions and 4 deletions

View File

@@ -196,9 +196,6 @@ std::string Monitor::name() const
void Monitor::cancel()
{
changed.clear();
overrun.clear();
root.reset();
if(impl) impl->cancel();
}

View File

@@ -124,7 +124,11 @@ struct epicsShareClass Monitor
//! Channel name
std::string name() const;
//! Immediate cancellation.
//! Does not wait for remote confirmation.
/** Does not wait for remote confirmation.
*
@since Up to 7.0.0 also cleared root, changed, and overrun.
After 7.0.0, these data members are left unchanged.
**/
void cancel();
/** updates root, changed, overrun
*