Created by: tensor-tang

follow comment https://github.com/PaddlePaddle/Paddle/pull/11233#pullrequestreview-126384018

And refine scope lock