move locking out of GC branch

whyrusleeping · whyrusleeping · commit ff96a3739990 · 2015-07-08T11:18:04.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/commands/add.go b/core/commands/add.go
@@ -110,6 +110,10 @@ remains to be implemented.
 		go func() {
 			defer close(outChan)
 
+			// lock blockstore to prevent rogue GC
+			unlock := n.Blockstore.RLock()
+			defer unlock()
+
 			for {
 				file, err := req.Files().NextFile()
 				if err != nil && err != io.EOF {
diff --git a/core/coreunix/add.go b/core/coreunix/add.go
@@ -24,6 +24,9 @@ var log = eventlog.Logger("coreunix")
 // Add builds a merkledag from the a reader, pinning all objects to the local
 // datastore. Returns a key representing the root node.
 func Add(n *core.IpfsNode, r io.Reader) (string, error) {
+	unlock := n.Blockstore.RLock()
+	defer unlock()
+
 	// TODO more attractive function signature importer.BuildDagFromReader
 	dagNode, err := importer.BuildDagFromReader(
 		r,
@@ -44,6 +47,9 @@ func Add(n *core.IpfsNode, r io.Reader) (string, error) {
 
 // AddR recursively adds files in |path|.
 func AddR(n *core.IpfsNode, root string) (key string, err error) {
+	unlock := n.Blockstore.RLock()
+	defer unlock()
+
 	f, err := os.Open(root)
 	if err != nil {
 		return "", err
@@ -79,6 +85,9 @@ func AddR(n *core.IpfsNode, root string) (key string, err error) {
 // Returns the path of the added file ("<dir hash>/filename"), the DAG node of
 // the directory, and and error if any.
 func AddWrapped(n *core.IpfsNode, r io.Reader, filename string) (string, *merkledag.Node, error) {
+	unlock := n.Blockstore.RLock()
+	defer unlock()
+
 	file := files.NewReaderFile(filename, ioutil.NopCloser(r), nil)
 	dir := files.NewSliceFile("", []files.File{file})
 	dagnode, err := addDir(n, dir)
