Skip to content

Make the debug service more general to allow debugging of other servers #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sirnewton01 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make the debug service more general to allow debugging of other servers #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions filesystem/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ type FileServer struct {
}

var (
debug = flag.Int("debug", 0, "print debug messages")
root = flag.String("root", "/", "Set the root for all attaches")
)

Expand Down Expand Up @@ -450,8 +449,8 @@ func NewUFS(opts ...protocol.ServerOpt) (*protocol.Server, error) {
f.rootPath = *root // for now.
// any opts for the ufs layer can be added here too ...
var d protocol.NineServer = f
if *debug != 0 {
d = &debugFileServer{f}
if *protocol.Debug {
d = &protocol.DebugServer{f}
}
s, err := protocol.NewServer(d, opts...)
if err != nil {
Expand Down
63 changes: 33 additions & 30 deletions filesystem/debug.go → protocol/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,25 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package ufs
package protocol

import (
"bytes"
"flag"
"log"
)

"github.com/Harvey-OS/ninep/protocol"
var (
Debug = flag.Bool("debug", false, "print debug messages")
)

type debugFileServer struct {
*FileServer
type DebugServer struct {
NineServer
}

func (e *debugFileServer) Rversion(msize protocol.MaxSize, version string) (protocol.MaxSize, string, error) {
func (e *DebugServer) Rversion(msize MaxSize, version string) (MaxSize, string, error) {
log.Printf(">>> Tversion %v %v\n", msize, version)
msize, version, err := e.FileServer.Rversion(msize, version)
msize, version, err := e.NineServer.Rversion(msize, version)
if err == nil {
log.Printf("<<< Rversion %v %v\n", msize, version)
} else {
Expand All @@ -26,10 +29,10 @@ func (e *debugFileServer) Rversion(msize protocol.MaxSize, version string) (prot
return msize, version, err
}

func (e *debugFileServer) Rattach(fid protocol.FID, afid protocol.FID, uname string, aname string) (protocol.QID, error) {
func (e *DebugServer) Rattach(fid FID, afid FID, uname string, aname string) (QID, error) {
log.Printf(">>> Tattach fid %v, afid %v, uname %v, aname %v\n", fid, afid,
uname, aname)
qid, err := e.FileServer.Rattach(fid, afid, uname, aname)
qid, err := e.NineServer.Rattach(fid, afid, uname, aname)
if err == nil {
log.Printf("<<< Rattach %v\n", qid)
} else {
Expand All @@ -38,9 +41,9 @@ func (e *debugFileServer) Rattach(fid protocol.FID, afid protocol.FID, uname str
return qid, err
}

func (e *debugFileServer) Rflush(o protocol.Tag) error {
func (e *DebugServer) Rflush(o Tag) error {
log.Printf(">>> Tflush tag %v\n", o)
err := e.FileServer.Rflush(o)
err := e.NineServer.Rflush(o)
if err == nil {
log.Printf("<<< Rflush\n")
} else {
Expand All @@ -49,9 +52,9 @@ func (e *debugFileServer) Rflush(o protocol.Tag) error {
return err
}

func (e *debugFileServer) Rwalk(fid protocol.FID, newfid protocol.FID, paths []string) ([]protocol.QID, error) {
func (e *DebugServer) Rwalk(fid FID, newfid FID, paths []string) ([]QID, error) {
log.Printf(">>> Twalk fid %v, newfid %v, paths %v\n", fid, newfid, paths)
qid, err := e.FileServer.Rwalk(fid, newfid, paths)
qid, err := e.NineServer.Rwalk(fid, newfid, paths)
if err == nil {
log.Printf("<<< Rwalk %v\n", qid)
} else {
Expand All @@ -60,9 +63,9 @@ func (e *debugFileServer) Rwalk(fid protocol.FID, newfid protocol.FID, paths []s
return qid, err
}

func (e *debugFileServer) Ropen(fid protocol.FID, mode protocol.Mode) (protocol.QID, protocol.MaxSize, error) {
func (e *DebugServer) Ropen(fid FID, mode Mode) (QID, MaxSize, error) {
log.Printf(">>> Topen fid %v, mode %v\n", fid, mode)
qid, iounit, err := e.FileServer.Ropen(fid, mode)
qid, iounit, err := e.NineServer.Ropen(fid, mode)
if err == nil {
log.Printf("<<< Ropen %v %v\n", qid, iounit)
} else {
Expand All @@ -71,10 +74,10 @@ func (e *debugFileServer) Ropen(fid protocol.FID, mode protocol.Mode) (protocol.
return qid, iounit, err
}

func (e *debugFileServer) Rcreate(fid protocol.FID, name string, perm protocol.Perm, mode protocol.Mode) (protocol.QID, protocol.MaxSize, error) {
func (e *DebugServer) Rcreate(fid FID, name string, perm Perm, mode Mode) (QID, MaxSize, error) {
log.Printf(">>> Tcreate fid %v, name %v, perm %v, mode %v\n", fid, name,
perm, mode)
qid, iounit, err := e.FileServer.Rcreate(fid, name, perm, mode)
qid, iounit, err := e.NineServer.Rcreate(fid, name, perm, mode)
if err == nil {
log.Printf("<<< Rcreate %v %v\n", qid, iounit)
} else {
Expand All @@ -83,9 +86,9 @@ func (e *debugFileServer) Rcreate(fid protocol.FID, name string, perm protocol.P
return qid, iounit, err
}

func (e *debugFileServer) Rclunk(fid protocol.FID) error {
func (e *DebugServer) Rclunk(fid FID) error {
log.Printf(">>> Tclunk fid %v\n", fid)
err := e.FileServer.Rclunk(fid)
err := e.NineServer.Rclunk(fid)
if err == nil {
log.Printf("<<< Rclunk\n")
} else {
Expand All @@ -94,22 +97,22 @@ func (e *debugFileServer) Rclunk(fid protocol.FID) error {
return err
}

func (e *debugFileServer) Rstat(fid protocol.FID) ([]byte, error) {
func (e *DebugServer) Rstat(fid FID) ([]byte, error) {
log.Printf(">>> Tstat fid %v\n", fid)
b, err := e.FileServer.Rstat(fid)
b, err := e.NineServer.Rstat(fid)
if err == nil {
dir, _ := protocol.Unmarshaldir(bytes.NewBuffer(b))
dir, _ := Unmarshaldir(bytes.NewBuffer(b))
log.Printf("<<< Rstat %v\n", dir)
} else {
log.Printf("<<< Error %v\n", err)
}
return b, err
}

func (e *debugFileServer) Rwstat(fid protocol.FID, b []byte) error {
dir, _ := protocol.Unmarshaldir(bytes.NewBuffer(b))
func (e *DebugServer) Rwstat(fid FID, b []byte) error {
dir, _ := Unmarshaldir(bytes.NewBuffer(b))
log.Printf(">>> Twstat fid %v, %v\n", fid, dir)
err := e.FileServer.Rwstat(fid, b)
err := e.NineServer.Rwstat(fid, b)
if err == nil {
log.Printf("<<< Rwstat\n")
} else {
Expand All @@ -118,9 +121,9 @@ func (e *debugFileServer) Rwstat(fid protocol.FID, b []byte) error {
return err
}

func (e *debugFileServer) Rremove(fid protocol.FID) error {
func (e *DebugServer) Rremove(fid FID) error {
log.Printf(">>> Tremove fid %v\n", fid)
err := e.FileServer.Rremove(fid)
err := e.NineServer.Rremove(fid)
if err == nil {
log.Printf("<<< Rremove\n")
} else {
Expand All @@ -129,9 +132,9 @@ func (e *debugFileServer) Rremove(fid protocol.FID) error {
return err
}

func (e *debugFileServer) Rread(fid protocol.FID, o protocol.Offset, c protocol.Count) ([]byte, error) {
func (e *DebugServer) Rread(fid FID, o Offset, c Count) ([]byte, error) {
log.Printf(">>> Tread fid %v, off %v, count %v\n", fid, o, c)
b, err := e.FileServer.Rread(fid, o, c)
b, err := e.NineServer.Rread(fid, o, c)
if err == nil {
log.Printf("<<< Rread %v\n", len(b))
} else {
Expand All @@ -140,9 +143,9 @@ func (e *debugFileServer) Rread(fid protocol.FID, o protocol.Offset, c protocol.
return b, err
}

func (e *debugFileServer) Rwrite(fid protocol.FID, o protocol.Offset, b []byte) (protocol.Count, error) {
func (e *DebugServer) Rwrite(fid FID, o Offset, b []byte) (Count, error) {
log.Printf(">>> Twrite fid %v, off %v, count %v\n", fid, o, len(b))
c, err := e.FileServer.Rwrite(fid, o, b)
c, err := e.NineServer.Rwrite(fid, o, b)
if err == nil {
log.Printf("<<< Rwrite %v\n", c)
} else {
Expand Down