瀏覽代碼

Parallell -> parallel (ref #13)

Jakob Borg 12 年之前
父節點
當前提交
6d3f8a2c06
共有 4 個文件被更改,包括 6 次插入7 次删除
  1. 0 1
      auto/gui.files.go
  2. 1 1
      config.go
  3. 1 1
      main.go
  4. 4 4
      model/model.go

+ 0 - 1
auto/gui.files.go

@@ -1,4 +1,3 @@
-
 package auto
 
 import "github.com/cratonica/embed"

+ 1 - 1
config.go

@@ -20,7 +20,7 @@ type Options struct {
 	ExternalServer    string        `ini:"global-announce-server" default:"syncthing.nym.se:22025" description:"Global server for announcements"`
 	ExternalDiscovery bool          `ini:"global-announce-enabled" default:"true" description:"Announce to the global announce server"`
 	LocalDiscovery    bool          `ini:"local-announce-enabled" default:"true" description:"Announce to the local network"`
-	RequestsInFlight  int           `ini:"parallell-requests" default:"16" description:"Maximum number of blocks to request in parallell"`
+	ParallelRequests  int           `ini:"parallel-requests" default:"16" description:"Maximum number of blocks to request in parallel"`
 	LimitRate         int           `ini:"max-send-kbps" description:"Limit outgoing data rate (kbyte/s)"`
 	ScanInterval      time.Duration `ini:"rescan-interval" default:"60s" description:"Scan repository for changes this often"`
 	ConnInterval      time.Duration `ini:"reconnection-interval" default:"60s" description:"Attempt to (re)connect to peers this often"`

+ 1 - 1
main.go

@@ -210,7 +210,7 @@ func main() {
 			infoln("Deletes from peer nodes will be ignored")
 		}
 		okln("Ready to synchronize (read-write)")
-		m.StartRW(opts.Delete, opts.RequestsInFlight)
+		m.StartRW(opts.Delete, opts.ParallelRequests)
 	} else {
 		okln("Ready to synchronize (read only; no external updates accepted)")
 	}

+ 4 - 4
model/model.go

@@ -48,8 +48,8 @@ type Model struct {
 
 	sup suppressor
 
-	parallellRequests int
-	limitRequestRate  chan struct{}
+	parallelRequests int
+	limitRequestRate chan struct{}
 
 	imut sync.Mutex // protects Index
 }
@@ -130,7 +130,7 @@ func (m *Model) StartRW(del bool, threads int) {
 
 	m.rwRunning = true
 	m.delete = del
-	m.parallellRequests = threads
+	m.parallelRequests = threads
 
 	go m.cleanTempFiles()
 	if del {
@@ -491,7 +491,7 @@ func (m *Model) AddConnection(rawConn io.Closer, protoConn Connection) {
 		return
 	}
 
-	for i := 0; i < m.parallellRequests; i++ {
+	for i := 0; i < m.parallelRequests; i++ {
 		i := i
 		go func() {
 			if m.trace["pull"] {