publicWagsHome/go-iperf
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Ben Grewell
2021-08-30 07:54:59 -07:00
parent 698ed48ff0
commit 8e5fc7da0d
4 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@@ -8,7 +8,6 @@
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/client.go" beforeDir="false" afterPath="$PROJECT_DIR$/client.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/client.go" beforeDir="false" afterPath="$PROJECT_DIR$/client.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cmd/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/main.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/cmd/main.go" beforeDir="false" afterPath="$PROJECT_DIR$/cmd/main.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/execute.go" beforeDir="false" afterPath="$PROJECT_DIR$/execute.go" afterDir="false" />
<change beforePath="$PROJECT_DIR$/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/server.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/server.go" beforeDir="false" afterPath="$PROJECT_DIR$/server.go" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@@ -63,45 +62,45 @@
<module name="go-iperf" /> <module name="go-iperf" />
<working_directory value="$PROJECT_DIR$" /> <working_directory value="$PROJECT_DIR$" />
<kind value="PACKAGE" /> <kind value="PACKAGE" />
<filePath value="$PROJECT_DIR$/cmd/main.go" />
<package value="github.com/BGrewell/go-iperf/cmd" /> <package value="github.com/BGrewell/go-iperf/cmd" />
<directory value="$PROJECT_DIR$" /> <directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/cmd/main.go" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="go build github.com/BGrewell/go-iperf/tests/client" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true"> <configuration name="go build github.com/BGrewell/go-iperf/tests/client" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="go-iperf" /> <module name="go-iperf" />
<working_directory value="$PROJECT_DIR$" /> <working_directory value="$PROJECT_DIR$" />
<kind value="PACKAGE" /> <kind value="PACKAGE" />
<filePath value="$PROJECT_DIR$/tests/client/client.go" />
<package value="github.com/BGrewell/go-iperf/tests/client" /> <package value="github.com/BGrewell/go-iperf/tests/client" />
<directory value="$PROJECT_DIR$" /> <directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/tests/client/client.go" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="go build github.com/BGrewell/go-iperf/tests/controller" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true"> <configuration name="go build github.com/BGrewell/go-iperf/tests/controller" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="go-iperf" /> <module name="go-iperf" />
<working_directory value="$PROJECT_DIR$" /> <working_directory value="$PROJECT_DIR$" />
<kind value="PACKAGE" /> <kind value="PACKAGE" />
<filePath value="$PROJECT_DIR$/tests/controller/main.go" />
<package value="github.com/BGrewell/go-iperf/tests/controller" /> <package value="github.com/BGrewell/go-iperf/tests/controller" />
<directory value="$PROJECT_DIR$" /> <directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/tests/controller/main.go" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="go build github.com/BGrewell/go-iperf/tests/extract" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true"> <configuration name="go build github.com/BGrewell/go-iperf/tests/extract" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="go-iperf" /> <module name="go-iperf" />
<working_directory value="$PROJECT_DIR$" /> <working_directory value="$PROJECT_DIR$" />
<kind value="PACKAGE" /> <kind value="PACKAGE" />
<filePath value="$PROJECT_DIR$/tests/extract/main.go" />
<package value="github.com/BGrewell/go-iperf/tests/extract" /> <package value="github.com/BGrewell/go-iperf/tests/extract" />
<directory value="$PROJECT_DIR$" /> <directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/tests/extract/main.go" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="go build github.com/BGrewell/go-iperf/tests/server" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true"> <configuration name="go build github.com/BGrewell/go-iperf/tests/server" type="GoApplicationRunConfiguration" factoryName="Go Application" temporary="true" nameIsGenerated="true">
<module name="go-iperf" /> <module name="go-iperf" />
<working_directory value="$PROJECT_DIR$" /> <working_directory value="$PROJECT_DIR$" />
<kind value="PACKAGE" /> <kind value="PACKAGE" />
<filePath value="$PROJECT_DIR$/tests/server/server.go" />
<package value="github.com/BGrewell/go-iperf/tests/server" /> <package value="github.com/BGrewell/go-iperf/tests/server" />
<directory value="$PROJECT_DIR$" /> <directory value="$PROJECT_DIR$" />
<filePath value="$PROJECT_DIR$/tests/server/server.go" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<recent_temporary> <recent_temporary>

6
client.go
View File

@@ -504,14 +504,12 @@ func (c *Client) start() (pid int, err error) {
return -1, err return -1, err
} }
var exit chan int var exit chan int
<<<<<<< HEAD
if c.Debug { if c.Debug {
fmt.Printf("executing command: %s\n", cmd) fmt.Printf("executing command: %s\n", cmd)
} }
c.outputStream, c.errorStream, exit, c.cancel, err = ExecuteAsyncWithCancelReadIndicator(cmd, read)
=======
c.outputStream, c.errorStream, exit, c.cancel, pid, err = ExecuteAsyncWithCancelReadIndicator(cmd, read) c.outputStream, c.errorStream, exit, c.cancel, pid, err = ExecuteAsyncWithCancelReadIndicator(cmd, read)
>>>>>>> 328913249f87399ed1ce133fec58df85a24aa9b0
if err != nil { if err != nil {
return -1, err return -1, err
} }

4
cmd/main.go
View File

@@ -6,10 +6,6 @@ import (
//"github.com/BGrewell/go-iperf" //"github.com/BGrewell/go-iperf"
//"time" //"time"
"fmt" "fmt"
<<<<<<< HEAD
"github.com/BGrewell/go-conversions"
=======
>>>>>>> 328913249f87399ed1ce133fec58df85a24aa9b0
"github.com/BGrewell/go-iperf" "github.com/BGrewell/go-iperf"
"time" "time"
) )

6
server.go
View File

@@ -165,14 +165,12 @@ func (s *Server) start() (pid int, err error) {
return -1, err return -1, err
} }
var exit chan int var exit chan int
<<<<<<< HEAD
if s.Debug { if s.Debug {
fmt.Printf("executing command: %s\n", cmd) fmt.Printf("executing command: %s\n", cmd)
} }
s.outputStream, s.errorStream, exit, s.cancel, err = ExecuteAsyncWithCancel(cmd)
=======
s.outputStream, s.errorStream, exit, s.cancel, pid, err = ExecuteAsyncWithCancel(cmd) s.outputStream, s.errorStream, exit, s.cancel, pid, err = ExecuteAsyncWithCancel(cmd)
>>>>>>> 328913249f87399ed1ce133fec58df85a24aa9b0
if err != nil { if err != nil {
return -1, err return -1, err
} }