Differential D18158 Diff 49314 src/core/slaveinterface.cpp

Changeset View

Standalone View

View Options

src/core/slaveinterface.cpp

Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Line(s)96 if (d->slave_calcs_speed || !d->connection->isConnected()) { // killing a job results in disconnection but the timer never stops
98 return; 98​ return;
99 } 99​ }
100 100​
101 // Note for future reference: A list is maintained for sizes and times. 101​ // Note for future reference: A list is maintained for sizes and times.
102 // Minimum list size is 1 and maximum list size is 8. Delta is calculated 102​ // Minimum list size is 1 and maximum list size is 8. Delta is calculated
103 // using first and last item from the list. 103​ // using first and last item from the list.
104 104​
105 const qint64 elapsed_time = d->elapsed_timer.elapsed(); 105​ const qint64 elapsed_time = d->elapsed_timer.elapsed();
106 if (elapsed_time >= 900) { 106​ const qint64 last_time = d->transfer_details.isEmpty() ? 0 : d->transfer_details.last().time;
107​
108​ if (elapsed_time - last_time >= 900) {
107 if (d->transfer_details.count() == max_count) { 109​ if (d->transfer_details.count() == max_count) {
108 d->transfer_details.removeFirst(); 110​ d->transfer_details.removeFirst();
109 } 111​ }
110 112​
111 const SlaveInterfacePrivate::TransferInfo first = d->transfer_details.first(); 113​ const SlaveInterfacePrivate::TransferInfo first = d->transfer_details.first();
112 const SlaveInterfacePrivate::TransferInfo last = {elapsed_time, (d->filesize - d->offset)}; 114​ const SlaveInterfacePrivate::TransferInfo last = {elapsed_time, (d->filesize - d->offset)};
113 KIO::filesize_t lspeed = 1000 * (last.size - first.size) / (last.time - first.time); 115​ KIO::filesize_t lspeed = 1000 * (last.size - first.size) / (last.time - first.time);
114 if (!lspeed) { 116​ if (!lspeed) {
▲ Show 20 Lines • Show All 313 Lines • Show Last 20 Lines