.

go/neo/t/zsha1.go

@@ -103,9 +103,10 @@ func zsha1(ctx context.Context, url string, useprefetch bool) (err error) {
 	}
 	before := lastTid + 1	// XXX overflow ?
 
-	if true {
+	if false {
 		//defer profile.Start(profile.TraceProfile).Stop()
-		defer profile.Start().Stop()
+		//defer profile.Start(profile.MemProfile).Stop()
+		defer profile.Start(profile.CPUProfile).Stop()
 	}
 
 for qqq := 0; qqq < 10; qqq++ {
@@ -142,7 +143,7 @@ loop:
 			return err
 		}
 
-		m.Write(data)
+		//m.Write(data)
 
 		//fmt.Fprintf(os.Stderr, "%d @%s\tsha1: %x\n", uint(oid), serial, m.Sum(nil))
 		//fmt.Fprintf(os.Stderr, "\tdata: %x\n", data)

go/zodb/storage/fs1/filestorage.go

@@ -68,6 +68,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"sync"
 
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	"lab.nexedi.com/kirr/neo/go/xcommon/xbufio"
@@ -224,6 +225,19 @@ func (e *ErrXidLoad) Error() string {
 	return fmt.Sprintf("loading %v: %v", e.Xid, e.Err)
 }
 
+// freelist(DataHeader)
+var dhPool = sync.Pool{New: func() interface{} { return &DataHeader{} }}
+
+// DataHeaderAlloc allocates DataHeader from freelist.
+func DataHeaderAlloc() *DataHeader {
+	return dhPool.Get().(*DataHeader)
+}
+
+// Free puts dh back into DataHeader freelist.
+func (dh *DataHeader) Free() {
+	dhPool.Put(dh)
+}
+
 func (fs *FileStorage) Load(_ context.Context, xid zodb.Xid) (data []byte, tid zodb.Tid, err error) {
 	// lookup in index position of oid data record within latest transaction who changed this oid
 	dataPos, ok := fs.index.Get(xid.Oid)
@@ -232,7 +246,14 @@ func (fs *FileStorage) Load(_ context.Context, xid zodb.Xid) (data []byte, tid z
 	}
 
 	// FIXME zodb.TidMax is only 7fff... tid from outside can be ffff...
-	dh := DataHeader{Oid: xid.Oid, Tid: zodb.TidMax, PrevRevPos: dataPos}
+	// XXX go compiler cannot deduce dh should be on stack here
+	//dh := DataHeader{Oid: xid.Oid, Tid: zodb.TidMax, PrevRevPos: dataPos}
+	dh := DataHeaderAlloc()
+	dh.Oid = xid.Oid
+	dh.Tid = zodb.TidMax
+	dh.PrevRevPos = dataPos
+	defer dh.Free()
+
 	tidBefore := xid.XTid.Tid
 	if !xid.XTid.TidBefore {
 		tidBefore++	// XXX recheck this is ok wrt overflow

go/zodb/storage/fs1/format.go

@@ -401,6 +401,7 @@ func (txnh *TxnHeader) LoadPrev(r io.ReaderAt, flags TxnLoadFlags) error {
 }
 
 // LoadNext reads and decodes next transaction record header.
+//
 // prerequisite: txnh .Pos and .Len should be already initialized by:	XXX also .Tid
 //   - previous successful call to Load() initially		XXX ^^^
 //   - TODO
@@ -512,6 +513,7 @@ func (dh *DataHeader) Load(r io.ReaderAt, pos int64) error {
 }
 
 // LoadPrevRev reads and decodes previous revision data record header.
+//
 // prerequisite: dh .Oid .Tid .PrevRevPos are initialized:
 //   - TODO describe how
 // when there is no previous revision: io.EOF is returned
@@ -553,6 +555,7 @@ func (dh *DataHeader) loadPrevRev(r io.ReaderAt) error {
 }
 
 // LoadBackRef reads data for the data record and decodes it as backpointer reference.
+//
 // prerequisite: dh loaded and .LenData == 0 (data record with back-pointer)
 // XXX return backPos=-1 if err?
 // XXX unused?
@@ -578,6 +581,7 @@ func (dh *DataHeader) LoadBackRef(r io.ReaderAt) (backPos int64, err error) {
 }
 
 // LoadBack reads and decodes data header for revision linked via back-pointer.
+//
 // prerequisite: dh XXX     .DataLen == 0
 // if link is to zero (means deleted record) io.EOF is returned
 func (dh *DataHeader) LoadBack(r io.ReaderAt) error {
@@ -617,6 +621,7 @@ func (dh *DataHeader) LoadBack(r io.ReaderAt) error {
 }
 
 // LoadNext reads and decodes data header for next data record in the same transaction.
+//
 // prerequisite: dh .Pos .DataLen are initialized
 // when there is no more data records: io.EOF is returned
 func (dh *DataHeader) LoadNext(r io.ReaderAt, txnh *TxnHeader) error {
@@ -661,6 +666,7 @@ func (dh *DataHeader) loadNext(r io.ReaderAt, txnh *TxnHeader) error {
 }
 
 // LoadData loads data for the data record taking backpointers into account.
+//
 // Data is loaded into *buf, which, if needed, is reallocated to hold whole loading data size.
 // NOTE on success dh state is changed to data header of original data transaction
 // NOTE "deleted" records are indicated via returning *buf=nil

go/zodb/storage/fs1/index.go

@@ -56,7 +56,7 @@ type Index struct {
 	*fsb.Tree
 }
 
-// IndexNew creates new empty index
+// IndexNew creates new empty index.
 func IndexNew() *Index {
 	return &Index{TopPos: txnValidFrom, Tree: fsb.TreeNew()}
 }
@@ -171,7 +171,7 @@ out:
 	return &IndexSaveError{err}
 }
 
-// SaveFile saves index to a file @ path
+// SaveFile saves index to a file @ path.
 //
 // Index data is first saved to a temporary file and when complete the
 // temporary is renamed to be at requested path. This way file @ path will be
@@ -349,7 +349,7 @@ out:
 	return nil, &IndexLoadError{xio.Name(r), picklePos, err}
 }
 
-// LoadIndexFile loads index from a file @ path
+// LoadIndexFile loads index from a file @ path.
 func LoadIndexFile(path string) (fsi *Index, err error) {
 	f, err := os.Open(path)
 	if err != nil {
@@ -370,7 +370,7 @@ func LoadIndexFile(path string) (fsi *Index, err error) {
 
 // ----------------------------------------
 
-// Equal returns whether two indices are the same
+// Equal returns whether two indices are the same.
 func (a *Index) Equal(b *Index) bool {
 	if a.TopPos != b.TopPos {
 		return false
@@ -379,7 +379,7 @@ func (a *Index) Equal(b *Index) bool {
 	return treeEqual(a.Tree, b.Tree)
 }
 
-// treeEqual returns whether two fsb.Tree are the same
+// treeEqual returns whether two fsb.Tree are the same.
 func treeEqual(a, b *fsb.Tree) bool {
 	if a.Len() != b.Len() {
 		return false
@@ -527,7 +527,7 @@ func (index *Index) Update(ctx context.Context, r io.ReaderAt, topPos int64, pro
 	return nil
 }
 
-// BuildIndex builds new in-memory index for data in r
+// BuildIndex builds new in-memory index for data in r.
 //
 // non-nil valid and consistent index is always returned - even in case of error
 // the index will describe data till top-position of highest transaction that
@@ -541,7 +541,7 @@ func BuildIndex(ctx context.Context, r io.ReaderAt, progress func(*IndexUpdatePr
 	return index, err
 }
 
-// BuildIndexForFile builds new in-memory index for data in file @ path
+// BuildIndexForFile builds new in-memory index for data in file @ path.
 //
 // See BuildIndex for semantic description.
 func BuildIndexForFile(ctx context.Context, path string, progress func(*IndexUpdateProgress)) (index *Index, err error) {