Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
go-fuse
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
go-fuse
Commits
18ff28f7
Commit
18ff28f7
authored
May 16, 2012
by
Han-Wen Nienhuys
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use fixed buffer for response header data.
This saves one alloc per request.
parent
88db6cd5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
23 deletions
+27
-23
fuse/mountstate.go
fuse/mountstate.go
+7
-11
fuse/opcode.go
fuse/opcode.go
+8
-0
fuse/request.go
fuse/request.go
+12
-12
No files found.
fuse/mountstate.go
View file @
18ff28f7
...
...
@@ -242,8 +242,8 @@ func (ms *MountState) handleRequest(req *request) {
errNo
:=
ms
.
write
(
req
)
if
errNo
!=
0
{
log
.
Printf
(
"writer: Write/Writev
%v
failed, err: %v. opcode: %v"
,
req
.
outHeaderBytes
,
errNo
,
operationName
(
req
.
inHeader
.
Opcode
))
log
.
Printf
(
"writer: Write/Writev failed, err: %v. opcode: %v"
,
errNo
,
operationName
(
req
.
inHeader
.
Opcode
))
}
}
...
...
@@ -253,7 +253,7 @@ func (ms *MountState) write(req *request) Status {
return
OK
}
req
.
serialize
()
header
,
data
:=
req
.
serialize
()
if
ms
.
Debug
{
log
.
Println
(
req
.
OutputDebug
())
}
...
...
@@ -262,16 +262,14 @@ func (ms *MountState) write(req *request) Status {
req
.
preWriteNs
=
time
.
Now
()
.
UnixNano
()
}
if
req
.
outHeaderBytes
==
nil
{
if
header
==
nil
{
return
OK
}
var
err
error
if
req
.
flatD
ata
==
nil
{
_
,
err
=
ms
.
mountFile
.
Write
(
req
.
outHeaderBytes
)
if
d
ata
==
nil
{
_
,
err
=
ms
.
mountFile
.
Write
(
header
)
}
else
{
_
,
err
=
Writev
(
int
(
ms
.
mountFile
.
Fd
()),
[][]
byte
{
req
.
outHeaderBytes
,
req
.
flatData
})
_
,
err
=
Writev
(
int
(
ms
.
mountFile
.
Fd
()),
[][]
byte
{
header
,
data
})
}
return
ToStatus
(
err
)
...
...
@@ -286,7 +284,6 @@ func (ms *MountState) writeInodeNotify(entry *raw.NotifyInvalInodeOut) Status {
status
:
raw
.
NOTIFY_INVAL_INODE
,
}
req
.
outData
=
unsafe
.
Pointer
(
entry
)
req
.
serialize
()
result
:=
ms
.
write
(
&
req
)
if
ms
.
Debug
{
...
...
@@ -313,7 +310,6 @@ func (ms *MountState) writeEntryNotify(parent uint64, name string) Status {
nameBytes
:=
[]
byte
(
name
+
"
\0
00"
)
req
.
outData
=
unsafe
.
Pointer
(
entry
)
req
.
flatData
=
nameBytes
req
.
serialize
()
result
:=
ms
.
write
(
&
req
)
if
ms
.
Debug
{
...
...
fuse/opcode.go
View file @
18ff28f7
...
...
@@ -579,4 +579,12 @@ func init() {
}
{
operationHandlers
[
op
]
.
FileNames
=
count
}
var
r
request
sizeOfOutHeader
:=
unsafe
.
Sizeof
(
raw
.
OutHeader
{})
for
code
,
h
:=
range
operationHandlers
{
if
h
.
OutputSize
+
sizeOfOutHeader
>
unsafe
.
Sizeof
(
r
.
outBuf
)
{
log
.
Panicf
(
"request output buffer too small: code %v, sz %d + %d %v"
,
code
,
h
.
OutputSize
,
sizeOfOutHeader
,
h
)
}
}
}
fuse/request.go
View file @
18ff28f7
...
...
@@ -40,9 +40,9 @@ type request struct {
status
Status
flatData
[]
byte
//
Header + structured data for what we send back to the kernel.
//
May be followed by flatData
.
out
HeaderBytes
[
]
byte
//
Space to keep header + structured data for what we send
//
back to the kernel
.
out
Buf
[
160
]
byte
// Start timestamp for timing info.
startNs
int64
...
...
@@ -84,7 +84,7 @@ func (r *request) OutputDebug() string {
max
:=
1024
if
len
(
dataStr
)
>
max
{
dataStr
=
dataStr
[
:
max
]
+
fmt
.
Sprintf
(
" ...trimmed
(response size %d)"
,
len
(
r
.
outHeaderBytes
)
)
dataStr
=
dataStr
[
:
max
]
+
fmt
.
Sprintf
(
" ...trimmed
"
)
}
flatStr
:=
""
...
...
@@ -160,20 +160,20 @@ func (r *request) parse() {
}
}
func
(
r
*
request
)
serialize
()
{
func
(
r
*
request
)
serialize
()
(
header
[]
byte
,
data
[]
byte
)
{
dataLength
:=
r
.
handler
.
OutputSize
if
r
.
outData
==
nil
||
r
.
status
>
OK
{
dataLength
=
0
}
sizeOfOutHeader
:=
unsafe
.
Sizeof
(
raw
.
OutHeader
{})
r
.
outHeaderBytes
=
make
([]
byte
,
sizeOfOutHeader
+
dataLength
)
outHeader
:=
(
*
raw
.
OutHeader
)(
unsafe
.
Pointer
(
&
r
.
outHeaderBytes
[
0
]))
outHeader
.
Unique
=
r
.
inHeader
.
Unique
outHeader
.
Status
=
int32
(
-
r
.
status
)
outHeader
.
Length
=
uint32
(
header
=
r
.
outBuf
[
:
sizeOfOutHeader
+
dataLength
]
o
:=
(
*
raw
.
OutHeader
)(
unsafe
.
Pointer
(
&
header
[
0
]))
o
.
Unique
=
r
.
inHeader
.
Unique
o
.
Status
=
int32
(
-
r
.
status
)
o
.
Length
=
uint32
(
int
(
sizeOfOutHeader
)
+
int
(
dataLength
)
+
int
(
len
(
r
.
flatData
)))
copy
(
r
.
outHeaderBytes
[
sizeOfOutHeader
:
],
asSlice
(
r
.
outData
,
dataLength
))
copy
(
header
[
sizeOfOutHeader
:
],
asSlice
(
r
.
outData
,
dataLength
))
return
header
,
r
.
flatData
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment