standup comedian

(noun) gagman

comedian (generic term)
comic (generic term)