refactor

main.go

@@ -18,9 +18,7 @@ import (
 
 var err error
 var cpuprofile = flag.String("cpuprofile", "", "Destination file for CPU Profile")
-var image = flag.String("image", "", "Absolute Path to image")
+var image_path = flag.String("image", "", "Absolute Path to image")
-var canvas_xsize = flag.Int("xsize", 800, "Width of the canvas in px")
-var canvas_ysize = flag.Int("ysize", 600, "Height of the canvas in px")
 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 connections = flag.Int("connections", 10, "Number of simultaneous connections/threads. Each Thread posts a subimage")
@@ -29,8 +27,8 @@ var runtime = flag.String("runtime", "1", "Runtime in Minutes")
 
 func main() {
 	flag.Parse()
-	if *image == "" || *address == "" {
+	if *image_path == "" {
-		log.Fatal("No image or no server address provided")
+		log.Fatal("No image provided")
 	}
 
 	// check connectivity by opening one test connection
@@ -49,10 +47,12 @@ func main() {
 		pprof.StartCPUProfile(f)
 		defer pprof.StopCPUProfile()
 	}
+
 	// Generate and split messages into equal chunks
-	msg := splitmessages(genMessages())
+	commands := genCommands(readImage(*image_path), *image_offsetx, *image_offsety)
-	for _, message := range msg {
+	commandGroups := chunkCommands(commands, *connections)
-		go bomb(message)
+	for _, messages := range commandGroups {
+		go bomb(messages)
 	}
 
 	// Terminate after 1 Minute to save resources
@@ -63,87 +63,78 @@ func main() {
 	time.Sleep(time.Minute * timer)
 }
 
-func bomb(messages []byte) {
+func bomb(messages [][]byte) {
 	conn, err := net.Dial("tcp", *address)
-
 	if err != nil {
 		log.Fatal(err)
 	}
+
 	defer conn.Close()
 
 	// Start bombardement
 	for {
-		_, err := conn.Write(messages)
+		for _, message := range messages {
-		if err != nil {
+			_, err := conn.Write(message)
-			log.Fatal(err)
+			if err != nil {
+				log.Fatal(err)
+			}
 		}
 	}
 }
 
-// Creates message based on given image
+func readImage(path string) (img image.Image) {
-func genMessages() (output []byte) {
+	reader, err := os.Open(path)
-	reader, err := os.Open(*image)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	img, err2 := png.Decode(reader)
+	img, _, err2 := image.Decode(reader)
 	if err2 != nil {
 		log.Fatal(err2)
 	}
 
-	for x := img.Bounds().Max.X; x != 0; x-- {
+	return img
-		for y := img.Bounds().Max.Y; y != 0; y-- {
-			col := img.At(x, y)
-			r, g, b, _ := col.RGBA()
-
-			rStr := strconv.FormatInt(int64(r), 16)
-			if len(rStr) == 1 {
-				rStr = "0" + rStr
-			}
-
-			gStr := strconv.FormatInt(int64(g), 16)
-			if len(gStr) == 1 {
-				gStr = "0" + gStr
-			}
-
-			bStr := strconv.FormatInt(int64(b), 16)
-			if len(bStr) == 1 {
-				bStr = "0" + bStr
-			}
-
-			colStr := rStr[0:2]
-			colStr += gStr[0:2]
-			colStr += bStr[0:2]
-
-			//Do not draw transparent pixels
-			if colStr == "000000" {
-				continue
-			}
-			pxStr := fmt.Sprintf("PX %d %d %s\n", x+*image_offsetx, y+*image_offsety, colStr)
-			output = append(output, []byte(pxStr)...)
-		}
-	}
-	return output
 }
 
-// Splits messages into chunks, splitting on complete commands only
+func intToHex(x uint32) string {
-func splitmessages(in []byte) [][]byte {
+	str := strconv.FormatInt(int64(x), 16)
-	index := 0
+	if len(str) == 1 {
-	equalsplit := len(in) / *connections
+		str = "0" + str
-	output := make([][]byte, *connections)
+	}
-	for i := 0; i < *connections; i++ {
+	return str[0:2]
-		if index+equalsplit > len(in) {
+}
-			output[i] = in[index:]
+
+// Creates message based on given image
+func genCommands(img image.Image, offset_x, offset_y int) (commands [][]byte) {
+	max_x := img.Bounds().Max.X
+	max_y := img.Bounds().Max.Y
+	commands = make([][]byte, max_x*max_y)
+
+	for x := 0; x < max_x; x++ {
+		for y := 0; y < max_y; y++ {
+			r, g, b, _ := img.At(x, y).RGBA()
+			colStr := intToHex(r) + intToHex(g) + intToHex(b)
+			cmd := fmt.Sprintf("PX %d %d %s\n", x+offset_x, y+offset_y, colStr)
+			commands[x*max_y+y] = []byte(cmd)
+		}
+	}
+
+	return commands
+}
+
+// Splits messages into equally sized chunks
+func chunkCommands(commands [][]byte, numChunks int) [][][]byte {
+	chunks := make([][][]byte, numChunks)
+
+	chunkLength := len(commands) / numChunks
+	for i := 0; i < numChunks; i++ {
+		cmdOffset := i * chunkLength
+
+		if cmdOffset+chunkLength > len(commands) {
+			chunks[i] = commands[cmdOffset:]
 			break
 		}
-
+		chunks[i] = commands[cmdOffset : cmdOffset+chunkLength]
-		tmp := index
-		for in[index+equalsplit] != 80 {
-			index++
-		}
-		output[i] = in[tmp : index+equalsplit]
-		index += equalsplit
 	}
-	return output
+	return chunks
 }