merge changes from RC_1_0

Makefile.am

@@ -5,46 +5,22 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = include/libtorrent src examples test bindings tools
 
 DOCS_IMAGES = \
-  docs/arctic_thumb.png           \
-  docs/bitbuddy_thumb.jpg         \
-  docs/bitfox.png                 \
-  docs/bitrocket_thumb.png        \
-  docs/bitscast_thumb.png         \
-  docs/bitslug_thumb.png          \
-  docs/btg_thumb.jpg              \
-  docs/bubba.png                  \
   docs/client_test.png            \
   docs/cwnd.png                   \
   docs/cwnd_thumb.png             \
   docs/delays.png                 \
   docs/delays_thumb.png           \
-  docs/deluge.png                 \
   docs/disk_access.png            \
   docs/disk_buffer_before_optimization.png  \
   docs/disk_buffer.png            \
   docs/disk_buffer_sample.png     \
   docs/disk_io.png                \
-  docs/electric_sheep_thumb.jpg   \
-  docs/fatrat.png                 \
-  docs/fdm.png                    \
-  docs/firetorrent.png            \
-  docs/flush.jpg                  \
-  docs/halite_thumb.png           \
   docs/hacking.html               \
   docs/im_thumb.jpg               \
-  docs/leechcraft.png             \
-  docs/libtorrent_screen.png      \
-  docs/limewire.png               \
-  docs/lince.png                  \
-  docs/Linkage.png                \
   docs/merkle_tree.graffle        \
   docs/merkle_tree.png            \
-  docs/miro.jpg                   \
-  docs/moopolice_thumb.gif        \
   docs/our_delay_base.png         \
   docs/our_delay_base_thumb.png   \
-  docs/pump.png                   \
-  docs/qbittorrent_thumb.jpg      \
   docs/read_disk_buffers.dot      \
   docs/read_disk_buffers.graffle  \
   docs/read_disk_buffers.png      \
@@ -52,18 +28,11 @@ DOCS_IMAGES = \
   docs/storage.graffle            \
   docs/storage.png                \
   docs/style.css                  \
-  docs/t2e.jpg                    \
   docs/todo.html                  \
-  docs/tvblob.jpg                 \
-  docs/tvitty.jpg                 \
-  docs/unicode_support.png        \
   docs/write_disk_buffers.dot     \
   docs/write_disk_buffers.graffle \
   docs/write_disk_buffers.png     \
   docs/ziptorrent_thumb.gif       \
-  docs/zyxel.png                  \
-  docs/folx.png                   \
-  docs/tonidoplug.png             \
   docs/disk_access_elevator.png   \
   docs/disk_access_no_elevator.png\
   docs/ip_id_v4.png               \
@@ -75,42 +44,25 @@ DOCS_IMAGES = \
 
 DOCS_PAGES = \
   docs/building.html              \
-  docs/building.rst               \
   docs/client_test.html           \
-  docs/client_test.rst            \
   docs/contributing.html          \
-  docs/contributing.rst           \
   docs/dht_extensions.html        \
-  docs/dht_extensions.rst         \
   docs/dht_rss.html               \
-  docs/dht_rss.rst                \
   docs/dht_sec.html               \
-  docs/dht_sec.rst                \
   docs/dht_store.html             \
-  docs/dht_store.rst              \
   docs/examples.html              \
-  docs/examples.rst               \
   docs/extension_protocol.html    \
-  docs/extension_protocol.rst     \
   docs/features.html              \
-  docs/features.rst               \
   docs/index.html                 \
-  docs/index.rst                  \
   docs/manual-ref.html            \
-  docs/manual.rst                 \
   docs/projects.html              \
-  docs/projects.rst               \
   docs/python_binding.html        \
-  docs/python_binding.rst         \
   docs/tuning.html                \
-  docs/tuning.rst                 \
   docs/settings.rst               \
   docs/stats_counters.rst         \
   docs/troubleshooting.html       \
   docs/udp_tracker_protocol.html  \
-  docs/udp_tracker_protocol.rst   \
   docs/utp.html                   \
-  docs/utp.rst                    \
   docs/reference-Alerts.html      \
   docs/reference-Bencoding.html   \
   docs/reference-Core.html        \

docs/client_test.html

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
-<title>client_test example program</title>
-<link rel="stylesheet" type="text/css" href="../../css/base.css" />
-<link rel="stylesheet" type="text/css" href="../../css/rst.css" />
-<script type="text/javascript">
-/* <![CDATA[ */
-    (function() {
-        var s = document.createElement('script'), t = document.getElementsByTagName('script')[0];
-        s.type = 'text/javascript';
-        s.async = true;
-        s.src = 'http://api.flattr.com/js/0.6/load.js?mode=auto';
-        t.parentNode.insertBefore(s, t);
-    })();
-/* ]]> */
-</script>
-<link rel="stylesheet" href="style.css" type="text/css" />
-<style type="text/css">
-/* Hides from IE-mac \*/
-* html pre { height: 1%; }
-/* End hide from IE-mac */
-</style>
-</head>
-<body>
-<div class="document" id="client-test-example-program">
-    <div id="container">
-    <div id="headerNav">
-    <ul>
-    <li class="first"><a href="/">Home</a></li>
-    <li><a href="../../products.html">Products</a></li>
-    <li><a href="../../contact.html">Contact</a></li>
-    </ul>
-    </div>
-    <div id="header">
-    <div id="orange"></div>
-    <div id="logo"></div>
-    </div>
-    <div id="main">
-<h1 class="title">client_test example program</h1>
-
-<p>Client test is a, more or less, complete bittorrent client. It lacks most
-settings and you can't start or stop torrents once you've started it. All
-the settings are hardcoded. The commandline arguments are:</p>
-<pre class="literal-block">
-client_test &lt;filename1.torrent&gt; &lt;filename2.torrent&gt; ...
-</pre>
-<p>You can start any number of torrent downloads/seeds via the commandline.
-If one argument starts with <tt class="docutils literal"><span class="pre">http://</span></tt> it is interpreted as a tracker
-announce url, and it expects an info-hash as the next argument. The info-hash
-has to be hex-encoded. For example: <tt class="docutils literal">2410d4554d5ed856d69f426c38791673c59f4418</tt>.
-If you pass an announce url and info-hash, a torrent-less download is started.
-It relies on that at least one peer on the tracker is running a libtorrent based
-client and has the metadata (.torrent file). The metadata extension in
-libtorrent will then download it from that peer (or from those peers if more
-than one).</p>
-<p>While running, the <tt class="docutils literal">client_test</tt> sample will look something like this:</p>
-<img alt="client_test.png" src="client_test.png" />
-<p>The commands available in the client are:</p>
-<ul class="simple">
-<li><tt class="docutils literal">q</tt> quits the client (there will be a delay while the client waits
-for tracker responses)</li>
-<li><tt class="docutils literal">l</tt> toggle log. Will display the log at the bottom, informing about
-tracker and peer events.</li>
-<li><tt class="docutils literal">i</tt> toggles torrent info. Will show the peer list for each torrent.</li>
-<li><tt class="docutils literal">d</tt> toggle download info. Will show the block list for each torrent,
-showing downloaded and requested blocks.</li>
-<li><tt class="docutils literal">p</tt> pause all torrents.</li>
-<li><tt class="docutils literal">u</tt> unpause all torrents.</li>
-<li><tt class="docutils literal">r</tt> force tracker reannounce for all torrents.</li>
-<li><tt class="docutils literal">f</tt> toggle show file progress. Displays a list of all files and the
-download progress for each file.</li>
-</ul>
-<p>The list at the bottom (shown if you press <tt class="docutils literal">d</tt>) shows which blocks has
-been requested from which peer. The green background means that it has been
-downloaded. It shows that fast peers will prefer to request whole pieces
-instead of dowloading parts of pieces. It may make it easier to determine
-which peer that sent the corrupt data if a piece fails the hash test.</p>
-<img alt="unicode_support.png" src="unicode_support.png" />
-<p>There's unicode support on linux, MacOS X and Windows.</p>
-</div>
-</body>
-</html>

docs/client_test.rst

@@ -43,8 +43,3 @@ downloaded. It shows that fast peers will prefer to request whole pieces
 instead of dowloading parts of pieces. It may make it easier to determine
 which peer that sent the corrupt data if a piece fails the hash test.
 
-.. image:: unicode_support.png
-
-There's unicode support on linux, MacOS X and Windows.
-
-

docs/makefile

@@ -73,7 +73,7 @@ todo.html:gen_todo.py ../src/*.cpp ../include/libtorrent/*.hpp
 	python gen_todo.py
 	cp $@ $(WEB_PATH)/$@
 
-$(REFERENCE_TARGETS:=.rst):gen_reference_doc.py ../include/libtorrent/*.hpp ../include/libtorrent/kademlia/*.hpp manual.rst settings.rst session_stats.rst
+$(REFERENCE_TARGETS:=.rst):gen_reference_doc.py ../include/libtorrent/*.hpp ../include/libtorrent/kademlia/*.hpp manual.rst settings.rst stats_counters.rst
 	python gen_reference_doc.py
 
 %.epub:%.rst
@@ -83,8 +83,8 @@ $(REFERENCE_TARGETS:=.rst):gen_reference_doc.py ../include/libtorrent/*.hpp ../i
 	rst2pdf $? -o $@ --stylesheets stylesheet
 
 %.html:%.rst
-	rst2html.py --template=template.txt --stylesheet-path=style.css --link-stylesheet --no-toc-backlinks $? > $@
+	rst2html-2.6.py --template=template.txt --stylesheet-path=style.css --link-stylesheet --no-toc-backlinks $? > $@
-	rst2html.py --template=template2.txt --stylesheet-path=style.css --link-stylesheet --no-toc-backlinks $? > $(WEB_PATH)/$@
+	rst2html-2.6.py --template=template2.txt --stylesheet-path=style.css --link-stylesheet --no-toc-backlinks $? > $(WEB_PATH)/$@
 
 %.png:%.dot
 	dot -Tpng $? >$@

docs/projects.html

@@ -44,22 +44,29 @@
 
 <p>These are some of the public projects that uses libtorrent. If you want your
 project listed here, let <a class="reference external" href="mailto:arvid&#64;rasterbar.com">me</a> know.</p>
-<div class="entry container">
+<div class="section" id="wyzo">
-<a class="reference external image-reference" href="http://www.fireaddons.com/"><img alt="firetorrent.png" class="align-right" src="firetorrent.png" /></a>
+<h1>Wyzo</h1>
-<p><strong>firetorrent</strong></p>
+<p><a class="reference external" href="http://www.wyzo.com/">wyzo</a> is a media browser with built-in bittorrent support.</p>
-<p><a class="reference external" href="http://www.fireaddons.com/">firetorrent</a> is a single click torrent downloader plugin
-for Firefox and Wyzo.</p>
 </div>
-<div class="entry container">
+<div class="section" id="deluge">
-<a class="reference external image-reference" href="http://www.tonidoplug.com/"><img alt="tonidoplug.png" class="align-right" src="tonidoplug.png" /></a>
+<h1>deluge</h1>
-<p><strong>tonidoplug</strong></p>
+<p><a class="reference external" href="http://deluge-torrent.org/">deluge Torrent</a> is a more full-featured yet still lightweight bittorrent
+client. It has the ability to automatically resume partial downloads and
+background to the system tray.</p>
+</div>
+<div class="section" id="qbittorrent">
+<h1>qBittorrent</h1>
+<p><a class="reference external" href="http://www.qbittorrent.org/">qBittorrent</a> is a QT bittorrent client available for linux (likely portable to
+most other desktops as well). Written by Christophe Dumez.</p>
+</div>
+<div class="section" id="tonidoplug">
+<h1>tonidoplug</h1>
 <p><a class="reference external" href="http://www.tonidoplug.com/">Tonidoplug</a> is a tiny, low-power, low-cost home server and
 NAS device powered by Tonido software that allows you to access
 your apps, files, music and media from anywhere.</p>
 </div>
-<div class="entry container">
+<div class="section" id="folx">
-<a class="reference external image-reference" href="http://www.mac-downloader.com/"><img alt="folx.png" class="align-right" src="folx.png" /></a>
+<h1>Folx</h1>
-<p><strong>Folx</strong></p>
 <p><a class="reference external" href="http://www.mac-downloader.com/">Folx</a> is a torrent client and download manager for Mac OS X.
 The Free version of Folx has all the basic functionality of the torrent
 client, which allows users to download and create torrent files.
@@ -67,76 +74,114 @@ Folx PRO (available for a small fee) features the possibility to search
 for torrent files just from Folx interface. So there is no need to
 browse through multiple torrent trackers searching for particular file.</p>
 </div>
-<div class="entry container">
+<div class="section" id="miro">
-<a class="reference external image-reference" href="http://www.qbittorrent.org/"><img alt="qbittorrent_thumb.jpg" class="align-right" src="qbittorrent_thumb.jpg" /></a>
+<h1>Miro</h1>
-<p><strong>qBittorrent</strong></p>
+<p><a class="reference external" href="http://getmiro.com">Miro</a> is a free application for channels of internet video (also known as
-<p><a class="reference external" href="http://www.qbittorrent.org/">qBittorrent</a> is a QT bittorrent
+video podcasts and video rss). Miro is designed to be easy to use and to give
-client available for linux (likely
+you an elegant fullscreen viewing experience.</p>
-portable to most other desktops as
-well). Written by Christophe Dumez.</p>
 </div>
-<div class="entry container">
+<div class="section" id="moopolice">
-<a class="reference external image-reference" href="http://www.limewire.com/"><img alt="limewire.png" class="align-right" src="limewire.png" /></a>
+<h1>MooPolice</h1>
-<p><strong>Limewire</strong></p>
+<p><a class="reference external" href="http://www.moopolice.de">MooPolice</a> is a windows bittorrent client with a unique look.</p>
-<p><a class="reference external" href="http://www.limewire.com/">LimeWire</a> is the world's most popular peer-to-peer file-sharing
-program. With over 70 million unique monthly users, the software
-is downloaded hundreds of thousands of times every day and boasts
-millions of active users at any given moment. LimeWire uses the
-BitTorrent protocol and the Gnutella network to provide an
-unparalleled searches and download speed to the user</p>
 </div>
-<div class="entry container">
+<div class="section" id="leechcraft">
-<a class="reference external image-reference" href="http://deluge-torrent.org/"><img alt="deluge.png" class="align-right" src="deluge.png" /></a>
+<h1>LeechCraft</h1>
-<p><strong>deluge torrent</strong></p>
+<p><a class="reference external" href="http://leechcraft.org/">LeechCraft</a> LeechCraft is a free open source cross-platform extensible
-<p><a class="reference external" href="http://deluge-torrent.org/">deluge Torrent</a> is a more full-featured yet still lightweight bittorrent
+software, which primary goal is support of file sharing networks and protocols
-client. It has the ability to automatically resume partial downloads and
+like HTTP and FTP</p>
-background to the system tray.</p>
 </div>
-<div class="entry container">
+<div class="section" id="free-download-manager">
-<a class="reference external image-reference" href="http://excito.com/bubba/about-bubba.html"><img alt="bubba.png" class="align-right" src="bubba.png" /></a>
+<h1>Free download manager</h1>
-<p><strong>bubba</strong></p>
+<p><a class="reference external" href="http://www.freedownloadmanager.org/">FDM</a> is a powerful, easy-to-use and absolutely free download accelerator and
+manager. Moreover, FDM is 100% safe, open-source software distributed under
+GPL License.</p>
+</div>
+<div class="section" id="btg">
+<h1>btg</h1>
+<p><a class="reference external" href="http://btg.berlios.de//">btg</a> is a unix bittorrent client which is run as a daemon. It has multiple user
+interfaces which connects to the daemon. One GUI (Gtkmm), one terminal
+interface (ncurses) and one web interface (accessable through a web browser).
+Written by Michael Wojciechowski and Johan Strom.</p>
+</div>
+<div class="section" id="electric-sheep">
+<h1>electric sheep</h1>
+<p><a class="reference external" href="http://electricsheep.org">electric sheep</a> is a screensaver which collectively generates animations and
+lets the users vote which one to live on.</p>
+</div>
+<div class="section" id="tvitty">
+<h1>Tvitty</h1>
+<p><a class="reference external" href="http://tvitty.com">tvitty</a> is a bittorrent client for Vista Media Center, which allows
+searching and downloading of torrents directly on your TV.</p>
+</div>
+<div class="section" id="hrktorrent">
+<h1>hrktorrent</h1>
+<p><a class="reference external" href="http://50hz.ws/hrktorrent/">hrktorrent</a> hrktorrent is a light console torrent client written in C++.</p>
+</div>
+<div class="section" id="fatrat">
+<h1>FatRat</h1>
+<p><a class="reference external" href="http://fatrat.dolezel.info">FatRat</a> is an open source download manager for Linux/Unix systems written in
+C++ with the help of the Trolltech Qt 4 library. It's simple to use and
+install.</p>
+</div>
+<div class="section" id="halite-bittorrent">
+<h1>halite BitTorrent</h1>
+<p><a class="reference external" href="http://www.binarynotions.com/halite-bittorrent-client">Halite</a> is a windows bittorrent client controllabel via an xml-rpc
+interface.</p>
+</div>
+<div class="section" id="arctic-torrent">
+<h1>Arctic Torrent</h1>
+<p><a class="reference external" href="http://www.int64.org/arctic.html">Arctic Torrent</a> is a light-weight
+bittorrent client for windows.
+Written by Cory Nelson.</p>
+</div>
+<div class="section" id="bubba">
+<h1>bubba</h1>
 <p><a class="reference external" href="http://excito.com/bubba/about-bubba.html">Bubba</a> is a mini-sized server, designed to fit your home better than
 an always running PC. Boasting Torrent downloader, DAAP streaming,
 Web, E-mail, printer and FTP server etc.</p>
 </div>
-<div class="entry container">
+<div class="section" id="tvblob">
-<a class="reference external image-reference" href="http://btg.berlios.de//"><img alt="btg_thumb.jpg" class="align-right" src="btg_thumb.jpg" /></a>
+<h1>tvblob</h1>
-<p><strong>btg</strong></p>
-<p><a class="reference external" href="http://btg.berlios.de//">btg</a> is a unix bittorrent client
-which is run as a daemon. It has
-multiple user interfaces which
-connects to the daemon. One GUI
-(Gtkmm), one terminal interface
-(ncurses) and one web interface
-(accessable through a web browser).
-Written by Michael Wojciechowski
-and Johan Strom.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://www.tvblob.com"><img alt="tvblob.jpg" class="align-right" src="tvblob.jpg" /></a>
-<p><strong>tvblob</strong></p>
 <p>The <a class="reference external" href="http://www.tvblob.com">BLOBbox</a> represents the ability to harness all of the content available
 on the web, without any filtering or pre-selection by a third party just
 like surfing the web.</p>
 <p>This means that anyone will have the ability to reach viewers via the Internet
 directly on TV, without them having to connect a PC.</p>
 </div>
-<div class="entry container">
+<div class="section" id="flush">
-<a class="reference external image-reference" href="http://www.binarynotions.com/halite-bittorrent-client"><img alt="halite_thumb.png" class="align-right" src="halite_thumb.png" /></a>
+<h1>Flush</h1>
-<p><strong>halite BitTorrent</strong></p>
+<p><a class="reference external" href="https://sourceforge.net/projects/flush/">Flush</a> is a GTK-based BitTorrent client.</p>
-<p><a class="reference external" href="http://www.binarynotions.com/halite-bittorrent-client">Halite</a> is a windows bittorrent client controllabel via an xml-rpc
-interface.</p>
 </div>
-<div class="entry container">
+<div class="section" id="lince">
-<a class="reference external image-reference" href="http://www.freedownloadmanager.org/"><img alt="fdm.png" class="align-right" src="fdm.png" /></a>
+<h1>Lince</h1>
-<p><strong>Free download manager</strong></p>
+<p><a class="reference external" href="http://lincetorrent.sourceforge.net/">Lince</a> is a bittorrent client using libtorrent to handle bittorrent protocol
-<p><a class="reference external" href="http://www.freedownloadmanager.org/">FDM</a> is a powerful, easy-to-use and absolutely free download accelerator and
+and gtkmm for the interface, it has been designed to be a light and full
-manager. Moreover, FDM is 100% safe, open-source software distributed under
+featured client.</p>
-GPL License.</p>
 </div>
-<div class="entry container">
+<div class="section" id="linkage">
-<a class="reference external image-reference" href="http://us.zyxel.com/Products/details.aspx?PC1IndexFlag=20050125090459&amp;CategoryGroupNo=758BFE64-3A95-463C-9E1E-3D30E3B58D9C"><img alt="zyxel.png" class="align-right" src="zyxel.png" /></a>
+<h1>Linkage</h1>
-<p><strong>ZyXEL NSA-220</strong></p>
+<p><a class="reference external" href="http://code.google.com/p/linkage/">Linkage</a> is a gtkmm client that aims to be middle weight.</p>
+</div>
+<div class="section" id="bitfox">
+<h1>Bitfox</h1>
+<p><a class="reference external" href="http://code.google.com/p/bitfox/">Bitfox</a> is a firefox plugin integrating bittorrent downloads in firefox.</p>
+</div>
+<div class="section" id="bitslug">
+<h1>BitSlug</h1>
+<p><a class="reference external" href="http://bitslug.sourceforge.net/">BitSlug</a> is a MacOSX cocoa client.</p>
+</div>
+<div class="section" id="delco">
+<h1>DelCo</h1>
+<p><a class="reference external" href="http://delco.cs.tut.fi/">DelCo</a> is a research project at Tampere university of technology, finland.</p>
+</div>
+<div class="section" id="torrent2exe">
+<h1>Torrent2Exe</h1>
+<p><a class="reference external" href="http://torrent2exe.com">Torrent2Exe</a> Torrent2exe is a small BitTorrent client. Its basic idea is to
+let users download a custom-built EXE program with the torrent file
+integrated into it.</p>
+</div>
+<div class="section" id="zyxel-nsa-220">
+<h1>ZyXEL NSA-220</h1>
 <p><a class="reference external" href="http://us.zyxel.com/Products/details.aspx?PC1IndexFlag=20050125090459&amp;CategoryGroupNo=758BFE64-3A95-463C-9E1E-3D30E3B58D9C">ZyXEL</a> NSA220 makes it easy to store, protect and share files between users
 on your home network. The built-in DLNA server works with many set top boxes
 to allow you to play back music, watch video files, or view photos on your
@@ -144,114 +189,6 @@ home theater system, while the built in download manager can automatically
 download video and audio podcasts as well as allow you to download bittorrent
 files without needing to leave your computer on.</p>
 </div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://torrent2exe.com"><img alt="t2e.jpg" class="align-right" src="t2e.jpg" /></a>
-<p><strong>Torrent2Exe</strong></p>
-<p><a class="reference external" href="http://torrent2exe.com">Torrent2Exe</a> Torrent2exe is a small BitTorrent client. Its basic idea is to
-let users download a custom-built EXE program with the torrent file
-integrated into it.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="https://sourceforge.net/projects/flush/"><img alt="flush.jpg" class="align-right" src="flush.jpg" /></a>
-<p><strong>Flush</strong></p>
-<p><a class="reference external" href="https://sourceforge.net/projects/flush/">Flush</a> is a GTK-based BitTorrent client.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://pump.vipeers.com/"><img alt="pump.png" class="align-right" src="pump.png" /></a>
-<p><strong>Pump</strong></p>
-<p><a class="reference external" href="http://pump.vipeers.com/">Pump</a> Pump brings together all the main features you need in order to find
-content online and enjoy it on your PC and on your Mobile.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://lincetorrent.sourceforge.net/"><img alt="lince.png" class="align-right" src="lince.png" /></a>
-<p><strong>Lince</strong></p>
-<p><a class="reference external" href="http://lincetorrent.sourceforge.net/">Lince</a> is a bittorrent client using libtorrent to handle bittorrent protocol
-and gtkmm for the interface, it has been designed to be a light and full
-featured client.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://electricsheep.org"><img alt="electric_sheep_thumb.jpg" class="align-right" src="electric_sheep_thumb.jpg" /></a>
-<p><strong>electric sheep</strong></p>
-<p><a class="reference external" href="http://electricsheep.org">electric sheep</a> is a screensaver
-which collectively generates
-animations and lets the users
-vote which one to live on.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://getmiro.com"><img alt="miro.jpg" class="align-right" src="miro.jpg" /></a>
-<p><strong>Miro</strong></p>
-<p><a class="reference external" href="http://getmiro.com">Miro</a> is a free application for channels of internet video (also known as
-video podcasts and video rss). Miro is designed to be easy to use and to give
-you an elegant fullscreen viewing experience.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://tvitty.com"><img alt="tvitty.jpg" class="align-right" src="tvitty.jpg" /></a>
-<p><strong>Tvitty</strong></p>
-<p><a class="reference external" href="http://tvitty.com">tvitty</a> is a bittorrent client for Vista Media Center, which allows
-searching and downloading of torrents directly on your TV.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://fatrat.dolezel.info"><img alt="fatrat.png" class="align-right" src="fatrat.png" /></a>
-<p><strong>FatRat</strong></p>
-<p><a class="reference external" href="http://fatrat.dolezel.info">FatRat</a> is an open source download manager for Linux/Unix systems written in
-C++ with the help of the Trolltech Qt 4 library. It's simple to use and
-install.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://leechcraft.org/"><img alt="leechcraft.png" class="align-right" src="leechcraft.png" /></a>
-<p><strong>LeechCraft</strong></p>
-<p><a class="reference external" href="http://leechcraft.org/">LeechCraft</a> LeechCraft is a free open source cross-platform extensible
-software, which primary goal is support of file sharing networks and
-protocols like HTTP and FTP</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://www.moopolice.de"><img alt="moopolice_thumb.gif" class="align-right" src="moopolice_thumb.gif" /></a>
-<p><strong>MooPolice</strong></p>
-<p><a class="reference external" href="http://www.moopolice.de">MooPolice</a> is a windows bittorrent
-client with a quite unique look.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://code.google.com/p/linkage/"><img alt="Linkage.png" class="align-right" src="Linkage.png" /></a>
-<p><strong>Linkage</strong></p>
-<p><a class="reference external" href="http://code.google.com/p/linkage/">Linkage</a> is a gtkmm client that aims to be middle weight.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://www.bitrocket.org/"><img alt="bitrocket_thumb.png" class="align-right" src="bitrocket_thumb.png" /></a>
-<p><strong>BitRocket</strong></p>
-<p><a class="reference external" href="http://www.bitrocket.org/">BitRocket</a> is a MacOS X bittorrent client.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://www.bitscast.com/software/"><img alt="bitscast_thumb.png" class="align-right" src="bitscast_thumb.png" /></a>
-<p><strong>BitsCast</strong></p>
-<p>RSS reader, podcast subscriber,
-video feed downloader, bittorrent
-feed downloader. See <a class="reference external" href="http://www.bitscast.com/software/">BitsCast</a>
-homepage for more info.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://code.google.com/p/bitfox/"><img alt="bitfox.png" class="align-right" src="bitfox.png" /></a>
-<p><strong>Bitfox</strong></p>
-<p><a class="reference external" href="http://code.google.com/p/bitfox/">Bitfox</a> is a firefox plugin integrating bittorrent downloads in firefox.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://bitslug.sourceforge.net/"><img alt="bitslug_thumb.png" class="align-right" src="bitslug_thumb.png" /></a>
-<p><strong>BitSlug</strong></p>
-<p><a class="reference external" href="http://bitslug.sourceforge.net/">BitSlug</a> is a MacOSX cocoa client.</p>
-</div>
-<div class="entry container">
-<a class="reference external image-reference" href="http://www.int64.org/arctic.html"><img alt="arctic_thumb.png" class="align-right" src="arctic_thumb.png" /></a>
-<p><strong>Arctic Torrent</strong></p>
-<p><a class="reference external" href="http://www.int64.org/arctic.html">Arctic Torrent</a> is a light-weight
-bittorrent client for windows.
-Written by Cory Nelson.</p>
-</div>
-<p><strong>hrktorrent</strong></p>
-<p><a class="reference external" href="http://50hz.ws/hrktorrent/">hrktorrent</a> hrktorrent is a light console torrent client written in C++.</p>
-<p><strong>DelCo</strong></p>
-<p><a class="reference external" href="http://delco.cs.tut.fi/">DelCo</a> is a research project at Tampere university of technology, finland.</p>
-<p><strong>FireANT</strong></p>
-<p><a class="reference external" href="http://antisnottv.net/">FireANT</a> is a video blog available
-for Windows and Mac OSX.</p>
 </div>
 </body>
 </html>

docs/projects.rst

@@ -7,457 +7,228 @@ project listed here, let me_ know.
 .. _me: mailto:arvid@rasterbar.com
 
 
-.. container:: entry
+Wyzo
+----
 
-	.. image:: firetorrent.png
+wyzo_ is a media browser with built-in bittorrent support.
-		:align: right
-		:target: firetorrent_
 
-	**firetorrent**
+.. _wyzo: http://www.wyzo.com/
 
-	firetorrent_ is a single click torrent downloader plugin
+deluge
-	for Firefox and Wyzo.
+------
 
-	.. _firetorrent: http://www.fireaddons.com/
+`deluge Torrent`_ is a more full-featured yet still lightweight bittorrent
+client. It has the ability to automatically resume partial downloads and
+background to the system tray.
 
+.. _`deluge Torrent`: http://deluge-torrent.org/
 
-.. container:: entry
+qBittorrent
+-----------
 
-	.. image:: tonidoplug.png
+qBittorrent_ is a QT bittorrent client available for linux (likely portable to
-		:align: right
+most other desktops as well). Written by Christophe Dumez.
-		:target: Tonidoplug_
 
-	**tonidoplug**
+.. _qBittorrent: http://www.qbittorrent.org/
 
-	Tonidoplug_ is a tiny, low-power, low-cost home server and
+tonidoplug
-	NAS device powered by Tonido software that allows you to access
+----------
-	your apps, files, music and media from anywhere.
 
-	.. _Tonidoplug: http://www.tonidoplug.com/
+Tonidoplug_ is a tiny, low-power, low-cost home server and
+NAS device powered by Tonido software that allows you to access
+your apps, files, music and media from anywhere.
 
+.. _Tonidoplug: http://www.tonidoplug.com/
 
-.. container:: entry
+Folx
+----
 
-	.. image:: folx.png
+Folx_ is a torrent client and download manager for Mac OS X.
-		:align: right
+The Free version of Folx has all the basic functionality of the torrent 
-		:target: folx_
+client, which allows users to download and create torrent files.
+Folx PRO (available for a small fee) features the possibility to search 
+for torrent files just from Folx interface. So there is no need to 
+browse through multiple torrent trackers searching for particular file.
 
-	**Folx**
+.. _folx: http://www.mac-downloader.com/
 
-	Folx_ is a torrent client and download manager for Mac OS X.
+Miro
-	The Free version of Folx has all the basic functionality of the torrent 
+----
-	client, which allows users to download and create torrent files.
-	Folx PRO (available for a small fee) features the possibility to search 
-	for torrent files just from Folx interface. So there is no need to 
-	browse through multiple torrent trackers searching for particular file.
 
-	.. _folx: http://www.mac-downloader.com/
+Miro_ is a free application for channels of internet video (also known as
+video podcasts and video rss). Miro is designed to be easy to use and to give
+you an elegant fullscreen viewing experience.
 
+.. _Miro: http://getmiro.com
 
-.. container:: entry
+MooPolice
+---------
 
-	.. image:: qbittorrent_thumb.jpg
+MooPolice_ is a windows bittorrent client with a unique look.
-		:align: right
-		:target: qBittorrent_
 
-	**qBittorrent**
+.. _MooPolice: http://www.moopolice.de
 
-	qBittorrent_ is a QT bittorrent
-	client available for linux (likely
-	portable to most other desktops as
-	well). Written by Christophe Dumez.
 
-	.. _qBittorrent: http://www.qbittorrent.org/
+LeechCraft
+----------
 
+LeechCraft_ LeechCraft is a free open source cross-platform extensible
+software, which primary goal is support of file sharing networks and protocols
+like HTTP and FTP
 
-.. container:: entry
+.. _LeechCraft: http://leechcraft.org/
 
-	.. image:: limewire.png
+Free download manager
-		:align: right
+---------------------
-		:target: Limewire_
 
-	**Limewire**
+FDM_ is a powerful, easy-to-use and absolutely free download accelerator and
+manager. Moreover, FDM is 100% safe, open-source software distributed under
+GPL License.
 
-	LimeWire_ is the world's most popular peer-to-peer file-sharing
+.. _FDM: http://www.freedownloadmanager.org/
-	program. With over 70 million unique monthly users, the software
-	is downloaded hundreds of thousands of times every day and boasts
-	millions of active users at any given moment. LimeWire uses the
-	BitTorrent protocol and the Gnutella network to provide an
-	unparalleled searches and download speed to the user
 
+btg
+---
 
-.. container:: entry
+btg_ is a unix bittorrent client which is run as a daemon. It has multiple user
+interfaces which connects to the daemon. One GUI (Gtkmm), one terminal
+interface (ncurses) and one web interface (accessable through a web browser).
+Written by Michael Wojciechowski and Johan Strom.
 
-	.. image:: deluge.png
+.. _btg: http://btg.berlios.de//
-		:align: right
-		:target: `deluge Torrent`_
 
-	**deluge torrent**
+electric sheep
+--------------
 
-	`deluge Torrent`_ is a more full-featured yet still lightweight bittorrent
+`electric sheep`_ is a screensaver which collectively generates animations and
-	client. It has the ability to automatically resume partial downloads and
+lets the users vote which one to live on.
-	background to the system tray.
 
+.. _`electric sheep`: http://electricsheep.org
 
+Tvitty
+------
 
-.. container:: entry
+tvitty_ is a bittorrent client for Vista Media Center, which allows
+searching and downloading of torrents directly on your TV.
 
-	.. image:: bubba.png
+.. _tvitty: http://tvitty.com
-		:align: right
-		:target: bubba2_
 
-	**bubba**
+hrktorrent
-
+----------
-	Bubba_ is a mini-sized server, designed to fit your home better than
-	an always running PC. Boasting Torrent downloader, DAAP streaming,
-	Web, E-mail, printer and FTP server etc.
-
-	.. _bubba2: http://excito.com/bubba/about-bubba.html
-	.. _Bubba: http://excito.com/bubba/about-bubba.html
-
-
-
-.. container:: entry
-
-	.. image:: btg_thumb.jpg
-		:align: right
-		:target: btg_
-
-	**btg**
-
-	btg_ is a unix bittorrent client
-	which is run as a daemon. It has
-	multiple user interfaces which
-	connects to the daemon. One GUI
-	(Gtkmm), one terminal interface
-	(ncurses) and one web interface
-	(accessable through a web browser).
-	Written by Michael Wojciechowski
-	and Johan Strom.
-
-	.. _btg: http://btg.berlios.de//
-
-
-
-.. container:: entry
-
-	.. image:: tvblob.jpg
-		:align: right
-		:target: BLOBbox_
-
-	**tvblob**
-
-	The BLOBbox_ represents the ability to harness all of the content available
-	on the web, without any filtering or pre-selection by a third party just
-	like surfing the web.
-
-	This means that anyone will have the ability to reach viewers via the Internet
-	directly on TV, without them having to connect a PC.
-
-
-
-.. container:: entry
-
-	.. image:: halite_thumb.png
-		:align: right
-		:target: Halite_
-
-	**halite BitTorrent**
-
-	Halite_ is a windows bittorrent client controllabel via an xml-rpc
-	interface.
-
-
-
-.. container:: entry
-
-	.. image:: fdm.png
-		:align: right
-		:target: FDM_
-
-	**Free download manager**
-
-	FDM_ is a powerful, easy-to-use and absolutely free download accelerator and
-	manager. Moreover, FDM is 100% safe, open-source software distributed under
-	GPL License.
-
-
-
-.. container:: entry
-
-	.. image:: zyxel.png
-		:align: right
-		:target: ZyXEL_
-
-	**ZyXEL NSA-220**
-
-	ZyXEL_ NSA220 makes it easy to store, protect and share files between users
-	on your home network. The built-in DLNA server works with many set top boxes
-	to allow you to play back music, watch video files, or view photos on your
-	home theater system, while the built in download manager can automatically
-	download video and audio podcasts as well as allow you to download bittorrent
-	files without needing to leave your computer on.
-
-	.. _ZyXEL: http://us.zyxel.com/Products/details.aspx?PC1IndexFlag=20050125090459&CategoryGroupNo=758BFE64-3A95-463C-9E1E-3D30E3B58D9C
-
-
-
-.. container:: entry
-
-	.. image:: t2e.jpg
-		:align: right
-		:target: Torrent2Exe_
-
-	**Torrent2Exe**
-
-	Torrent2Exe_ Torrent2exe is a small BitTorrent client. Its basic idea is to
-	let users download a custom-built EXE program with the torrent file
-	integrated into it.
-
-	.. _Torrent2Exe: http://torrent2exe.com
-
-
-
-.. container:: entry
-
-	.. image:: flush.jpg
-		:align: right
-		:target: Flush_
-
-	**Flush**
-
-	Flush_ is a GTK-based BitTorrent client.
-
-	.. _Flush: https://sourceforge.net/projects/flush/
-
-
-
-.. container:: entry
-
-	.. image:: pump.png
-		:align: right
-		:target: Pump_
-
-	**Pump**
-
-	Pump_ Pump brings together all the main features you need in order to find
-	content online and enjoy it on your PC and on your Mobile.
-
-	.. _Pump: http://pump.vipeers.com/
-
-
-.. container:: entry
-
-	.. image:: lince.png
-		:align: right
-		:target: Lince_
-
-	**Lince**
-
-	Lince_ is a bittorrent client using libtorrent to handle bittorrent protocol
-	and gtkmm for the interface, it has been designed to be a light and full
-	featured client.
-
-	.. _Lince: http://lincetorrent.sourceforge.net/
-
-
-
-.. container:: entry
-
-	.. image:: electric_sheep_thumb.jpg
-		:align: right
-		:target: `electric sheep`_
-
-	**electric sheep**
-
-	`electric sheep`_ is a screensaver
-	which collectively generates
-	animations and lets the users
-	vote which one to live on.
-
-	.. _`electric sheep`: http://electricsheep.org
-
-
-
-.. container:: entry
-
-	.. image:: miro.jpg
-		:align: right
-		:target: Miro_
-
-	**Miro**
-
-	Miro_ is a free application for channels of internet video (also known as
-	video podcasts and video rss). Miro is designed to be easy to use and to give
-	you an elegant fullscreen viewing experience.
-
-	.. _Miro: http://getmiro.com
-
-
-.. container:: entry
-
-	.. image:: tvitty.jpg
-		:align: right
-		:target: tvitty_
-
-	**Tvitty**
-
-	tvitty_ is a bittorrent client for Vista Media Center, which allows
-	searching and downloading of torrents directly on your TV.
-
-	.. _tvitty: http://tvitty.com
-
-
-.. container:: entry
-
-	.. image:: fatrat.png
-		:align: right
-		:target: FatRat_
-
-	**FatRat**
-
-	FatRat_ is an open source download manager for Linux/Unix systems written in
-	C++ with the help of the Trolltech Qt 4 library. It's simple to use and
-	install.
-
-
-
-.. container:: entry
-
-	.. image:: leechcraft.png
-		:align: right
-		:target: LeechCraft_
-
-	**LeechCraft**
-
-	LeechCraft_ LeechCraft is a free open source cross-platform extensible
-	software, which primary goal is support of file sharing networks and
-	protocols like HTTP and FTP
-
-
-
-.. container:: entry
-
-	.. image:: moopolice_thumb.gif
-		:align: right
-		:target: MooPolice_
-
-	**MooPolice**
-
-	MooPolice_ is a windows bittorrent
-	client with a quite unique look.
-
-	.. _MooPolice: http://www.moopolice.de
-
-
-
-.. container:: entry
-
-	.. image:: Linkage.png
-		:align: right
-		:target: Linkage_
-
-	**Linkage**
-
-	Linkage_ is a gtkmm client that aims to be middle weight.
-
-	.. _Linkage: http://code.google.com/p/linkage/
-
-
-
-.. container:: entry
-
-	.. image:: bitrocket_thumb.png
-		:align: right
-		:target: BitRocket_
-
-	**BitRocket**
-
-	BitRocket_ is a MacOS X bittorrent client.
-
-
-
-.. container:: entry
-
-	.. image:: bitscast_thumb.png
-		:align: right
-		:target: BitsCast_
-
-	**BitsCast**
-
-	RSS reader, podcast subscriber,
-	video feed downloader, bittorrent
-	feed downloader. See BitsCast_
-	homepage for more info.
-
-
-
-.. container:: entry
-
-	.. image:: bitfox.png
-		:align: right
-		:target: BitFox_
-
-	**Bitfox**
-
-	Bitfox_ is a firefox plugin integrating bittorrent downloads in firefox.
-
-	.. _Bitfox: http://code.google.com/p/bitfox/
-
-
-.. container:: entry
-
-	.. image:: bitslug_thumb.png
-		:align: right
-		:target: BitSlug_
-
-	**BitSlug**
-
-	BitSlug_ is a MacOSX cocoa client.
-
-
-
-.. container:: entry
-
-	.. image:: arctic_thumb.png
-		:align: right
-		:target: `Arctic Torrent`_
-
-	**Arctic Torrent**
-
-	`Arctic Torrent`_ is a light-weight
-	bittorrent client for windows.
-	Written by Cory Nelson.
-
-.. _`Arctic Torrent`: http://www.int64.org/arctic.html
-
-
-**hrktorrent**
 
 hrktorrent_ hrktorrent is a light console torrent client written in C++.
 
 .. _hrktorrent: http://50hz.ws/hrktorrent/
 
-**DelCo**
+FatRat
+------
+
+FatRat_ is an open source download manager for Linux/Unix systems written in
+C++ with the help of the Trolltech Qt 4 library. It's simple to use and
+install.
+
+.. _FatRat: http://fatrat.dolezel.info
+
+halite BitTorrent
+-----------------
+
+Halite_ is a windows bittorrent client controllabel via an xml-rpc
+interface.
+
+.. _Halite: http://www.binarynotions.com/halite-bittorrent-client
+
+Arctic Torrent
+--------------
+
+`Arctic Torrent`_ is a light-weight
+bittorrent client for windows.
+Written by Cory Nelson.
+
+.. _`Arctic Torrent`: http://www.int64.org/arctic.html
+
+bubba
+-----
+
+Bubba_ is a mini-sized server, designed to fit your home better than
+an always running PC. Boasting Torrent downloader, DAAP streaming,
+Web, E-mail, printer and FTP server etc.
+
+.. _Bubba: http://excito.com/bubba/about-bubba.html
+
+tvblob
+------
+
+The BLOBbox_ represents the ability to harness all of the content available
+on the web, without any filtering or pre-selection by a third party just
+like surfing the web.
+
+This means that anyone will have the ability to reach viewers via the Internet
+directly on TV, without them having to connect a PC.
+
+.. _BLOBbox: http://www.tvblob.com
+
+Flush
+-----
+
+Flush_ is a GTK-based BitTorrent client.
+
+.. _Flush: https://sourceforge.net/projects/flush/
+
+Lince
+-----
+
+Lince_ is a bittorrent client using libtorrent to handle bittorrent protocol
+and gtkmm for the interface, it has been designed to be a light and full
+featured client.
+
+.. _Lince: http://lincetorrent.sourceforge.net/
+
+Linkage
+-------
+
+Linkage_ is a gtkmm client that aims to be middle weight.
+
+.. _Linkage: http://code.google.com/p/linkage/
+
+Bitfox
+------
+
+Bitfox_ is a firefox plugin integrating bittorrent downloads in firefox.
+
+.. _Bitfox: http://code.google.com/p/bitfox/
+
+BitSlug
+-------
+
+BitSlug_ is a MacOSX cocoa client.
+
+.. _BitSlug: http://bitslug.sourceforge.net/
+
+DelCo
+-----
 
 DelCo_ is a research project at Tampere university of technology, finland.
 
-**FireANT**
-
-FireANT_ is a video blog available
-for Windows and Mac OSX.
-
-.. _FireANT: http://antisnottv.net/
-
-.. _FDM: http://www.freedownloadmanager.org/
-.. _LeechCraft: http://leechcraft.org/
-.. _FatRat: http://fatrat.dolezel.info
-.. _BitRocket: http://www.bitrocket.org/
-.. _BitsCast: http://www.bitscast.com/software/
-.. _BitSlug: http://bitslug.sourceforge.net/
-.. _`deluge Torrent`: http://deluge-torrent.org/
-.. _Limewire: http://www.limewire.com/
-.. _BLOBbox: http://www.tvblob.com
-.. _Halite: http://www.binarynotions.com/halite-bittorrent-client
 .. _DelCo: http://delco.cs.tut.fi/
 
+Torrent2Exe
+-----------
+
+Torrent2Exe_ Torrent2exe is a small BitTorrent client. Its basic idea is to
+let users download a custom-built EXE program with the torrent file
+integrated into it.
+
+.. _Torrent2Exe: http://torrent2exe.com
+
+ZyXEL NSA-220
+-------------
+
+ZyXEL_ NSA220 makes it easy to store, protect and share files between users
+on your home network. The built-in DLNA server works with many set top boxes
+to allow you to play back music, watch video files, or view photos on your
+home theater system, while the built in download manager can automatically
+download video and audio podcasts as well as allow you to download bittorrent
+files without needing to leave your computer on.
+
+.. _ZyXEL: http://us.zyxel.com/Products/details.aspx?PC1IndexFlag=20050125090459&CategoryGroupNo=758BFE64-3A95-463C-9E1E-3D30E3B58D9C
+

docs/reference-Session.html

@@ -55,15 +55,15 @@
 <div class="contents topic" id="table-of-contents">
 <p class="topic-title first">Table of contents</p>
 <ul class="simple">
-<li><a class="reference internal" href="#add-torrent-params" id="id179">add_torrent_params</a></li>
+<li><a class="reference internal" href="#add-torrent-params" id="id175">add_torrent_params</a></li>
-<li><a class="reference internal" href="#cache-status" id="id180">cache_status</a></li>
+<li><a class="reference internal" href="#cache-status" id="id176">cache_status</a></li>
-<li><a class="reference internal" href="#stats-metric" id="id181">stats_metric</a></li>
+<li><a class="reference internal" href="#stats-metric" id="id177">stats_metric</a></li>
-<li><a class="reference internal" href="#session-proxy" id="id182">session_proxy</a></li>
+<li><a class="reference internal" href="#session-proxy" id="id178">session_proxy</a></li>
-<li><a class="reference internal" href="#id40" id="id183">session</a></li>
+<li><a class="reference internal" href="#id38" id="id179">session</a></li>
-<li><a class="reference internal" href="#dht-lookup" id="id184">dht_lookup</a></li>
+<li><a class="reference internal" href="#dht-lookup" id="id180">dht_lookup</a></li>
-<li><a class="reference internal" href="#dht-routing-bucket" id="id185">dht_routing_bucket</a></li>
+<li><a class="reference internal" href="#dht-routing-bucket" id="id181">dht_routing_bucket</a></li>
-<li><a class="reference internal" href="#utp-status" id="id186">utp_status</a></li>
+<li><a class="reference internal" href="#utp-status" id="id182">utp_status</a></li>
-<li><a class="reference internal" href="#session-status" id="id187">session_status</a></li>
+<li><a class="reference internal" href="#session-status" id="id183">session_status</a></li>
 </ul>
 </div>
 <a name="add_torrent_params"></a><div class="section" id="add-torrent-params">
@@ -446,11 +446,6 @@ struct cache_status
    <strong>cache_status</strong> ();
 
    std::vector&lt;cached_piece_info&gt; pieces;
-   atomic_count blocks_written;
-   atomic_count writes;
-   atomic_count blocks_read;
-   size_type blocks_read_hit;
-   atomic_count reads;
    int write_cache_size;
    int read_cache_size;
    int pinned_blocks;
@@ -459,10 +454,10 @@ struct cache_status
    int average_write_time;
    int average_hash_time;
    int average_job_time;
-   atomic_count cumulative_job_time;
+   int cumulative_job_time;
-   atomic_count cumulative_read_time;
+   int cumulative_read_time;
-   atomic_count cumulative_write_time;
+   int cumulative_write_time;
-   atomic_count cumulative_hash_time;
+   int cumulative_hash_time;
    int total_read_back;
    int read_queue_size;
    int blocked_jobs;
@@ -488,36 +483,6 @@ struct cache_status
 <strong>cache_status</strong> ();
 </pre>
 <p>initializes all counters to 0</p>
-<a name="blocks_written"></a><dl class="docutils">
-<dt>blocks_written</dt>
-<dd>the total number of 16 KiB blocks written to disk
-since this <a class="reference external" href="reference-Session.html#session">session</a> was started.</dd>
-</dl>
-<a name="writes"></a><dl class="docutils">
-<dt>writes</dt>
-<dd><p class="first">the total number of write operations performed since this
-<a class="reference external" href="reference-Session.html#session">session</a> was started.</p>
-<p class="last">The ratio (<tt class="docutils literal">blocks_written</tt> - <tt class="docutils literal">writes</tt>) / <tt class="docutils literal">blocks_written</tt> represents
-the number of saved write operations per total write operations. i.e. a kind
-of cache hit ratio for the write cahe.</p>
-</dd>
-</dl>
-<a name="blocks_read"></a><dl class="docutils">
-<dt>blocks_read</dt>
-<dd>the number of blocks that were requested from the
-bittorrent engine (from peers), that were served from disk or cache.</dd>
-</dl>
-<a name="blocks_read_hit"></a><dl class="docutils">
-<dt>blocks_read_hit</dt>
-<dd><p class="first">the number of blocks that was just copied from the read cache</p>
-<p class="last">The ratio <tt class="docutils literal">blocks_read_hit</tt> / <tt class="docutils literal">blocks_read</tt> is the cache hit ratio
-for the read cache.</p>
-</dd>
-</dl>
-<a name="reads"></a><dl class="docutils">
-<dt>reads</dt>
-<dd>the number of read operations used</dd>
-</dl>
 <a name="write_cache_size"></a><dl class="docutils">
 <dt>write_cache_size</dt>
 <dd>the number of blocks in the cache used for write cache</dd>
@@ -657,7 +622,7 @@ class session_proxy
    <strong>session_proxy</strong> ();
 };
 </pre>
-<a name="session_proxy()"></a><div class="section" id="id38">
+<a name="session_proxy()"></a><div class="section" id="id36">
 <h2>session_proxy()</h2>
 <pre class="literal-block">
 <strong>session_proxy</strong> ();
@@ -666,7 +631,7 @@ class session_proxy
 implementation object.</p>
 <a name="session"></a></div>
 </div>
-<div class="section" id="id40">
+<div class="section" id="id38">
 <h1>session</h1>
 <p>Declared in &quot;<a class="reference external" href="../include/libtorrent/session.hpp">libtorrent/session.hpp</a>&quot;</p>
 <p>The <a class="reference external" href="reference-Session.html#session">session</a> holds all state that spans multiple torrents. Among other
@@ -792,7 +757,7 @@ class session: public boost::noncopyable
    };
 };
 </pre>
-<a name="session()"></a><div class="section" id="id47">
+<a name="session()"></a><div class="section" id="id45">
 <h2>session()</h2>
 <pre class="literal-block">
 <strong>session</strong> (fingerprint const&amp; print = fingerprint(&quot;LT&quot;
@@ -814,7 +779,7 @@ class session: public boost::noncopyable
 <p>TODO: 3 could the fingerprint be a setting as well? And should the
 <a class="reference external" href="reference-Settings.html#settings_pack">settings_pack</a> be optional?</p>
 <a name="~session()"></a></div>
-<div class="section" id="id49">
+<div class="section" id="id47">
 <h2>~session()</h2>
 <pre class="literal-block">
 <strong>~session</strong> ();
@@ -1094,7 +1059,7 @@ void <strong>dht_get_item</strong> (sha1_hash const&amp; target);
 <p>query the DHT for an immutable item at the <tt class="docutils literal">target</tt> hash.
 the result is posted as a <a class="reference external" href="reference-Alerts.html#dht_immutable_item_alert">dht_immutable_item_alert</a>.</p>
 <a name="dht_get_item()"></a></div>
-<div class="section" id="id106">
+<div class="section" id="id104">
 <h2>dht_get_item()</h2>
 <pre class="literal-block">
 void <strong>dht_get_item</strong> (boost::array&lt;char, 32&gt; key
@@ -1116,7 +1081,7 @@ the returned hash is the key that is to be used to look the item
 up agan. It's just the sha-1 hash of the bencoded form of the
 structure.</p>
 <a name="dht_put_item()"></a></div>
-<div class="section" id="id108">
+<div class="section" id="id106">
 <h2>dht_put_item()</h2>
 <pre class="literal-block">
 void <strong>dht_put_item</strong> (boost::array&lt;char, 32&gt; key
@@ -1975,13 +1940,11 @@ connected peers, just peers we know of.</dd>
 <h2>find_metric_idx()</h2>
 <p>Declared in &quot;<a class="reference external" href="../include/libtorrent/session.hpp">libtorrent/session.hpp</a>&quot;</p>
 <pre class="literal-block">
-int <strong>find_metric_idx</strong> (std::vector&lt;stats_metric&gt; const&amp; metrics
+int <strong>find_metric_idx</strong> (char const* name);
-   , char const* name);
 </pre>
-<p>given a vector if <a class="reference external" href="reference-Session.html#stats_metric">stats_metric</a> objects (as returned by
+<p>given a name of a metric, this function returns the counter index of it,
-<a class="reference external" href="reference-Session.html#session_stats_metrics()">session_stats_metrics()</a>) and a name of a metric, this function returns
+or -1 if it could not be found. The counter index is the index into the
-the counter index of it, or -1 if it could not be found. The counter
+values array returned by <a class="reference external" href="reference-Alerts.html#session_stats_alert">session_stats_alert</a>.</p>
-index is the index into the values array returned by <a class="reference external" href="reference-Alerts.html#session_stats_alert">session_stats_alert</a>.</p>
 <a name="session_stats_metrics()"></a></div>
 <div class="section" id="session-stats-metrics">
 <h2>session_stats_metrics()</h2>

docs/stats_counters.rst

@@ -16,9 +16,6 @@
 +-------------------------+---------+
 
 
-TODO: 3 the type of counter does not need to be stored in this array.
-when the user asks for the list of counters, that field could be
-generated based on the range of the counter index.
 ``error_peers`` is the total number of peer disconnects
 caused by an error (not initiated by this client) and
 disconnected initiated by this client (``disconnected_peers``).
@@ -1069,16 +1066,6 @@ peer until we're sending the response back on the socket.
 
 .. _disk.arc_volatile_size:
 
-.. _disk.num_blocks_written:
-
-.. _disk.num_blocks_read:
-
-.. _disk.num_blocks_cache_hits:
-
-.. _disk.num_write_ops:
-
-.. _disk.num_read_ops:
-
 .. raw:: html
 
 	<a name="disk.queued_write_bytes"></a>
@@ -1088,39 +1075,24 @@ peer until we're sending the response back on the socket.
 	<a name="disk.arc_mfu_ghost_size"></a>
 	<a name="disk.arc_write_size"></a>
 	<a name="disk.arc_volatile_size"></a>
-	<a name="disk.num_blocks_written"></a>
-	<a name="disk.num_blocks_read"></a>
-	<a name="disk.num_blocks_cache_hits"></a>
-	<a name="disk.num_write_ops"></a>
-	<a name="disk.num_read_ops"></a>
 
-+----------------------------+---------+
++-------------------------+-------+
-| name                       | type    |
+| name                    | type  |
-+============================+=========+
++=========================+=======+
-| disk.queued_write_bytes    | gauge   |
+| disk.queued_write_bytes | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.arc_mru_size          | gauge   |
+| disk.arc_mru_size       | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.arc_mru_ghost_size    | gauge   |
+| disk.arc_mru_ghost_size | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.arc_mfu_size          | gauge   |
+| disk.arc_mfu_size       | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.arc_mfu_ghost_size    | gauge   |
+| disk.arc_mfu_ghost_size | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.arc_write_size        | gauge   |
+| disk.arc_write_size     | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.arc_volatile_size     | gauge   |
+| disk.arc_volatile_size  | gauge |
-+----------------------------+---------+
++-------------------------+-------+
-| disk.num_blocks_written    | counter |
-+----------------------------+---------+
-| disk.num_blocks_read       | counter |
-+----------------------------+---------+
-| disk.num_blocks_cache_hits | counter |
-+----------------------------+---------+
-| disk.num_write_ops         | counter |
-+----------------------------+---------+
-| disk.num_read_ops          | counter |
-+----------------------------+---------+
 
 
 the number of bytes we have sent to the disk I/O
@@ -1130,6 +1102,94 @@ is updated to the number of bytes the disk I/O thread
 is actually waiting for to be written (as opposed to
 bytes just hanging out in the cache)
 
+.. _disk.num_blocks_written:
+
+.. _disk.num_blocks_read:
+
+.. raw:: html
+
+	<a name="disk.num_blocks_written"></a>
+	<a name="disk.num_blocks_read"></a>
+
++-------------------------+---------+
+| name                    | type    |
++=========================+=========+
+| disk.num_blocks_written | counter |
++-------------------------+---------+
+| disk.num_blocks_read    | counter |
++-------------------------+---------+
+
+
+the number of blocks written and read from disk in total. A block is
+16 kiB.
+
+.. _disk.num_blocks_hashed:
+
+.. raw:: html
+
+	<a name="disk.num_blocks_hashed"></a>
+
++------------------------+---------+
+| name                   | type    |
++========================+=========+
+| disk.num_blocks_hashed | counter |
++------------------------+---------+
+
+
+the total number of blocks run through SHA-1 hashing
+
+.. _disk.num_blocks_cache_hits:
+
+.. raw:: html
+
+	<a name="disk.num_blocks_cache_hits"></a>
+
++----------------------------+---------+
+| name                       | type    |
++============================+=========+
+| disk.num_blocks_cache_hits | counter |
++----------------------------+---------+
+
+
+the number of blocks read from the disk cache
+
+.. _disk.num_write_ops:
+
+.. _disk.num_read_ops:
+
+.. raw:: html
+
+	<a name="disk.num_write_ops"></a>
+	<a name="disk.num_read_ops"></a>
+
++--------------------+---------+
+| name               | type    |
++====================+=========+
+| disk.num_write_ops | counter |
++--------------------+---------+
+| disk.num_read_ops  | counter |
++--------------------+---------+
+
+
+the number of disk I/O operation for reads and writes. One disk
+operation may transfer more then one block.
+
+.. _disk.num_read_back:
+
+.. raw:: html
+
+	<a name="disk.num_read_back"></a>
+
++--------------------+---------+
+| name               | type    |
++====================+=========+
+| disk.num_read_back | counter |
++--------------------+---------+
+
+
+the number of blocks that had to be read back from disk in order to
+hash a piece (when verifying against the piece hash)
+
 .. _disk.disk_read_time:
 
 .. _disk.disk_write_time: