Commit 554500a0 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 5db40e09
...@@ -539,11 +539,11 @@ type BigFile struct { ...@@ -539,11 +539,11 @@ type BigFile struct {
size int64 // zfile.Size() size int64 // zfile.Size()
rev zodb.Tid // last revision that modified zfile data rev zodb.Tid // last revision that modified zfile data
// tail change history of this file. // // tail change history of this file.
// // //
// XXX computationally expensive to start - see "Invalidations to wcfs // // XXX computationally expensive to start - see "Invalidations to wcfs
// clients are delayed ..." in notes.txt // // clients are delayed ..." in notes.txt
δtail *ΔTailI64 // [](rev↑, []#blk) // δtail *ΔTailI64 // [](rev↑, []#blk)
// inflight loadings of ZBigFile from ZODB. // inflight loadings of ZBigFile from ZODB.
// successful load results are kept here until blkdata is put into OS pagecache. // successful load results are kept here until blkdata is put into OS pagecache.
...@@ -823,9 +823,9 @@ retry: ...@@ -823,9 +823,9 @@ retry:
wg, ctx := errgroup.WithContext(context.TODO()) // XXX ctx = ? wg, ctx := errgroup.WithContext(context.TODO()) // XXX ctx = ?
for file, δfile := range δF.ByFile { for file, δfile := range δF.ByFile {
// XXX needed? // // XXX needed?
// XXX even though δBtail is complete, not all ZBlk are present here // // XXX even though δBtail is complete, not all ZBlk are present here
file.δtail.Append(δF.Rev, δfile.Blocks.Elements()) // file.δtail.Append(δF.Rev, δfile.Blocks.Elements())
file := file file := file
for blk := range δfile.Blocks { for blk := range δfile.Blocks {
...@@ -1772,7 +1772,7 @@ func (head *Head) bigopen(ctx context.Context, oid zodb.Oid) (_ *BigFile, err er ...@@ -1772,7 +1772,7 @@ func (head *Head) bigopen(ctx context.Context, oid zodb.Oid) (_ *BigFile, err er
head.bfdir.δFtail.Track(f, -1, sizePath, nil) head.bfdir.δFtail.Track(f, -1, sizePath, nil)
head.bfdir.δFmu.Unlock() head.bfdir.δFmu.Unlock()
f.δtail = NewΔTailI64(zconn.At()) // f.δtail = NewΔTailI64(zconn.At())
} }
return f, nil return f, nil
......
...@@ -382,7 +382,7 @@ class tWatch: ...@@ -382,7 +382,7 @@ class tWatch:
t._acceptq = chan() # (stream, msg) server originated messages go here t._acceptq = chan() # (stream, msg) server originated messages go here
t._rxmu = threading.Lock() t._rxmu = threading.Lock()
t._rxtab = {} # stream -> rxq server replies go via here t._rxtab = {} # stream -> rxq server replies go via here
t._accepted = set() # of stream streams we accpted but did not replied yet t._accepted = set() # of stream streams we accepted but did not replied yet
t._txmu = threading.Lock() # serializes writes t._txmu = threading.Lock() # serializes writes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment