lib9p

commit 779b0b956b2b3c8ccd11c112c616544993a9b122
parent c52d24ecf6e7b645710d7611cf362cbe26a7fbed
Author: Matsuda Kenji <info@mtkn.jp>
Date:   Sun, 20 Aug 2023 12:42:55 +0900

rename methods of FidPool

Diffstat:
M
pool.go
 | 
8
++++----
M
server.go
 | 
22
+++++++++++-----------

2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pool.go b/pool.go
@@ -60,12 +60,12 @@ func allocFidPool() *FidPool {
 	return f
 }
 
-func (pool *FidPool) lookupFid(fid uint32) (*Fid, bool) {
+func (pool *FidPool) lookup(fid uint32) (*Fid, bool) {
 	f, ok := pool.m[fid]
 	return f, ok
 }
 
-func (pool *FidPool) allocFid(fid uint32) (*Fid, error) {
+func (pool *FidPool) alloc(fid uint32) (*Fid, error) {
 	if _, ok := pool.m[fid]; ok {
 		return nil, fmt.Errorf("fid already in use.")
 	}
@@ -74,8 +74,8 @@ func (pool *FidPool) allocFid(fid uint32) (*Fid, error) {
 	return f, nil
 }
 
-func (pool *FidPool) removeFid(fid uint32) *Fid {
-	f, ok := pool.lookupFid(fid)
+func (pool *FidPool) delete(fid uint32) *Fid {
+	f, ok := pool.lookup(fid)
 	if !ok {
 		return nil
 	}
diff --git a/server.go b/server.go
@@ -126,7 +126,7 @@ func rAuth(r *Req, err error) {
 
 func sAttach(s *Server, r *Req) {
 	ifcall := r.ifcall.(*TAttach)
-	fid, err := s.fPool.allocFid(ifcall.Fid())
+	fid, err := s.fPool.alloc(ifcall.Fid())
 	if err != nil {
 		respond(r, fmt.Errorf("duplicate fid"))
 		return
@@ -162,19 +162,19 @@ func rAttach(r *Req, err error) {}
 
 func sWalk(s *Server, r *Req) {
 	ifcall := r.ifcall.(*TWalk)
-	oldFid, ok := s.fPool.lookupFid(ifcall.Fid())
+	oldFid, ok := s.fPool.lookup(ifcall.Fid())
 	if !ok {
 		respond(r, fmt.Errorf("unknown fid"))
 		return
 	}
-	_, ok = s.fPool.lookupFid(ifcall.NewFid())
+	_, ok = s.fPool.lookup(ifcall.NewFid())
 	if ok {
 		respond(r, fmt.Errorf("duplicate fid"))
 		return
 	}
-	newFid, err := s.fPool.allocFid(ifcall.NewFid())
+	newFid, err := s.fPool.alloc(ifcall.NewFid())
 	if err != nil {
-		log.Printf("allocFid: %v", err)
+		log.Printf("alloc: %v", err)
 		respond(r, fmt.Errorf("internal error"))
 		return
 	}
@@ -182,7 +182,7 @@ func sWalk(s *Server, r *Req) {
 	wqids, err := s.fs.walk(oldFid.File.path, ifcall.WName())
 	if err != nil {
 		log.Printf("unko\n")
-		s.fPool.removeFid(ifcall.NewFid())
+		s.fPool.delete(ifcall.NewFid())
 		log.Printf("walk fs: %v", err)
 		respond(r, fmt.Errorf("walk error"))
 		return
@@ -223,7 +223,7 @@ func sOpen(s *Server, r *Req) {
 		panic("not TOpen")
 	}
 	fidNum := ifcall.Fid()
-	fidStruct, ok := s.fPool.lookupFid(fidNum)
+	fidStruct, ok := s.fPool.lookup(fidNum)
 	if !ok {
 		respond(r, fmt.Errorf("unknown fid"))
 		return
@@ -290,7 +290,7 @@ func rOpen(r *Req, err error) {}
 func sRead(s *Server, r *Req) {
 	ifcall := r.ifcall.(*TRead)
 
-	fid, ok := s.fPool.lookupFid(ifcall.Fid())
+	fid, ok := s.fPool.lookup(ifcall.Fid())
 	if !ok {
 		respond(r, fmt.Errorf("unknown fid"))
 		return
@@ -361,12 +361,12 @@ func rRead(r *Req, err error) {}
 
 func sClunk(s *Server, r *Req) {
 	ifcall := r.ifcall.(*TClunk)
-	_, ok := s.fPool.lookupFid(ifcall.Fid())
+	_, ok := s.fPool.lookup(ifcall.Fid())
 	if !ok {
 		respond(r, fmt.Errorf("unknown fid"))
 		return
 	}
-	s.fPool.removeFid(ifcall.Fid())
+	s.fPool.delete(ifcall.Fid())
 	r.ofcall = &RClunk{
 		tag: ifcall.Tag(),
 	}
@@ -386,7 +386,7 @@ func rError(r *Req, err error) {
 func sStat(s *Server, r *Req) {
 	ifcall := r.ifcall.(*TStat)
 	fidNum := ifcall.Fid()
-	fidStruct, ok := s.fPool.lookupFid(fidNum)
+	fidStruct, ok := s.fPool.lookup(fidNum)
 	if !ok {
 		respond(r, fmt.Errorf("unknown fid %d", fidNum))
 		return