[sr-dev] git:master: xlog: restructure functions