diff options
Diffstat (limited to 'verifysetup/cmd')
| -rw-r--r-- | verifysetup/cmd/setup.go | 96 |
1 files changed, 43 insertions, 53 deletions
diff --git a/verifysetup/cmd/setup.go b/verifysetup/cmd/setup.go index 79059f1..149f41a 100644 --- a/verifysetup/cmd/setup.go +++ b/verifysetup/cmd/setup.go @@ -11,6 +11,7 @@ import ( verify "github.com/axtloss/fsverify/core" "github.com/axtloss/fsverify/verifysetup/core" "github.com/spf13/cobra" + bolt "go.etcd.io/bbolt" ) func NewSetupCommand() *cobra.Command { @@ -24,41 +25,42 @@ func NewSetupCommand() *cobra.Command { return cmd } -func checksumBlock(blockStart int, blockEnd int, blockCount int, diskBytes []byte, nodeChannel chan verify.Node, waitGroup *sync.WaitGroup) { +func checksumBlock(blockStart int, blockEnd int, bundleSize int, diskBytes []byte, nodeChannel chan verify.Node, n int, waitGroup *sync.WaitGroup) { defer waitGroup.Done() + defer close(nodeChannel) var reader *bytes.Reader node := verify.Node{} - //fmt.Printf("Starting from %d to %d. BlockCount is %d\n", blockStart, blockEnd, blockCount) - //fmt.Println(blockCount) - //fmt.Println("diskBytes: ") - //fmt.Printf("Addres of diskBytes: %d\n", &diskBytes) - //fmt.Printf("%d:: diskByteslen: %d\n", blockStart, len(diskBytes)) - for i := 0; i < int(blockCount)-1; i++ { + + blockCount := math.Floor(float64(bundleSize / 2000)) + + for i := 0; i < int(blockCount); i++ { reader = bytes.NewReader(diskBytes) block, err := core.ReadBlock(i*2000, (i*2000)+2000, reader) if err != nil { fmt.Printf("%d:: %d attempted reading from %d to %d. Error %s\n", blockStart, i, i*2000, (i*2000)+2000, err) - //fmt.Println(err) return } - node, err = core.CreateNode(i*2000, (i*2000)+2000, block, &node) + node, err = core.CreateNode(blockStart+i*2000, blockStart+(i*2000)+2000, block, &node, strconv.Itoa(n)) if err != nil { fmt.Printf("%d:: 2 Error %s\n", blockStart, err) - //fmt.Println(err) return } - //nodeChannel <- node - //fmt.Println(blockStart, ":: ", node) - //fmt.Printf("%d:: %d\n", blockStart, i) + nodeChannel <- node + } + + block, err := core.ReadBlock(int(blockCount*2000), len(diskBytes), reader) + if err != nil { + fmt.Printf("%d:: final attempted reading from %d to %d. Error %s\n", blockStart, int(blockCount*2000)+2000, len(diskBytes), err) + return } + finalNode, err := core.CreateNode(blockStart+int(blockCount*2000)+2000, len(diskBytes), block, &node, strconv.Itoa(n)) + nodeChannel <- finalNode fmt.Printf("Node from %d to %d finished.\n", blockStart, blockEnd) } func copyByteArea(start int, end int, reader *bytes.Reader) ([]byte, error) { bytes := make([]byte, end-start) - //reader.Seek(int64(start), 0) n, err := reader.ReadAt(bytes, int64(start)) - //fmt.Printf("Reading from %d to %d\n", start, end) if err != nil { return nil, err } else if n != end-start { @@ -87,64 +89,52 @@ func SetupCommand(_ *cobra.Command, args []string) error { return err } diskSize := diskInfo.Size() - blockCount := math.Floor(float64(diskSize / 2000)) - lastBlockSize := float64(diskSize) - blockCount*2000.0 - blockBundle := math.Floor(float64(blockCount / float64(procCount))) - // lastBlockBundle := float64(blockCount) - blockBundle*float64(procCount) + bundleSize := math.Floor(float64(diskSize / int64(procCount))) + blockCount := math.Ceil(float64(bundleSize / 2000)) + lastBlockSize := int(diskSize) - int(bundleSize)*procCount fmt.Println(diskSize) - fmt.Println(blockCount) + fmt.Println(int(bundleSize)) fmt.Println(lastBlockSize) - // node := verify.Node{} - // block := make([]byte, 2000) diskBytes := make([]byte, diskSize) _, err = disk.Read(diskBytes) if err != nil { return err } reader := bytes.NewReader(diskBytes) - nodeChannel := make(chan verify.Node) var waitGroup sync.WaitGroup - //var nodes []verify.Node + nodeChannels := make([]chan verify.Node, procCount+1) for i := 0; i < procCount; i++ { - /*reader = bytes.NewReader(diskBytes) - block, err = core.ReadBlock(i*2000, (i*2000)+2000, reader) - if err != nil { - return err - } - node, err = core.CreateNode(i*2000, (i*2000)+2000, block, &node) - if err != nil { - return err - } - fmt.Println(node) - err = core.AddNode(node, nil, "./fsverify.db")*/ - - diskBytesCopy, err := copyByteArea(i*(int(blockBundle)*2000), (i+1)*(int(blockBundle)*2000), reader) + diskBytesCopy, err := copyByteArea(i*(int(bundleSize)), (i+1)*(int(bundleSize)), reader) if err != nil { return err } waitGroup.Add(1) - fmt.Printf("Starting thread %d with blockStart %d and blockEnd %d\n", i, i*(int(blockBundle)*2000), (i+1)*(int(blockBundle)*2000)) - go checksumBlock(i*(int(blockBundle)*2000), (i+1)*(int(blockBundle)*2000), int(blockBundle), diskBytesCopy, nodeChannel, &waitGroup) + fmt.Printf("Starting thread %d with blockStart %d and blockEnd %d\n", i, i*(int(bundleSize)), (i+1)*(int(bundleSize))) + nodeChannels[i] = make(chan verify.Node, int(math.Ceil(bundleSize/2000))) + go checksumBlock(i*(int(bundleSize)), (i+1)*(int(bundleSize)), int(bundleSize), diskBytesCopy, nodeChannels[i], i, &waitGroup) } - //fmt.Println("Appending nodes") - /*for i := 0; i < procCount; i++ { - nodes = append(nodes, <-nodeChannel) - }*/ + waitGroup.Wait() - fmt.Println("Created nodelist") - /*finalBlock, err := core.ReadBlock(int(blockCount*2000), int((blockCount*2000)+lastBlockSize), reader) + db, err := verify.OpenDB("./fsverify.db", false) if err != nil { return err } - finalNode, err := core.CreateNode(int(blockCount*2000), int((blockCount*2000)+lastBlockSize), finalBlock, &node) - if err != nil { - return err + + for i := 0; i < procCount; i++ { + channel := nodeChannels[i] + err = db.Batch(func(tx *bolt.Tx) error { + for j := 0; j < int(blockCount); j++ { + err := core.AddNode(<-channel, tx) + if err != nil { + return err + } + } + return nil + }) + if err != nil { + return err + } } - fmt.Println(finalNode) - err = core.AddNode(finalNode, nil, "./fsverify.db") - if err != nil { - return err - }*/ signature, err := core.SignDatabase("./fsverify.db", "./minisign/") if err != nil { |