speckij
/
Hochwasser
mirror of https://github.com/SpeckiJ/Hochwasser.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restore performance from before refactor

This commit is contained in:
Norwin Roosen 2019-01-11 19:37:41 +01:00
parent 850380bf6f
commit 6e15e7518b
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
main.go
View File

@ -22,7 +22,7 @@ var cpuprofile = flag.String("cpuprofile", "", "Destination file for CPU Profile
var image_path = flag.String("image", "", "Absolute Path to image") var image_path = flag.String("image", "", "Absolute Path to image")
var image_offsetx = flag.Int("xoffset", 0, "Offset of posted image from left border") var image_offsetx = flag.Int("xoffset", 0, "Offset of posted image from left border")
var image_offsety = flag.Int("yoffset", 0, "Offset of posted image from top border") var image_offsety = flag.Int("yoffset", 0, "Offset of posted image from top border")
var connections = flag.Int("connections", 10, "Number of simultaneous connections/threads. Each Thread posts a subimage") var connections = flag.Int("connections", 4, "Number of simultaneous connections. Each connection posts a subimage")
var address = flag.String("host", "127.0.0.1:1337", "Server address") var address = flag.String("host", "127.0.0.1:1337", "Server address")
var runtime = flag.String("runtime", "1", "Runtime in Minutes") var runtime = flag.String("runtime", "1", "Runtime in Minutes")
var shuffle = flag.Bool("shuffle", false, "pixel send ordering") var shuffle = flag.Bool("shuffle", false, "pixel send ordering")
@ -69,7 +69,7 @@ func main() {
time.Sleep(time.Minute * timer) time.Sleep(time.Minute * timer)
} }
func bomb(messages [][]byte) { func bomb(messages []byte) {
conn, err := net.Dial("tcp", *address) conn, err := net.Dial("tcp", *address)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
@ -79,14 +79,12 @@ func bomb(messages [][]byte) {
// Start bombardement // Start bombardement
for { for {
for _, message := range messages { _, err := conn.Write(messages)
_, err := conn.Write(message)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
} }
} }
}
func readImage(path string) (img image.Image) { func readImage(path string) (img image.Image) {
reader, err := os.Open(path) reader, err := os.Open(path)
@ -129,18 +127,15 @@ func genCommands(img image.Image, offset_x, offset_y int) (commands [][]byte) {
} }
// Splits messages into equally sized chunks // Splits messages into equally sized chunks
func chunkCommands(commands [][]byte, numChunks int) [][][]byte { func chunkCommands(commands [][]byte, numChunks int) [][]byte {
chunks := make([][][]byte, numChunks) chunks := make([][]byte, numChunks)
chunkLength := len(commands) / numChunks chunkLength := len(commands) / numChunks
for i := 0; i < numChunks; i++ { for i := 0; i < numChunks; i++ {
cmdOffset := i * chunkLength cmdOffset := i * chunkLength
for j := 0; j < chunkLength; j++ {
if cmdOffset+chunkLength > len(commands) { chunks[i] = append(chunks[i], commands[cmdOffset+j]...)
chunks[i] = commands[cmdOffset:]
break
} }
chunks[i] = commands[cmdOffset : cmdOffset+chunkLength]
} }
return chunks return chunks
} }