wrlock
modify sln
Merge remote-tracking branch 'remotes/origin/master'
tracer modify
Merge branch 'master' of https://github.com/yesme2000/klib

Conflicts:
	master/ut/tracer_test_h.h
modify