I have always known it to be taken from first contraction. So, I would say your labour was 16 hours.
My first labour was 9 hours, my second was 6. You never know if it will be longer, the same length, or shorter. There are plenty of women who have longer labours second time round.