vfs: decode flags in Open/OpenFile for debug

This commit is contained in:
Nick Craig-Wood 2017-11-14 21:00:08 +00:00
parent f5f8c0c438
commit e7f2935333
3 changed files with 39 additions and 2 deletions

View File

@ -319,6 +319,7 @@ func (f *File) VFS() *VFS {
// //
// We ignore O_SYNC and O_EXCL // We ignore O_SYNC and O_EXCL
func (f *File) Open(flags int) (fd Handle, err error) { func (f *File) Open(flags int) (fd Handle, err error) {
defer fs.Trace(f, "flags=%s", decodeOpenFlags(flags))("fd=%v, err=%v", &fd, &err)
var ( var (
write bool // if set need write support write bool // if set need write support
read bool // if set need read support read bool // if set need read support

View File

@ -95,8 +95,7 @@ func (fh *RWFileHandle) openPending(truncate bool) (err error) {
if rdwrMode != os.O_RDONLY { if rdwrMode != os.O_RDONLY {
fh.file.addWriters(1) fh.file.addWriters(1)
} }
fs.Debugf(fh.remote, "Opening cached copy with flags=%s", decodeOpenFlags(fh.flags))
fs.Debugf(fh.remote, "Opening cached copy with flags=0x%02X", fh.flags)
fd, err := os.OpenFile(fh.osPath, fh.flags|os.O_CREATE, 0600) fd, err := os.OpenFile(fh.osPath, fh.flags|os.O_CREATE, 0600)
if err != nil { if err != nil {
return errors.Wrap(err, "cache open file failed") return errors.Wrap(err, "cache open file failed")

View File

@ -306,8 +306,45 @@ func (vfs *VFS) StatParent(name string) (dir *Dir, leaf string, err error) {
return dir, leaf, nil return dir, leaf, nil
} }
// decodeOpenFlags returns a string representing the open flags
func decodeOpenFlags(flags int) string {
var out []string
rdwrMode := flags & accessModeMask
switch rdwrMode {
case os.O_RDONLY:
out = append(out, "O_RDONLY")
case os.O_WRONLY:
out = append(out, "O_WRONLY")
case os.O_RDWR:
out = append(out, "O_RDWR")
default:
out = append(out, fmt.Sprintf("0x%X", rdwrMode))
}
if flags&os.O_APPEND != 0 {
out = append(out, "O_APPEND")
}
if flags&os.O_CREATE != 0 {
out = append(out, "O_CREATE")
}
if flags&os.O_EXCL != 0 {
out = append(out, "O_EXCL")
}
if flags&os.O_SYNC != 0 {
out = append(out, "O_SYNC")
}
if flags&os.O_TRUNC != 0 {
out = append(out, "O_TRUNC")
}
flags &^= accessModeMask | os.O_APPEND | os.O_CREATE | os.O_EXCL | os.O_SYNC | os.O_TRUNC
if flags != 0 {
out = append(out, fmt.Sprintf("0x%X", flags))
}
return strings.Join(out, "|")
}
// OpenFile a file according to the flags and perm provided // OpenFile a file according to the flags and perm provided
func (vfs *VFS) OpenFile(name string, flags int, perm os.FileMode) (fd Handle, err error) { func (vfs *VFS) OpenFile(name string, flags int, perm os.FileMode) (fd Handle, err error) {
defer fs.Trace(name, "flags=%s, perm=%v", decodeOpenFlags(flags), perm)("fd=%v, err=%v", &fd, &err)
node, err := vfs.Stat(name) node, err := vfs.Stat(name)
if err != nil { if err != nil {
if err != ENOENT || flags&os.O_CREATE == 0 { if err != ENOENT || flags&os.O_CREATE == 0 {