fixed up linn a bit

.hgignore

@@ -18,4 +18,5 @@ TestPrograms/t3/*.txt
 
 examples/ricartagrawala/gonadoresults/*
 examples/chainkv/results/*
+examples/sum/failed
 userstudy/*

examples/linear/client/client.go

@@ -2,17 +2,18 @@ package main
 
 import (
 	"fmt"
-	"github.com/arcaneiceman/GoVector/capture"
-	"bitbucket.org/bestchai/dinv/dinvRT"
 	"math/rand"
 	"net"
 	"os"
+
+	"bitbucket.org/bestchai/dinv/dinvRT"
+	"github.com/arcaneiceman/GoVector/capture"
 )
 
 const (
-	ADDITION_ARGS	= 2
-	LARGEST_TERM	= 100
-	RUNS		= 50
+	ADDITION_ARGS = 2
+	LARGEST_TERM  = 100
+	RUNS          = 50
 )
 
 var debug = false
@@ -26,26 +27,28 @@ func main() {
 	PrintErr(errDial)
 
 	var (
-		buf			[1024]byte
-		term1, term2, sum	int
+		buf               [1024]byte
+		term1, term2, sum int
 	)
 	fmt.Println()
 	for t := 0; t <= RUNS; t++ {
-		dinvRT.Track("main_client_32_", "main_client_32_LARGEST_TERM,main_client_32_RUNS,main_client_32_SIZEOFINT,main_client_32_ADDITION_ARGS,main_client_32_debug,main_client_32_rAddr,main_client_32_errR,main_client_32_lAddr,main_client_32_errL,main_client_32_conn,main_client_32_errDial,main_client_32_buf", LARGEST_TERM, RUNS, SIZEOFINT, ADDITION_ARGS, debug, rAddr, errR, lAddr, errL, conn, errDial, buf)
+		//@track
 		fmt.Printf("\rExecuting[%2.0f]", float32(t)/float32(RUNS)*100)
 		term1, term2 = rand.Int()%LARGEST_TERM, rand.Int()%LARGEST_TERM
 
 		msg := MarshallInts([]int{term1, term2})
 		// sending UDP packet to specified address and port
-		_, errWrite := capture.Write(conn.Write,msg)
+		_, errWrite := capture.Write(conn.Write, msg)
 
 		PrintErr(errWrite)
 
-		dinvRT.Track("main_client_42_", "main_client_42_LARGEST_TERM,main_client_42_RUNS,main_client_42_SIZEOFINT,main_client_42_ADDITION_ARGS,main_client_42_debug,main_client_42_rAddr,main_client_42_errR,main_client_42_lAddr,main_client_42_errL,main_client_42_conn,main_client_42_errDial,main_client_42_buf", LARGEST_TERM, RUNS, SIZEOFINT, ADDITION_ARGS, debug, rAddr, errR, lAddr, errL, conn, errDial, buf)
+		//@track
+		dinvRT.Track("C-pre", "term1,term2,sum", term1, term2, sum)
 		// Reading the response message
 
-		_, errRead := capture.Read(conn.Read,buf[0:])
-		dinvRT.Track("main_client_46_", "main_client_46_LARGEST_TERM,main_client_46_RUNS,main_client_46_SIZEOFINT,main_client_46_ADDITION_ARGS,main_client_46_debug,main_client_46_rAddr,main_client_46_errR,main_client_46_lAddr,main_client_46_errL,main_client_46_conn,main_client_46_errDial,main_client_46_buf", LARGEST_TERM, RUNS, SIZEOFINT, ADDITION_ARGS, debug, rAddr, errR, lAddr, errL, conn, errDial, buf)
+		_, errRead := capture.Read(conn.Read, buf[0:])
+		dinvRT.Track("C-post", "term1,term2,sum", term1, term2, sum)
+		//@track
 		PrintErr(errRead)
 
 		uret := UnmarshallInts(buf)

examples/linear/coeff/coeff.go

@@ -1,12 +1,13 @@
 package main
 
 import (
+	"fmt"
 	"math/rand"
-	"github.com/arcaneiceman/GoVector/capture"
-	"bitbucket.org/bestchai/dinv/dinvRT"
 	"net"
-	"fmt"
 	"os"
+
+	"bitbucket.org/bestchai/dinv/dinvRT"
+	"github.com/arcaneiceman/GoVector/capture"
 )
 
 const (
@@ -45,8 +46,8 @@ func handleConn(conn net.PacketConn, conn2 *net.UDPConn) {
 	var term1, term2, coeff int
 
 	//read from client
-	_, addr, err := capture.ReadFrom(conn.ReadFrom,buf[0:])
-	dinvRT.Track("main_coeff_48_", "main_coeff_48_LARGEST_COEFF,main_coeff_48_SIZEOFINT,main_coeff_48_conn,main_coeff_48_conn2,main_coeff_48_buf,main_coeff_48_term1,main_coeff_48_term2,main_coeff_48_coeff,main_coeff_48_addr,main_coeff_48_err", LARGEST_COEFF, SIZEOFINT, conn, conn2, buf, term1, term2, coeff, addr, err)
+	_, addr, err := capture.ReadFrom(conn.ReadFrom, buf[0:])
+	//@track
 	PrintErr(err)
 	//unmarshall client arguments
 	uArgs := UnmarshallInts(buf)
@@ -57,22 +58,25 @@ func handleConn(conn net.PacketConn, conn2 *net.UDPConn) {
 	//	fmt.Printf("Coeff: T1:%d\tT2:%d\tCoeff:%d\n", term1, term2, coeff)
 	//}
 	msg := MarshallInts([]int{term1, term2, coeff})
-	_, errWrite := capture.Write(conn2.Write,msg)
+	_, errWrite := capture.Write(conn2.Write, msg)
 	PrintErr(errWrite)
-	dinvRT.Track("main_coeff_61_", "main_coeff_61_LARGEST_COEFF,main_coeff_61_SIZEOFINT,main_coeff_61_conn,main_coeff_61_conn2,main_coeff_61_buf,main_coeff_61_term1,main_coeff_61_term2,main_coeff_61_coeff,main_coeff_61_addr,main_coeff_61_err", LARGEST_COEFF, SIZEOFINT, conn, conn2, buf, term1, term2, coeff, addr, err)
+	//@track
+	dinvRT.Track("Coe-pre", "term1,term2,coeff", term1, term2, coeff)
 
 	//read response from linn server
-	_, errRead := capture.Read(conn2.Read,buf[0:])
-	dinvRT.Track("main_coeff_65_", "main_coeff_65_LARGEST_COEFF,main_coeff_65_SIZEOFINT,main_coeff_65_conn,main_coeff_65_conn2,main_coeff_65_buf,main_coeff_65_term1,main_coeff_65_term2,main_coeff_65_coeff,main_coeff_65_addr,main_coeff_65_err", LARGEST_COEFF, SIZEOFINT, conn, conn2, buf, term1, term2, coeff, addr, err)
+	_, errRead := capture.Read(conn2.Read, buf[0:])
+	//@track
 	PrintErr(errRead)
 	//unmarshall response from linn server
 	uret := UnmarshallInts(buf)
 	lin := uret[0]
+	dinvRT.Track("Coe-mid", "term1,term2,lin", term1, term2, lin)
 	//fmt.Printf("C: %d*%d + %d = %d\n", coeff, term1, term2, lin)
 	//marshall response and send back to client
 	msg2 := MarshallInts([]int{lin})
-	capture.WriteTo(conn.WriteTo,msg2,addr)
-	dinvRT.Track("main_coeff_75_", "main_coeff_75_LARGEST_COEFF,main_coeff_75_SIZEOFINT,main_coeff_75_conn,main_coeff_75_conn2,main_coeff_75_buf,main_coeff_75_term1,main_coeff_75_term2,main_coeff_75_coeff,main_coeff_75_addr,main_coeff_75_err", LARGEST_COEFF, SIZEOFINT, conn, conn2, buf, term1, term2, coeff, addr, err)
+	capture.WriteTo(conn.WriteTo, msg2, addr)
+	//@track
+	dinvRT.Track("Coe-post", "term1,term2,lin", term1, term2, lin)
 }
 
 const (

examples/linear/linn/linn.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"fmt"
-	"github.com/arcaneiceman/GoVector/capture"
-	"bitbucket.org/bestchai/dinv/dinvRT"
 	"net"
 	"os"
+
+	"bitbucket.org/bestchai/dinv/dinvRT"
+	"github.com/arcaneiceman/GoVector/capture"
 )
 
 //var debug = false
@@ -35,9 +36,10 @@ func handleConn(conn net.PacketConn) {
 	var buf [1024]byte
 	var term1, term2, coeff, lin int
 
-	_, addr, err := capture.ReadFrom(conn.ReadFrom,buf[0:])
+	_, addr, err := capture.ReadFrom(conn.ReadFrom, buf[0:])
 
-	dinvRT.Track("main_linn_39_", "main_linn_39_SIZEOFINT,main_linn_39_conn,main_linn_39_buf,main_linn_39_term1,main_linn_39_term2,main_linn_39_coeff,main_linn_39_lin,main_linn_39_addr,main_linn_39_err", SIZEOFINT, conn, buf, term1, term2, coeff, lin, addr, err)
+	//@track
+	dinvRT.Track("linn-pore", "term1,term2,coeff,lin", term1, term2, coeff, lin)
 	PrintErr(err)
 
 	uArgs := UnmarshallInts(buf)
@@ -47,9 +49,9 @@ func handleConn(conn net.PacketConn) {
 	//	fmt.Printf("C: %d*%d + %d = %d\n", coeff, term1, term2, lin)
 	//}
 	msg := MarshallInts([]int{lin})
-
-	dinvRT.Track("main_linn_50_", "main_linn_50_SIZEOFINT,main_linn_50_conn,main_linn_50_buf,main_linn_50_term1,main_linn_50_term2,main_linn_50_coeff,main_linn_50_lin,main_linn_50_addr,main_linn_50_err", SIZEOFINT, conn, buf, term1, term2, coeff, lin, addr, err)
-	capture.WriteTo(conn.WriteTo,msg,addr)
+	capture.WriteTo( //@track
+		conn.WriteTo, msg, addr)
+	dinvRT.Track("linn-pore", "term1,term2,coeff,lin", term1, term2, coeff, lin)
 }
 
 const (

examples/linear/run.sh

@@ -34,7 +34,7 @@ function installDinv {
 }
 
 function instrument {
-    dinv -i -v -dir=$testDir/$1
+    dinv -i -dir=$testDir/$1
     GoVector -v -dir=$testDir/$1
 }
 
@@ -69,7 +69,7 @@ function runTestPrograms {
 
 function runLogMerger {
     cd $testDir
-    dinv -v -l -name="fruits" -plan="SCM" -shiviz -json *Encoded.txt *Log.txt
+    dinv  -l -name="fruits" -plan="SCM" -shiviz -json *Encoded.txt *Log.txt
 }
 
 function runDaikon {
@@ -97,9 +97,9 @@ function cleanUp {
     rm ./*.gz
     rm ./*.txt
     rm ./*.json
-    fixModDir $P1
-    fixModDir $P2
-    fixModDir $P3
+    #fixModDir $P1
+    #fixModDir $P2
+    #fixModDir $P3
 
 }
 
@@ -111,9 +111,9 @@ then
     exit
 fi
 installDinv
-instrument $P1
-instrument $P2
-instrument $P3
+#instrument $P1
+#instrument $P2
+#instrument $P3
 runTestPrograms
 runLogMerger
 shivizMerge

examples/sum/client/client.go

@@ -13,18 +13,11 @@ import (
 
 const (
 	LARGEST_TERM = 100
-	RUNS         = 500
+	RUNS         = 5
 )
 
 func main() {
 
-	a := 1
-	if a > 0 {
-		b := 2
-		b = a
-		print(a)
-	}
-
 	localAddr, err := net.ResolveUDPAddr("udp4", ":18585")
 	printErrAndExit(err)
 	remoteAddr, err := net.ResolveUDPAddr("udp4", ":9090")
@@ -49,12 +42,11 @@ func reqSum(conn *net.UDPConn, n, m int) (sum int64, err error) {
 	msg := make([]byte, 256)
 	binary.PutVarint(msg[:8], int64(n))
 	binary.PutVarint(msg[8:], int64(m))
-
 	fmt.Println(msg)
 
 	// after instrumentation
 	_, err = capture.Write(conn.Write, msg[:])
-	// _, err = conn.Write(msg)
+	_, err = conn.Write(msg)
 	if err != nil {
 		return
 	}
@@ -71,7 +63,7 @@ func reqSum(conn *net.UDPConn, n, m int) (sum int64, err error) {
 
 	sum, _ = binary.Varint(buf[0:])
 
-	fmt.Println(sum, buf)
+	//fmt.Println(sum, buf)
 
 	dinvRT.Dump("main_client_66_", "main_client_66_LARGEST_TERM,main_client_66_RUNS,main_client_66_conn,main_client_66_n,main_client_66_m,main_client_66_msg", LARGEST_TERM, RUNS, conn, n, m, msg)
 

examples/sum/last_run

@@ -1 +1 @@
-./failed/10-24_13-23-59/
+./failed/02-21_10-05-43/

examples/sum/server/server.go

@@ -3,9 +3,12 @@ package main
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/arcaneiceman/GoVector/capture"
 	"net"
 	"os"
+
+	"bitbucket.org/bestchai/dinv/dinvRT"
+
+	"github.com/arcaneiceman/GoVector/capture"
 )
 
 const addr = ":9090"
@@ -42,27 +45,28 @@ func listenAndRespond(conn net.PacketConn) (err error) {
 
 	//@dump
 
-	a, readA := binary.Varint(buf[:8])
-	b, readB := binary.Varint(buf[8:])
+	a, _ := binary.Varint(buf[:8])
+	b, _ := binary.Varint(buf[8:])
 
 	sum := a + b
-
-	fmt.Println(buf)
-	fmt.Println(buf[:8], a, readA)
-	fmt.Println(buf[8:], b, readB)
+	/*
+		fmt.Println(buf)
+		fmt.Println(buf[:8], a, readA)
+		fmt.Println(buf[8:], b, readB)
+	*/
 
 	fmt.Printf("[SERVER] %d + %d = %d\n", a, b, sum)
 
 	msg := make([]byte, 256)
-	putN := binary.PutVarint(msg, sum)
+	binary.PutVarint(msg, sum)
 
-	fmt.Println(putN, msg)
+	//fmt.Println(putN, msg)
 
 	// after instrumentation:
 	capture.WriteTo(conn.WriteTo, msg, addr)
 	// conn.WriteTo(msg, addr)
 
-	//@dump
+	dinvRT.Dump("s64", "sum,a,b", sum, a, b)
 
 	return nil
 }

logmerger/logmerger.go

@@ -319,7 +319,6 @@ func statesFromCuts2(cuts []Cut, clocks [][]vclock.VClock, logs [][]Point) []Sta
 			}
 		}
 		state.TotalOrdering = totalOrderFromCut(cut, clocks) //TODO SPEED UP
-		logger.Printf("%s\n", state.String())
 		fmt.Printf("\rExtracting states %3.0f%% \t[%d] found", 100*float32(cutIndex)/float32(len(cuts)), len(states))
 		states = append(states, *state)
 	}
@@ -408,7 +407,7 @@ func totalOrderLineNumberMerge(states []State) [][]Point {
 				points = append(points, state.Points[state.TotalOrdering[j][k]])
 			}
 			mergedPoints[i][j] = mergePoints(points)
-			logger.Printf("Merged points id :%s\n\n===========\n", mergedPoints[i][j].Id)
+			//logger.Printf("Merged points id :%s\n\n===========\n", mergedPoints[i][j].Id)
 		}
 	}
 	fmt.Println()

programslicer/programBuilder.go

@@ -12,14 +12,15 @@ import (
 	"fmt"
 	"go/ast"
 	"go/parser"
+	"go/printer"
 	"go/token"
+	"log"
 	"os"
 
-	"go/printer"
+	"go/types"
 
 	"bitbucket.org/bestchai/dinv/programslicer/cfg"
 	"bitbucket.org/bestchai/dinv/programslicer/dataflow"
-	"go/types"
 	"golang.org/x/tools/go/loader"
 )
 
@@ -59,9 +60,9 @@ type CFGWrapper struct {
 	ObjNames map[*types.Var]string
 }
 
-func LoadProgram(SourceFiles []*ast.File, config loader.Config) (*loader.Program, error) {
+func LoadProgram(path string, SourceFiles []*ast.File, config loader.Config) (*loader.Program, error) {
 	//fmt.Println("Loading Packages")
-	config.CreateFromFiles("testing", SourceFiles...)
+	config.CreateFromFiles(path, SourceFiles...)
 	Prog, err := config.Load()
 	if err != nil {
 		return nil, err
@@ -86,7 +87,7 @@ func GetWrapperFromString(SourceString string) (*ProgramWrapper, error) {
 	Filename := Comments.Name.String()
 	//make the single files the head of a list
 	Sources := append(make([]*ast.File, 0), Source)
-	Prog, err := LoadProgram(Sources, config)
+	Prog, err := LoadProgram("string", Sources, config)
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +138,8 @@ func GetProgramWrapperDirectory(dir string) (*ProgramWrapper, error) {
 	for i := range SourceFiles {
 		aggergateSources = append(aggergateSources, SourceFiles[i]...)
 	}
-	Prog, err := LoadProgram(aggergateSources, config)
+	log.Printf("Instrumenting %d sources", len(aggergateSources))
+	Prog, err := LoadProgram(dir, aggergateSources, config)
 	if err != nil {
 		return nil, err
 	}
@@ -184,7 +186,7 @@ func (p *ProgramWrapper) Refresh() error {
 	for i := range sourceFiles {
 		aggergateSources = append(aggergateSources, sourceFiles[i]...)
 	}
-	prog, err := LoadProgram(aggergateSources, config)
+	prog, err := LoadProgram("", aggergateSources, config)
 	if err != nil {
 		return err
 	}