I think this looks good now if you make it build and clean up the Jenkins stuff (at least the 80 chars... the BUG() warning is stupid and we should probably disable it or replace those with die() or something). (I still think it would be nice to factor out that stage measurement into a separate function, though.)

View Change

To view, visit change 29547. To unsubscribe, or for help writing mail filters, visit settings.