Fix for SPEC CPU2017 621.wrf_s failure, add missing locking code.