← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vsftpd/trusty-proposed

« back to all changes in this revision

Viewing changes to ftpdataio.c

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Baumann
  • Date: 2009-11-06 13:40:19 UTC
  • mto: (2.4.1 sid)
  • mto: This revision was merged to the branch mainline in revision 21.
  • Revision ID: james.westby@ubuntu.com-20091106134019-yak90a6hqpfszkpm
Tags: upstream-2.2.1
Import upstream version 2.2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
ftpdataio.c
257
257
    return;
258
258
  }
259
259
  /* Calculate bandwidth rate */
260
 
  vsf_sysutil_update_cached_time();
261
 
  curr_sec = vsf_sysutil_get_cached_time_sec();
262
 
  curr_usec = vsf_sysutil_get_cached_time_usec();
 
260
  curr_sec = vsf_sysutil_get_time_sec();
 
261
  curr_usec = vsf_sysutil_get_time_usec();
263
262
  elapsed = (double) (curr_sec - p_sess->bw_send_start_sec);
264
263
  elapsed += (double) (curr_usec - p_sess->bw_send_start_usec) /
265
264
             (double) 1000000;
278
277
  rate_ratio = (double) bw_rate / (double) p_sess->bw_rate_max;
279
278
  pause_time = (rate_ratio - (double) 1) * elapsed;
280
279
  vsf_sysutil_sleep(pause_time);
281
 
  vsf_sysutil_update_cached_time();
282
 
  p_sess->bw_send_start_sec = vsf_sysutil_get_cached_time_sec();
283
 
  p_sess->bw_send_start_usec = vsf_sysutil_get_cached_time_usec();
 
280
  p_sess->bw_send_start_sec = vsf_sysutil_get_time_sec();
 
281
  p_sess->bw_send_start_usec = vsf_sysutil_get_time_usec();
284
282
}
285
283
 
286
284
int