xxq250
/
mindspore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!5886 fix use “delete this” in graph_data_server.h 

Merge pull request !5886 from heleiwang/fix_delete_this
This commit is contained in:
mindspore-ci-bot 2020-09-08 19:43:23 +08:00 committed by Gitee
parent c263eff456 858e7c98b0
commit 65c5663c8f
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mindspore/ccsrc/minddata/dataset/engine/gnn/graph_data_server.h
View File

@ -89,6 +89,8 @@ class UntypedCall {
virtual ~UntypedCall() {}
virtual Status operator()() = 0;
virtual bool JudgeFinish() = 0;
};
template <class ServiceImpl, class AsyncService, class RequestMessage, class ResponseMessage>
@ -120,23 +122,29 @@ class CallData : public UntypedCall {
return Status::OK();
}
Status operator()() {
Status operator()() override {
if (status_ == STATE::CREATE) {
status_ = STATE::PROCESS;
(async_service_->*enqueue_function_)(&ctx_, &request_, &responder_, cq_, cq_, this);
} else if (status_ == STATE::PROCESS) {
EnqueueRequest(service_impl_, async_service_, cq_, enqueue_function_, handle_request_function_);
status_ = STATE::FINISH;
// new CallData(service_, cq_, this->s_type_);
grpc::Status s = (service_impl_->*handle_request_function_)(&ctx_, &request_, &response_);
responder_.Finish(response_, s, this);
} else {
GPR_ASSERT(status_ == STATE::FINISH);
delete this;
MS_LOG(WARNING) << "The CallData status is finish and the pointer needs to be released.";
}
return Status::OK();
}
bool JudgeFinish() override {
if (status_ == STATE::FINISH) {
return true;
} else {
return false;
}
}
private:
STATE status_;
ServiceImpl *service_impl_;
@ -183,7 +191,11 @@ class GraphDataGrpcServer : public GrpcAsyncServer {
Status ProcessRequest(void *tag) {
auto rq = static_cast<UntypedCall *>(tag);
RETURN_IF_NOT_OK((*rq)());
if (rq->JudgeFinish()) {
delete rq;
} else {
RETURN_IF_NOT_OK((*rq)());
}
return Status::OK();
}