From 05dc50ab27c7d414e2c3bc3c3d609c697e33b7a0 Mon Sep 17 00:00:00 2001 From: Frans Kaashoek Date: Thu, 27 Mar 2025 11:47:04 -0400 Subject: [PATCH] remove --- src/shardkv1/shardctrler/lock/lock.go | 31 -------- src/shardkv1/shardctrler/lock/lock_test.go | 89 ---------------------- src/shardkv1/shardctrler/param/param.go | 7 -- 3 files changed, 127 deletions(-) delete mode 100644 src/shardkv1/shardctrler/lock/lock.go delete mode 100644 src/shardkv1/shardctrler/lock/lock_test.go delete mode 100644 src/shardkv1/shardctrler/param/param.go diff --git a/src/shardkv1/shardctrler/lock/lock.go b/src/shardkv1/shardctrler/lock/lock.go deleted file mode 100644 index 7b5ab5f..0000000 --- a/src/shardkv1/shardctrler/lock/lock.go +++ /dev/null @@ -1,31 +0,0 @@ -package lock - -import ( - - "6.5840/kvsrv1" - "6.5840/kvsrv1/rpc" - "6.5840/shardkv1/shardctrler/param" -) - - -type Lock struct { - ck *kvsrv.Clerk - -} - -// Use l as the key to store the "lock state" (you would have to decide -// precisely what the lock state is). -func MakeLock(ck kvtest.IKVClerk, l string) *Lock { - lk := &Lock{ck: ck.(*kvsrv.Clerk)} - // You may add code here - return lk -} - - -func (lk *Lock) Acquire() { - // You may add code here. -} - -func (lk *Lock) Release() { - // You may add code here. -} diff --git a/src/shardkv1/shardctrler/lock/lock_test.go b/src/shardkv1/shardctrler/lock/lock_test.go deleted file mode 100644 index 92c9e67..0000000 --- a/src/shardkv1/shardctrler/lock/lock_test.go +++ /dev/null @@ -1,89 +0,0 @@ -package lock - -import ( - "fmt" - // "log" - "strconv" - "testing" - "time" - - "6.5840/kvsrv1" - "6.5840/kvsrv1/rpc" - "6.5840/kvtest1" -) - -const ( - NACQUIRE = 10 - NCLNT = 10 - NSEC = 2 -) - -func oneClient(t *testing.T, me int, ck kvtest.IKVClerk, done chan struct{}) kvtest.ClntRes { - lk := MakeLock(ck, "l") - ck.Put("l0", "", 0) - for i := 1; true; i++ { - select { - case <-done: - return kvtest.ClntRes{i, 0} - default: - lk.Acquire() - - // log.Printf("%d: acquired lock", me) - - b := strconv.Itoa(me) - val, ver, err := ck.Get("l0") - if err == rpc.OK { - if val != "" { - t.Fatalf("%d: two clients acquired lock %v", me, val) - } - } else { - t.Fatalf("%d: get failed %v", me, err) - } - - err = ck.Put("l0", string(b), ver) - if !(err == rpc.OK || err == rpc.ErrMaybe) { - t.Fatalf("%d: put failed %v", me, err) - } - - time.Sleep(10 * time.Millisecond) - - err = ck.Put("l0", "", ver+1) - if !(err == rpc.OK || err == rpc.ErrMaybe) { - t.Fatalf("%d: put failed %v", me, err) - } - - // log.Printf("%d: release lock", me) - - lk.Release() - } - } - return kvtest.ClntRes{} -} - -// Run test clients -func runClients(t *testing.T, nclnt int, reliable bool) { - ts := kvsrv.MakeTestKV(t, reliable) - defer ts.Cleanup() - - ts.Begin(fmt.Sprintf("Test: %d lock clients", nclnt)) - - ts.SpawnClientsAndWait(nclnt, NSEC*time.Second, func(me int, myck kvtest.IKVClerk, done chan struct{}) kvtest.ClntRes { - return oneClient(t, me, myck, done) - }) -} - -func TestOneClientReliable(t *testing.T) { - runClients(t, 1, true) -} - -func TestManyClientsReliable(t *testing.T) { - runClients(t, NCLNT, true) -} - -func TestOneClientUnreliable(t *testing.T) { - runClients(t, 1, false) -} - -func TestManyClientsUnreliable(t *testing.T) { - runClients(t, NCLNT, false) -} diff --git a/src/shardkv1/shardctrler/param/param.go b/src/shardkv1/shardctrler/param/param.go deleted file mode 100644 index 8df0627..0000000 --- a/src/shardkv1/shardctrler/param/param.go +++ /dev/null @@ -1,7 +0,0 @@ -package param - -const ( - // Length of time that a lease is valid. If a client doesn't - // refresh the lease within this time, the lease will expire. - LEASETIMESEC = 3 -)