wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-07-05 13:44:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

C++ does not guarantee order of argument evaluation (#194)

Browse Source
This commit is contained in:
mehrdadn
2016-07-01 04:49:37 +03:00
committed by Philipp Moritz
parent fb42a5ca50
commit 5821851318
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scheduler.cc
+9 -3
View File
@@ -80,7 +80,9 @@ Status SchedulerService::AliasObjRefs(ServerContext* context, const AliasObjRefs
(*reverse_target_objrefs_.get())[target_objref].push_back(alias_objref);
{
// The corresponding increment was done in register_new_object.
decrement_ref_count(std::vector<ObjRef>({alias_objref}), reference_counts_.get(), contained_objrefs_.get());
auto reference_counts = reference_counts_.get(); // we grab this lock because decrement_ref_count assumes it has been acquired
auto contained_objrefs = contained_objrefs_.get(); // we grab this lock because decrement_ref_count assumes it has been acquired
decrement_ref_count(std::vector<ObjRef>({alias_objref}), reference_counts, contained_objrefs);
}
schedule();
return Status::OK;
@@ -128,7 +130,9 @@ Status SchedulerService::ObjReady(ServerContext* context, const ObjReadyRequest*
// the corresponding increment was done in register_new_object in the
// scheduler. For all subsequent calls to ObjReady, the corresponding
// increment was done in deliver_object_if_necessary in the scheduler.
decrement_ref_count(std::vector<ObjRef>({objref}), reference_counts_.get(), contained_objrefs_.get());
auto reference_counts = reference_counts_.get(); // we grab this lock because decrement_ref_count assumes it has been acquired
auto contained_objrefs = contained_objrefs_.get(); // we grab this lock because decrement_ref_count assumes it has been acquired
decrement_ref_count(std::vector<ObjRef>({objref}), reference_counts, contained_objrefs);
}
schedule();
return Status::OK;
@@ -184,7 +188,9 @@ Status SchedulerService::DecrementRefCount(ServerContext* context, const Decreme
for (int i = 0; i < num_objrefs; ++i) {
objrefs.push_back(request->objref(i));
}
decrement_ref_count(objrefs, reference_counts_.get(), contained_objrefs_.get());
auto reference_counts = reference_counts_.get(); // we grab this lock, because decrement_ref_count assumes it has been acquired
auto contained_objrefs = contained_objrefs_.get(); // we grab this lock because decrement_ref_count assumes it has been acquired
decrement_ref_count(objrefs, reference_counts, contained_objrefs);
return Status::OK;
}