~tangent-trunk/libmemcached/1.2

« back to all changes in this revision

Viewing changes to clients/ms_task.c

  • Committer: Continuous Integration
  • Date: 2013-10-10 21:49:40 UTC
  • mfrom: (1106.1.9 misc-memaslap-fixes)
  • Revision ID: ci@tangent.org-20131010214940-3jipjxxlblpsxs9y
Merge lp:~mwhudson/libmemcached/misc-memaslap-fixes Build: jenkins-Libmemcached-366

Show diffs side-by-side

added added

removed removed

Lines of Context:
690
690
 */
691
691
int64_t ms_time_diff(struct timeval *start_time, struct timeval *end_time)
692
692
{
693
 
  int64_t endtime= end_time->tv_sec * 1000000 + end_time->tv_usec;
694
 
  int64_t starttime= start_time->tv_sec * 1000000 + start_time->tv_usec;
 
693
  int64_t endtime= ((int64_t)end_time->tv_sec) * 1000000 + end_time->tv_usec;
 
694
  int64_t starttime= ((int64_t)start_time->tv_sec) * 1000000 + start_time->tv_usec;
695
695
 
696
696
  assert(endtime >= starttime);
697
697