Changeset eee70fba in trunk

Timestamp:

2010-08-04T07:08:15Z (15 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

6c2a4f0

Parents:

ebfde4f

Message:

storage-overhead: try to fix, probably still broken

File:

• misc/simulators/storage-overhead.py (modified) (2 diffs)

misc/simulators/storage-overhead.py ¶

@@ -2 +2 @@
 
 import sys, math
-from allmydata import upload, uri, encode, storage
+from allmydata import uri, storage
+from allmydata.immutable import upload
+from allmydata.interfaces import DEFAULT_MAX_SEGMENT_SIZE
 from allmydata.util import mathutil
 
@@ -23 +25 @@
         return self.fp
 
-def calc(filesize, params=(3,7,10), segsize=encode.Encoder.MAX_SEGMENT_SIZE):
+def calc(filesize, params=(3,7,10), segsize=DEFAULT_MAX_SEGMENT_SIZE):
     num_shares = params[2]
     if filesize <= upload.Uploader.URI_LIT_SIZE_THRESHOLD:
-        urisize = len(uri.pack_lit("A"*filesize))
+        urisize = len(uri.LiteralFileURI("A"*filesize).to_string())
         sharesize = 0
         sharespace = 0
     else:
-        u = upload.FileUploader(None)
+        u = upload.FileUploader(None) # XXX changed
         u.set_params(params)
         # unfortunately, Encoder doesn't currently lend itself to answering