← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/libtorrent-rasterbar/oneiric

« back to all changes in this revision

Viewing changes to src/connection_queue.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Andrew Starr-Bochicchio
  • Date: 2010-08-10 12:57:25 UTC
  • mfrom: (1.3.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100810125725-i2o9iblow20w7qde
Tags: 0.15.1-0ubuntu1
https://launchpad.net/bugs/615950
* New upstream point release.

* New package libtorrent-rasterbar6 (bump up library soname). (LP: #615950)
 - Must Conflict/Replace libtorrent-rasterbar5 (= 0.15.0-0ubuntu1) or it will
   fail to install trying to overwrite '/usr/lib/libtorrent-rasterbar.so.6.0.0'

* Sync on git.debian.org/collab-maint/libtorrent-rasterbar.git:
 - debian/{control,rules}: Bump debhelper build-dep to (>= 7.4.10)
   and pass to dh in order to enable parallel build support.
 - debian/watch: Use googlecode.debian.net redirector.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/connection_queue.cpp
163
163
                        i != m_queue.end(); ++i)
164
164
                {
165
165
                        if (i->connecting) ++num_connecting;
 
166
                        else TORRENT_ASSERT(i->expires == max_time());
166
167
                }
167
168
                TORRENT_ASSERT(num_connecting == m_num_connecting);
168
169
        }
200
201
                while (i != m_queue.end())
201
202
                {
202
203
                        TORRENT_ASSERT(i->connecting == false);
203
 
                        ptime expire = time_now() + i->timeout;
 
204
                        ptime expire = time_now_hires() + i->timeout;
204
205
                        if (m_num_connecting == 0)
205
206
                        {
206
207
                                error_code ec;
264
265
                if (e) return;
265
266
 
266
267
                ptime next_expire = max_time();
267
 
                ptime now = time_now();
 
268
                ptime now = time_now_hires() + milliseconds(100);
268
269
                std::list<entry> timed_out;
269
270
                for (std::list<entry>::iterator i = m_queue.begin();
270
271
                        !m_queue.empty() && i != m_queue.end();)