ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rewrite immutable downloader (#798). This patch includes higher-level

Browse Source 
integration into the NodeMaker, and updates the web-status display to handle
the new download events.
This commit is contained in:
Brian Warner
2010-08-04 00:27:02 -07:00
parent 797828f47f
commit 7b7b0c9709
6 changed files with 183 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/allmydata/client.py
View File

@ -1,9 +1,10 @@
import os, stat, time
import os, stat, time, weakref
from allmydata.interfaces import RIStorageServer
from allmydata import node
from zope.interface import implements
from twisted.internet import reactor, defer
from twisted.application import service
from twisted.application.internet import TimerService
from foolscap.api import Referenceable
from pycryptopp.publickey import rsa
@ -12,11 +13,10 @@ import allmydata
from allmydata.storage.server import StorageServer
from allmydata import storage_client
from allmydata.immutable.upload import Uploader
from allmydata.immutable.download import Downloader
from allmydata.immutable.offloaded import Helper
from allmydata.control import ControlServer
from allmydata.introducer.client import IntroducerClient
from allmydata.util import hashutil, base32, pollmixin, cachedir, log
from allmydata.util import hashutil, base32, pollmixin, log
from allmydata.util.encodingutil import get_filesystem_encoding
from allmydata.util.abbreviate import parse_abbreviated_size
from allmydata.util.time_format import parse_duration, parse_date
@ -95,6 +95,16 @@ class KeyGenerator:
verifier = signer.get_verifying_key()
return defer.succeed( (verifier, signer) )
class Terminator(service.Service):
def __init__(self):
self._clients = weakref.WeakKeyDictionary()
def register(self, c):
self._clients[c] = None
def stopService(self):
for c in self._clients:
c.stop()
return service.Service.stopService(self)
class Client(node.Node, pollmixin.PollMixin):
implements(IStatsProducer)
@ -279,12 +289,9 @@ class Client(node.Node, pollmixin.PollMixin):
self.init_client_storage_broker()
self.history = History(self.stats_provider)
self.terminator = Terminator()
self.terminator.setServiceParent(self)
self.add_service(Uploader(helper_furl, self.stats_provider))
download_cachedir = os.path.join(self.basedir,
"private", "cache", "download")
self.download_cache_dirman = cachedir.CacheDirectoryManager(download_cachedir)
self.download_cache_dirman.setServiceParent(self)
self.downloader = Downloader(self.storage_broker, self.stats_provider)
self.init_stub_client()
self.init_nodemaker()
@ -343,8 +350,7 @@ class Client(node.Node, pollmixin.PollMixin):
self._secret_holder,
self.get_history(),
self.getServiceNamed("uploader"),
self.downloader,
self.download_cache_dirman,
self.terminator,
self.get_encoding_parameters(),
self._key_generator)