a few documentation and naming convention updates

Notable: the argument to make REPORTER has been renamed to TRIALARGS.

diff --git a/Makefile b/Makefile
index 0b76fefc4191f81887b4be0f052ac1e29a876aa3..7bf9425715e19ea7341aff9b7d126095ad7f900a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -159,12 +159,12 @@ check-pyopenssl-dep:
 # too.
 TEST=allmydata
 
-# use 'make test REPORTER=--reporter=bwverbose' from buildbot, to
+# use 'make test TRIALARGS=--reporter=bwverbose' from buildbot, to
 # suppress the ansi color sequences
 
 test: .built .checked-deps
        $(PP) \
-        $(TRIAL) $(REPORTER) $(TEST)
+        $(TRIAL) $(TRIALARGS) $(TEST)
 
 test-figleaf: .built .checked-deps
        rm -f .figleaf

diff --git a/misc/simulator.py b/misc/simulator.py
index 36133b66fe9d64924df096c6de935b9e9c986159..adf674ded239aec839d8270fa79dee2842b0cd5d 100644 (file)
--- a/misc/simulator.py
+++ b/misc/simulator.py
@@ -114,7 +114,7 @@ class Node:
         self.introducer.delete(fileid)
         return True
 
-class IntroducerAndVdrive:
+class Introducer:
     def __init__(self, simulator):
         self.living_files = {}
         self.utilization = 0 # total size of all active files
@@ -169,7 +169,7 @@ class Simulator:
         self.rrd = RRD("/tmp/utilization.rrd", ds=[ds], rra=[rra], start=self.time)
         self.rrd.create()
 
-        self.introducer = q = IntroducerAndVdrive(self)
+        self.introducer = q = Introducer(self)
         self.all_nodes = [Node(randomid(), q, self)
                           for i in range(self.NUM_NODES)]
         q.all_nodes = self.all_nodes

diff --git a/src/allmydata/encode.py b/src/allmydata/encode.py
index 7328e238001267cbdc6f36c6fb1fabcea371c67a..1aeb93c41e0c96d7d6d7f7c172668c909b03739f 100644 (file)
--- a/src/allmydata/encode.py
+++ b/src/allmydata/encode.py
@@ -17,16 +17,16 @@ The goal of the encoder is to turn the original file into a series of
 is a different host, but for small grids there may be overlap). The number
 of shares is chosen to hit our reliability goals (more shares on more
 machines means more reliability), and is limited by overhead (proportional to
-numshares or log(numshares)) and the encoding technology in use (Reed-Solomon
-only permits 256 shares total). It is also constrained by the amount of data
+numshares or log(numshares)) and the encoding technology in use (zfec permits
+only 256 shares total). It is also constrained by the amount of data
 we want to send to each host. For estimating purposes, think of 10 shares
 out of which we need 3 to reconstruct the file.
 
 The encoder starts by cutting the original file into segments. All segments
 except the last are of equal size. The segment size is chosen to constrain
 the memory footprint (which will probably vary between 1x and 4x segment
-size) and to constrain the overhead (which will be proportional to either the
-number of segments or log(number of segments)).
+size) and to constrain the overhead (which will be proportional to
+log(number of segments)).
 
 
 Each segment (A,B,C) is read into memory, encrypted, and encoded into

diff --git a/src/allmydata/test/test_web.py b/src/allmydata/test/test_web.py
index 974ac69b722310d4f6233529505422dcad045477..8249e10105af5d12fd5e6720cbeedc0309b7da69 100644 (file)
--- a/src/allmydata/test/test_web.py
+++ b/src/allmydata/test/test_web.py
@@ -1,4 +1,3 @@
-
 import re, os.path, urllib
 import simplejson
 from twisted.application import service

diff --git a/src/allmydata/util/iputil.py b/src/allmydata/util/iputil.py
index 4024eddf0d595e076450e1ec3b4badaf57fcc4f0..f5e245d060cd9c58b32a52b924c1ba10c3569fe8 100644 (file)
--- a/src/allmydata/util/iputil.py
+++ b/src/allmydata/util/iputil.py
@@ -39,7 +39,7 @@ try:
         try:
             current = resource.getrlimit(resource.RLIMIT_NOFILE)
         except AttributeError:
-            # we're probably missing RLIMIT_NOFILE, maybe this is windows
+            # we're probably missing RLIMIT_NOFILE
             return
 
         if current[0] >= 1024: