Skip to content

Commit

Permalink
remove incorrect tracing directives
Browse files Browse the repository at this point in the history
  • Loading branch information
@fhackett
fhackett committed Jan 16, 2025
1 parent 9aacfdd commit bc28d71
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 10 deletions.
7 changes: 4 additions & 3 deletions systems/dqueue/dqueue_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/UBC-NSS/pgo/distsys"
"github.com/UBC-NSS/pgo/distsys/resources"
"github.com/UBC-NSS/pgo/distsys/trace"
)

func TestNUM_NODES(t *testing.T) {
Expand All @@ -28,7 +29,7 @@ func TestProducerConsumer(t *testing.T) {
consumerSelf := tla.MakeNumber(1)
consumerOutputChannel := make(chan tla.Value, 3)

//traceRecorder := trace.MakeLocalFileRecorder("dqueue_trace.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("dqueue_trace.txt")

ctxProducer := distsys.NewMPCalContext(producerSelf, AProducer,
distsys.DefineConstantValue("PRODUCER", producerSelf),
Expand All @@ -42,7 +43,7 @@ func TestProducerConsumer(t *testing.T) {
panic(fmt.Errorf("unknown mailbox index %v", index))
}
})),
distsys.EnsureArchetypeRefParam("s", resources.NewInputChan(producerInputChannel)) /*, distsys.SetTraceRecorder(traceRecorder)*/)
distsys.EnsureArchetypeRefParam("s", resources.NewInputChan(producerInputChannel)), distsys.SetTraceRecorder(traceRecorder))
defer ctxProducer.Stop()
go func() {
err := ctxProducer.Run()
Expand All @@ -63,7 +64,7 @@ func TestProducerConsumer(t *testing.T) {
panic(fmt.Errorf("unknown mailbox index %v", index))
}
})),
distsys.EnsureArchetypeRefParam("proc", resources.NewOutputChan(consumerOutputChannel)) /*, distsys.SetTraceRecorder(traceRecorder)*/)
distsys.EnsureArchetypeRefParam("proc", resources.NewOutputChan(consumerOutputChannel)), distsys.SetTraceRecorder(traceRecorder))
defer ctxConsumer.Stop()
go func() {
err := ctxConsumer.Run()
Expand Down
6 changes: 3 additions & 3 deletions systems/proxy/proxy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func setupMonitor() *resources.Monitor {
}

func TestProxy_AllServersRunning(t *testing.T) {
traceRecorder := trace.MakeLocalFileRecorder("proxy_all_servers_running.txt")
var traceRecorder trace.Recorder = nil //trace.MakeLocalFileRecorder("proxy_all_servers_running.txt")
inChan := make(chan tla.Value, numRequests)
outChan := make(chan tla.Value, numRequests)
mon := setupMonitor()
Expand Down Expand Up @@ -168,7 +168,7 @@ func TestProxy_AllServersRunning(t *testing.T) {
}

func TestProxy_SecondServerRunning(t *testing.T) {
traceRecorder := trace.MakeLocalFileRecorder("proxy_second_server_running.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("proxy_second_server_running.txt")
inChan := make(chan tla.Value, numRequests)
outChan := make(chan tla.Value, numRequests)
mon := setupMonitor()
Expand Down Expand Up @@ -226,7 +226,7 @@ func TestProxy_SecondServerRunning(t *testing.T) {
}

func TestProxy_NoServerRunning(t *testing.T) {
traceRecorder := trace.MakeLocalFileRecorder("proxy_no_server_running.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("proxy_no_server_running.txt")
inChan := make(chan tla.Value, numRequests)
outChan := make(chan tla.Value, numRequests)
mon := setupMonitor()
Expand Down
2 changes: 2 additions & 0 deletions systems/raftkvs/bootstrap/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"github.com/UBC-NSS/pgo/distsys/hashmap"
"github.com/UBC-NSS/pgo/distsys/resources"
"github.com/UBC-NSS/pgo/distsys/tla"
//"github.com/UBC-NSS/pgo/distsys/trace"
)

var fdMap *hashmap.HashMap[distsys.ArchetypeResource]
Expand Down Expand Up @@ -63,6 +64,7 @@ func newClientCtx(self tla.Value, c configs.Root, reqCh, respCh, timeoutCh chan
ctx := distsys.NewMPCalContext(
self, raftkvs.AClient,
distsys.EnsureMPCalContextConfigs(constants...),
// distsys.SetTraceRecorder(trace.MakeLocalFileRecorder(fmt.Sprintf("trace-client-%s.log", self))),
distsys.EnsureArchetypeRefParam("net", net),
distsys.EnsureArchetypeRefParam("netLen", netLen),
distsys.EnsureArchetypeRefParam("fd", fd),
Expand Down
2 changes: 2 additions & 0 deletions systems/raftkvs/bootstrap/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/UBC-NSS/pgo/distsys/hashmap"
"github.com/UBC-NSS/pgo/distsys/resources"
"github.com/UBC-NSS/pgo/distsys/tla"
//"github.com/UBC-NSS/pgo/distsys/trace"
"github.com/dgraph-io/badger/v3"
"go.uber.org/multierr"
)
Expand Down Expand Up @@ -131,6 +132,7 @@ func newServerCtxs(srvId tla.Value, c configs.Root, db *badger.DB) ([]*distsys.M
smDomain := smDomainMaker.MakeLocalShared()

resourcesConfig := []distsys.MPCalContextConfigFn{
// distsys.SetTraceRecorder(trace.MakeLocalFileRecorder(fmt.Sprintf("trace-srv-%s.log", self))),
distsys.EnsureArchetypeValueParam("srvId", srvId),
distsys.EnsureArchetypeRefParam("net", net),
// distsys.EnsureArchetypeRefParam("netLen", netLen),
Expand Down
2 changes: 1 addition & 1 deletion test/files/general/IndexingLocals.tla.gotests/IndexingLocals_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
)

func TestANode(t *testing.T) {
traceRecorder := trace.MakeLocalFileRecorder("IndexingLocals_trace.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("IndexingLocals_trace.txt")
ctx := distsys.NewMPCalContext(tla.MakeString("self"), ANode, distsys.SetTraceRecorder(traceRecorder))
err := ctx.Run()
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions test/files/general/hello.tla.gotests/hello_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestEmpty(t *testing.T) {

func TestHello(t *testing.T) {
outCh := make(chan tla.Value, 1)
traceRecorder := trace.MakeLocalFileRecorder("hello_simple_trace.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("hello_simple_trace.txt")
ctx := distsys.NewMPCalContext(tla.MakeString("self"), hello.AHello,
distsys.DefineConstantOperator("MK_HELLO", func(left, right tla.Value) tla.Value {
return tla.MakeString(left.AsString() + right.AsString())
Expand All @@ -90,7 +90,7 @@ func TestHello(t *testing.T) {
func TestHello_SharedResource(t *testing.T) {
outMaker := resources.NewLocalSharedManager(tla.MakeString("a"))

traceRecorder := trace.MakeLocalFileRecorder("hello_shared_trace.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("hello_shared_trace.txt")
ctx := distsys.NewMPCalContext(tla.MakeString("self"), hello.AHello,
distsys.DefineConstantOperator("MK_HELLO", func(left, right tla.Value) tla.Value {
return tla.MakeString(left.AsString() + right.AsString())
Expand Down Expand Up @@ -119,7 +119,7 @@ func TestHello_PersistentResource(t *testing.T) {
out := distsys.NewLocalArchetypeResource(tla.MakeString("a"))
persistentOutMaker := resources.MakePersistent("ANode.out", db, out)

traceRecorder := trace.MakeLocalFileRecorder("hello_persistent_trace.txt")
var traceRecorder trace.Recorder = nil // trace.MakeLocalFileRecorder("hello_persistent_trace.txt")
ctx := distsys.NewMPCalContext(tla.MakeString("self"), hello.AHello,
distsys.DefineConstantOperator("MK_HELLO", func(left, right tla.Value) tla.Value {
return tla.MakeString(left.AsString() + right.AsString())
Expand Down

0 comments on commit bc28d71

Please sign in to comment.