wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid passing self to watch actor

This commit is contained in:
Andrew Noyes 2020-03-26 10:29:23 -07:00
parent cdb6bbfc85
commit f6af6ec777
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fdbclient/NativeAPI.actor.cpp
View File

@ -2146,13 +2146,9 @@ void Watch::setWatch(Future<Void> watchFuture) {
}
//FIXME: This seems pretty horrible. Now a Database can't die until all of its watches do...
ACTOR Future<Void> watch( Reference<Watch> watch, Database cx, Transaction *self ) {
state TransactionInfo info = self->info;
ACTOR Future<Void> watch(Reference<Watch> watch, Database cx, TransactionInfo info) {
cx->addWatch();
try {
self->watches.push_back(watch);
self = nullptr; // This actor may outlive *self
choose {
// RYOW write to value that is being watched (if applicable)
// Errors
@ -2191,7 +2187,9 @@ Future<Version> Transaction::getRawReadVersion() {
Future< Void > Transaction::watch( Reference<Watch> watch ) {
++cx->transactionWatchRequests;
return ::watch(watch, cx, this);
cx->addWatch();
watches.push_back(watch);
return ::watch(watch, cx, info);
}
ACTOR Future<Standalone<VectorRef<const char*>>> getAddressesForKeyActor(Key key, Future<Version> ver, Database cx,