From what I remember, tonicity is only affected by non-permeating (NP) solutes whereas osmolarity considers NP and penetrating solutes. They both basically measure concentration. I believe osmolarity also measures dissociated species, so 1 mol NaCl has i=2 and 1 mol glucose has i=1. If you have the Silverthorn Human Physiology book, it gives an excellent explanation.