From 674485066128f898d0d4585c9f257daede1648c6 Mon Sep 17 00:00:00 2001 From: Tuna Date: Tue, 23 Apr 2019 13:42:19 +0700 Subject: [PATCH] makeup tomoclean, add make tomoclean --- Makefile | 5 +++++ cmd/tomoclean/main.go | 32 ++++++++++++++++---------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 4492228ac8..e5b5f9b803 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,11 @@ tomo: @echo "Done building." @echo "Run \"$(GOBIN)/tomo\" to launch tomo." +tomoclean: + build/env.sh go run build/ci.go install ./cmd/tomoclean + @echo "Done building." + @echo "Run \"$(GOBIN)/tomoclean\" to launch tomoclean." + bootnode: build/env.sh go run build/ci.go install ./cmd/bootnode @echo "Done building." diff --git a/cmd/tomoclean/main.go b/cmd/tomoclean/main.go index bd41f9234c..ec02d86643 100644 --- a/cmd/tomoclean/main.go +++ b/cmd/tomoclean/main.go @@ -3,6 +3,13 @@ package main import ( "flag" "fmt" + "os" + "os/signal" + "runtime" + "sync" + "sync/atomic" + "time" + "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" @@ -14,17 +21,18 @@ import ( "github.com/hashicorp/golang-lru" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" - "os" - "os/signal" - "runtime" - "sync" - "sync/atomic" - "time" ) var ( - dir = flag.String("dir", "", "dir to mainet chain data") - cacheSize = flag.Int("size", 1000000, "dir to mainet chain data") + dir = flag.String("dir", "", "directory to TomoChain chaindata") + cacheSize = flag.Int("size", 1000000, "LRU cache size") + sercureKey = []byte("secure-key-") + nWorker = runtime.NumCPU() / 2 + cleanAddress = []common.Address{common.HexToAddress(common.BlockSigners)} + cache *lru.Cache + finish = int32(0) + running = true + stateRoots = make(chan TrieRoot) ) type TrieRoot struct { @@ -42,14 +50,6 @@ type ResultProcessNode struct { keys [17]*[]byte } -var sercureKey = []byte("secure-key-") -var nWorker = runtime.NumCPU() / 2 -var cleanAddress = []common.Address{common.HexToAddress(common.BlockSigners)} -var cache *lru.Cache -var finish = int32(0) -var running = true -var stateRoots = make(chan TrieRoot) - func main() { flag.Parse() lddb, _ := ethdb.NewLDBDatabase(*dir, eth.DefaultConfig.DatabaseCache, utils.MakeDatabaseHandles())