Methods in mutex.cpp that implement the lock()-unlock() path are interleaved with the ones implementing wait()-notify() making it more tedious to browse through the code.
Related methods should be put closer together.