code prettyfing

runner/runner.go

@@ -1,7 +1,6 @@
 package runner
 
 import (
-    //"errors"
     "bytes"
     "io"
     "fmt"
@@ -24,22 +23,22 @@ type Limits struct {
 }
 
 func extractNumbers(s string) (result []int) {
-    lastNumber,isNumber := false,false
-    var curNumber=0
-    for _,char :=range s {
-        isNumber=(char>='0' && char<='9')
+    lastNumber, isNumber := false,false
+    var curNumber = 0
+    for _, char := range s {
+        isNumber = (char >= '0' && char <= '9')
         if(isNumber) {
-            curNumber*=10
-            curNumber+=int(char-'0')
+            curNumber *= 10
+            curNumber += int(char - '0')
         }
         if(!isNumber && lastNumber) {
-            result=append(result,curNumber)
-            curNumber=0
+            result = append(result, curNumber)
+            curNumber = 0
         }
-        lastNumber=isNumber
+        lastNumber = isNumber
     }
     if(lastNumber) {
-        result=append(result,curNumber)
+        result = append(result, curNumber)
     }
     return
 }
@@ -54,39 +53,35 @@ func Init() error {
     }
     //isolated cores initialisation:
     cmdlineBytes := make([]byte, 400)
-    cmdlineFile,_:=os.Open("/proc/cmdline");
-    countCmdlineBytes,_:=cmdlineFile.Read(cmdlineBytes);
-    cmdline:=string(cmdlineBytes[:countCmdlineBytes])
-    kernelParams:=strings.Split(cmdline," ")
-    for _,param := range kernelParams{
-        if(len(param)>=9 && param[:9]=="isolcpus=") {
-            coresIsolated=append(coresIsolated, extractNumbers(param[9:])...)
+    cmdlineFile, _ := os.Open("/proc/cmdline");
+    countCmdlineBytes, _ := cmdlineFile.Read(cmdlineBytes);
+    cmdline := string(cmdlineBytes[:countCmdlineBytes])
+    kernelParams := strings.Split(cmdline," ")
+    for _, param := range kernelParams{
+        if(len(param) >= 9 && param[:9] == "isolcpus=") {
+            coresIsolated = append(coresIsolated, extractNumbers(param[9:])...)
         }
     }
-    if(len(coresIsolated)==0) {
+    if(len(coresIsolated) == 0) {
         return fmt.Errorf("no free cores available")//TODO: trouble description
     }
-    log.Println("running on cores:",coresIsolated)
+    log.Println("running on cores:", coresIsolated)
     log.Println("Runner initialisation successful!")
     return nil
 }
 
-func IsolatedRun(command []string,limits Limits) {
+func IsolatedRun(command []string, limits Limits) {
     var runId string
-    for i:=0;i<runIdLength;i++{runId+=string('a'+byte(rand.Int31n(26)))}
-    os.Mkdir("starter/"+runId,0777)
-    //log.Printf("%d",limits.Core)
-    //exec.Command("starter/starter", string(limits.Core),string(limits.Memory),string(limits.Time),runId,command...);
-    args:=[]string{string(limits.Core),string(limits.Memory),string(limits.Time),runId}
-    args=append(args,command...)
-    cmd:=exec.Command("/root/runner/starter/starter",args...)
-    //cmd:=exec.Command("/usr/bin/echo","123")
+    for i := 0; i < runIdLength; i++ {runId += string('a' + byte(rand.Int31n(26)))}
+    os.Mkdir("starter/" + runId, 0777)
+    args := []string{string(limits.Core), string(limits.Memory), string(limits.Time), runId}
+    args = append(args, command...)
+    cmd := exec.Command("starter/starter", args...)
     var stdBuffer bytes.Buffer
     mw := io.MultiWriter(os.Stdout, &stdBuffer)
     cmd.Stdout = mw
     err := cmd.Run();
     if err != nil { log.Fatal(err) }
-    //log.Println(stdBuffer.String())
-    os.RemoveAll("starter/"+runId)
+    os.RemoveAll("starter/" + runId)
     cmd.Wait()
 }

runner/runner_test.go

@@ -10,22 +10,22 @@ type ENTestPair struct {
 }
 
 var ENTests = []ENTestPair {
-    {"123",[]int{123}},
-    {"abc123abc",[]int{123}},
-    {"",[]int{}},
-    {"0",[]int{0}},
-    {"1a2a3a6",[]int{1,2,3,6}},
+    {"123", []int{123}},
+    {"abc123abc", []int{123}},
+    {"", []int{}},
+    {"0", []int{0}},
+    {"1a2a3a6", []int{1, 2, 3, 6}},
 }
 
 func TestExtractNumbers(t *testing.T) {
-    for _,test:=range(ENTests) {
-        result:=extractNumbers(test.test)
-        if(len(result)!=len(test.result)) {
-            t.Error("for",test.test,"expected",test.result,"got",result)
+    for _, test := range(ENTests) {
+        result := extractNumbers(test.test)
+        if(len(result) != len(test.result)) {
+            t.Error("for", test.test, "expected", test.result, "got", result)
         }
-        for i:=0;i<len(result);i++ {
-            if(result[i]!=test.result[i]) {
-            t.Error("for",test.test,"expected",test.result,"got",result)
+        for i := 0; i < len(result); i++ {
+            if(result[i] != test.result[i]) {
+                t.Error("for", test.test, "expected", test.result, "got", result)
             }
         }
     }