Skip to content
Snippets Groups Projects
Commit 9169356e authored by Josh Brooks's avatar Josh Brooks
Browse files

Add debugs and flaten out the stoppables for file transfer

parent e3f30ba0
No related branches found
No related tags found
3 merge requests!510Release,!381Initial CTIDH,!378Add a debug GetRunningProcesses to bindings
...@@ -215,16 +215,14 @@ func NewManager(params Params, user FtE2e) (FileTransfer, error) { ...@@ -215,16 +215,14 @@ func NewManager(params Params, user FtE2e) (FileTransfer, error) {
// StartProcesses starts the sending threads. Adheres to the xxdk.Service type. // StartProcesses starts the sending threads. Adheres to the xxdk.Service type.
func (m *manager) StartProcesses() (stoppable.Stoppable, error) { func (m *manager) StartProcesses() (stoppable.Stoppable, error) {
// Construct stoppables // Construct stoppables
multiStop := stoppable.NewMulti(workerPoolStoppable) multiStoppable := stoppable.NewMulti(fileTransferStoppable)
batchBuilderStop := stoppable.NewSingle(batchBuilderThreadStoppable) batchBuilderStop := stoppable.NewSingle(batchBuilderThreadStoppable)
// Start sending threads // Start sending threads
go m.startSendingWorkerPool(multiStop) go m.startSendingWorkerPool(multiStoppable)
go m.batchBuilderThread(batchBuilderStop) go m.batchBuilderThread(batchBuilderStop)
// Create a multi stoppable // Create a multi stoppable
multiStoppable := stoppable.NewMulti(fileTransferStoppable)
multiStoppable.Add(multiStop)
multiStoppable.Add(batchBuilderStop) multiStoppable.Add(batchBuilderStop)
return multiStoppable, nil return multiStoppable, nil
......
...@@ -63,7 +63,9 @@ func (m *manager) startSendingWorkerPool(multiStop *stoppable.Multi) { ...@@ -63,7 +63,9 @@ func (m *manager) startSendingWorkerPool(multiStop *stoppable.Multi) {
for i := 0; i < workerPoolThreads; i++ { for i := 0; i < workerPoolThreads; i++ {
stop := stoppable.NewSingle(sendThreadStoppableName + strconv.Itoa(i)) stop := stoppable.NewSingle(sendThreadStoppableName + strconv.Itoa(i))
multiStop.Add(stop) multiStop.Add(stop)
go m.sendingThread(stop) go func(single *stoppable.Single) {
m.sendingThread(stop)
}(stop)
} }
} }
...@@ -74,8 +76,8 @@ func (m *manager) sendingThread(stop *stoppable.Single) { ...@@ -74,8 +76,8 @@ func (m *manager) sendingThread(stop *stoppable.Single) {
for { for {
select { select {
case <-stop.Quit(): case <-stop.Quit():
jww.DEBUG.Printf("[FT] Stopping file part sending thread: " + jww.DEBUG.Printf("[FT] Stopping file part sending thread (%s): "+
"stoppable triggered.") "stoppable triggered.", stop.Name())
m.cmix.RemoveHealthCallback(healthChanID) m.cmix.RemoveHealthCallback(healthChanID)
stop.ToStopped() stop.ToStopped()
return return
......
...@@ -83,7 +83,7 @@ func (s *Single) ToStopped() { ...@@ -83,7 +83,7 @@ func (s *Single) ToStopped() {
s.Name(), s.GetStatus(), Stopping) s.Name(), s.GetStatus(), Stopping)
} }
jww.TRACE.Printf("Switched status of single stoppable %q from %s to %s.", jww.DEBUG.Printf("Switched status of single stoppable %q from %s to %s.",
s.Name(), Stopping, Stopped) s.Name(), Stopping, Stopped)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment