Add Execution Time

Author: Eroui

commands/run.go

@@ -4,9 +4,6 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/chermehdi/egor/config"
-	"github.com/fatih/color"
-	"github.com/jedib0t/go-pretty/table"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -15,6 +12,10 @@ import (
 	"strings"
 	"time"
 
+	"github.com/chermehdi/egor/config"
+	"github.com/fatih/color"
+	"github.com/jedib0t/go-pretty/table"
+
 	"github.com/urfave/cli/v2"
 )
 
@@ -39,6 +40,7 @@ var (
 )
 
 const WorkDir = "work"
+const TimeOutDelta float64 = 25.0
 
 // Checks the output of a given testcase against it's expected output
 type Checker interface {
@@ -93,6 +95,7 @@ type CaseStatus struct {
 	Status       int8
 	CheckerError error
 	Stderr       string
+	Duration     time.Duration
 }
 
 // Implementation must be able to prepare the working environment to compile and execute testscases,
@@ -168,7 +171,7 @@ func getStderrDisplay(stderr string) string {
 func (c *ConsoleJudgeReport) Display() {
 	t := table.NewWriter()
 	t.SetOutputMirror(os.Stdout)
-	t.AppendHeader(table.Row{"#", "Test Name", "Status", "Custom", "Additional infos", "Stderr"})
+	t.AppendHeader(table.Row{"#", "Test Name", "Status", "Custom", "Additional infos", "Stderr", "Execution Time"})
 	for i, stat := range c.Stats {
 		output := "None"
 		if stat.CheckerError != nil {
@@ -181,6 +184,7 @@ func (c *ConsoleJudgeReport) Display() {
 			c.Descs[i].CustomCase,
 			output,
 			getStderrDisplay(stat.Stderr),
+			stat.Duration
 		})
 	}
 	t.SetStyle(table.StyleLight)
@@ -191,7 +195,8 @@ func newJudgeReport() JudgeReport {
 	return &ConsoleJudgeReport{Stats: []CaseStatus{}}
 }
 
-func timedExecution(cmd *exec.Cmd, timeOut float64) (int8, error) {
+func timedExecution(cmd *exec.Cmd, timeOut float64) (int8, time.Duration, error) {
+	start := time.Now()
 	cmd.Start()
 	done := make(chan error)
 	go func() { done <- cmd.Wait() }()
@@ -200,9 +205,11 @@ func timedExecution(cmd *exec.Cmd, timeOut float64) (int8, error) {
 	select {
 	case <-timeout:
 		cmd.Process.Kill()
-		return TO, nil
+		elapsed := time.Since(start)
+		return TO, elapsed, nil
 	case err := <-done:
-		return OK, err
+		elapsed := time.Since(start)
+		return OK, elapsed, err
 	}
 }
 
@@ -234,12 +241,13 @@ func execute(judge Judge, desc CaseDescription, command string, args ...string)
 	cmd.Stdout = outputFile
 	cmd.Stderr = &stderrBuffer
 
-	status, err := timedExecution(cmd, desc.TimeLimit)
+	status, duration, err := timedExecution(cmd, desc.TimeLimit+TimeOutDelta)
 	if status == TO {
 		return CaseStatus{
 			Status:       TL,
 			CheckerError: nil,
 			Stderr:       stderrBuffer.String(),
+			Duration:     duration,
 		}, nil
 	}
 
@@ -248,6 +256,7 @@ func execute(judge Judge, desc CaseDescription, command string, args ...string)
 			Status:       RE,
 			CheckerError: nil,
 			Stderr:       stderrBuffer.String(),
+			Duration:     duration,
 		}, err
 	}
 
@@ -256,6 +265,7 @@ func execute(judge Judge, desc CaseDescription, command string, args ...string)
 		return CaseStatus{
 			Status:       RE,
 			CheckerError: nil,
+			Duration:     duration,
 		}, err
 	}
 	output, err := ioutil.ReadFile(desc.WorkFile)
@@ -264,6 +274,7 @@ func execute(judge Judge, desc CaseDescription, command string, args ...string)
 		return CaseStatus{
 			Status:       RE,
 			CheckerError: nil,
+			Duration:     duration,
 		}, err
 	}
 	err = judge.Checker().Check(string(output), string(expectedOutput))
@@ -272,12 +283,14 @@ func execute(judge Judge, desc CaseDescription, command string, args ...string)
 			Status:       WA,
 			CheckerError: err,
 			Stderr:       stderrBuffer.String(),
+			Duration:     duration,
 		}, err
 	}
 	return CaseStatus{
 		Status:       AC,
 		CheckerError: nil,
 		Stderr:       stderrBuffer.String(),
+		Duration:     duration,
 	}, err
 }
 

commands/run_test.go

@@ -1,21 +1,22 @@
 package commands
 
 import (
-	"github.com/stretchr/testify/assert"
 	"os/exec"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestTimedOutExecution(t *testing.T) {
-	cmd := exec.Command("sleep", "1")
-	status, err := timedExecution(cmd, 999.99)
+	cmd := exec.Command("sleep", "1.1")
+	status, _, err := timedExecution(cmd, 1000+TimeOutDelta)
 	assert.Equal(t, err, nil)
 	assert.Equal(t, status, TO)
 }
 
 func TestTimedExecution(t *testing.T) {
 	cmd := exec.Command("sleep", "1")
-	status, err := timedExecution(cmd, 1250)
+	status, _, err := timedExecution(cmd, 1000+TimeOutDelta)
 	assert.Equal(t, err, nil)
 	assert.Equal(t, status, OK)
 }