Charlesworth signs three-year deal with Gloucestershire