Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
neoppod
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
neoppod
Commits
2d7a1229
Commit
2d7a1229
authored
Jan 25, 2017
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
58f78727
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
54 additions
and
22 deletions
+54
-22
t/neo/marshal.go
t/neo/marshal.go
+1
-1
t/neo/proto_test.go
t/neo/proto_test.go
+20
-0
t/neo/protogen.go
t/neo/protogen.go
+33
-21
No files found.
t/neo/marshal.go
View file @
2d7a1229
...
...
@@ -2836,7 +2836,7 @@ func (p *CheckReplicas) NEODecode(data []byte) (int, error) {
l
:=
binary
.
BigEndian
.
Uint32
(
data
[
0
:
])
data
=
data
[
4
:
]
nread
+=
4
if
uint32
(
len
(
data
))
<
l
*
8
{
if
uint32
(
len
(
data
))
<
16
+
l
*
8
{
goto
overflow
}
nread
+=
l
*
8
...
...
t/neo/proto_test.go
View file @
2d7a1229
...
...
@@ -211,6 +211,26 @@ func TestPktMarshal(t *testing.T) {
u64
(
8
)
+
u64
(
7
)
+
u64
(
1
)
+
hex
(
"00"
),
},
// map[uint32]UUID + trailing ...
{
&
CheckReplicas
{
PartitionDict
:
map
[
uint32
]
UUID
{
1
:
7
,
2
:
9
,
7
:
3
,
4
:
17
,
},
MinTID
:
23
,
MaxTID
:
128
,
},
u32
(
4
)
+
u32
(
1
)
+
u32
(
7
)
+
u32
(
2
)
+
u32
(
9
)
+
u32
(
4
)
+
u32
(
17
)
+
u32
(
7
)
+
u32
(
3
)
+
u64
(
23
)
+
u64
(
128
),
},
// uint32, []uint32
{
&
PartitionCorrupted
{
7
,
[]
UUID
{
1
,
3
,
9
,
4
}},
u32
(
7
)
+
u32
(
4
)
+
u32
(
1
)
+
u32
(
3
)
+
u32
(
9
)
+
u32
(
4
),
...
...
t/neo/protogen.go
View file @
2d7a1229
...
...
@@ -13,7 +13,7 @@
// +build ignore
/*
NEO. Protocol
definition
. Code generator
NEO. Protocol
module
. Code generator
This program generates marshalling code for packet types defined in proto.go .
For every type 3 methods are generated in accordance with NEOEncoder and
...
...
@@ -27,7 +27,7 @@ List of packet types is obtained via searching through proto.go AST - looking
for appropriate struct declarations there.
Code generation for a type is organized via recursively walking through type's
(sub-)elements and generating specialized code on leaf items (
u
intX, slices,
(sub-)elements and generating specialized code on leaf items (intX, slices,
maps, ...).
Top-level generation driver is in generateCodecCode(). It accepts type
...
...
@@ -153,7 +153,7 @@ import (
}
}
// format & emit
buffer
ed code
// format & emit
generat
ed code
code
,
err
:=
format
.
Source
(
buf
.
Bytes
())
if
err
!=
nil
{
panic
(
err
)
// should not happen
...
...
@@ -245,7 +245,7 @@ type CodeGenerator interface {
// generate code to process a basic fixed type (not string)
// userType is type actually used in source (for which typ is underlying), or nil
// path is
TODO
// path is
associated data member (to read from or write to)
genBasic
(
path
string
,
typ
*
types
.
Basic
,
userType
types
.
Type
)
// generate code to process slice or map
...
...
@@ -268,6 +268,7 @@ type CodeGenerator interface {
// common part of codegenerators
type
commonCodeGen
struct
{
buf
Buffer
// code is emitted here
recvName
string
// receiver/type for top-level func
typeName
string
// or empty
typ
types
.
Type
...
...
@@ -285,7 +286,7 @@ func (c *commonCodeGen) setFunc(recvName, typeName string, typ types.Type) {
c
.
typ
=
typ
}
// get variable for varname (and automatically mark var as used)
// get variable for varname (and automatically mark
this
var as used)
func
(
c
*
commonCodeGen
)
var_
(
varname
string
)
string
{
if
c
.
varUsed
==
nil
{
c
.
varUsed
=
make
(
map
[
string
]
bool
)
...
...
@@ -294,7 +295,7 @@ func (c *commonCodeGen) var_(varname string) string {
return
varname
}
//
information about
symbolic size
// symbolic size
// consists of numeric & symbolic expression parts
// size is num + expr1 + expr2 + ...
type
SymSize
struct
{
...
...
@@ -337,35 +338,53 @@ func (s *SymSize) IsZero() bool {
return
s
.
num
==
0
&&
len
(
s
.
exprv
)
==
0
}
// XXX just use `... = SymSize{}` ?
func
(
s
*
SymSize
)
Reset
()
{
*
s
=
SymSize
{}
}
// sizeCodeGen generates code to compute encoded size of a packet
// XXX naming ok?
// XXX -> Gen_NEOEncodedLen ?
// sizeCodeGen generates code to compute encoded size of a packet
//
// when type is recursively walked for every case symbolic size is added appropriately
// in case when it was needed to generate loops runtime accumulator variable is additionally used
// result is: symbolic size + (optionally) runtime accumulator
type
sizeCodeGen
struct
{
commonCodeGen
size
SymSize
// currently accumulated packet size
}
// encoder generates code to encode a packet
//
// when type is recursively walked for every case code to update `data[n:]` is generated.
// no overflow checks are generated as by NEOEncoder interface provided data
// buffer should have at least NEOEncodedLen() length (the size computed by
// sizeCodeGen)
type
encoder
struct
{
commonCodeGen
n
int
// current write position in data
}
// decoder generates code to decode a packet
//
// when type is recursively walked for every case code to decode next item from
// `data[n:]` is generated.
//
// overflow checks and, when convenient, nread updates are grouped and emitted
// so that they are performed in the beginning of greedy fixed-wire-size
// blocks.
//
// TODO more text?
type
decoder
struct
{
commonCodeGen
// done buffer for generated code
// current delayed overflow check will be inserted in between buf
& bufDone
// current delayed overflow check will be inserted in between buf
Done & buf
bufDone
Buffer
// current read position in data.
n
int
n
int
// current read position in data.
// size that will be checked for overflow at current overflow check point
overflowCheckSize
SymSize
...
...
@@ -439,9 +458,9 @@ func (d *decoder) resetPos() {
//
// it is inserted
// - before reading variable sized item
// -
XXX in loops
?
// -
in the beginning of loop inside XXX ok
?
func
(
d
*
decoder
)
overflowCheckpoint
()
{
//d.buf.emit("// overflow check point")
//d.buf
Done
.emit("// overflow check point")
if
!
d
.
overflowCheckSize
.
IsZero
()
{
d
.
bufDone
.
emit
(
"if uint32(len(data)) < %v { goto overflow }"
,
&
d
.
overflowCheckSize
)
}
...
...
@@ -706,11 +725,6 @@ func (s *sizeCodeGen) genMap(path string, typ *types.Map, obj types.Object) {
curSize
.
AddExpr
(
"len(%v) * %v"
,
path
,
s
.
size
.
num
)
}
s
.
size
=
curSize
/*
s.emit("%v += %v", s.var_("size"), s.size)
s.emit("}")
*/
}
func
(
e
*
encoder
)
genMap
(
path
string
,
typ
*
types
.
Map
,
obj
types
.
Object
)
{
...
...
@@ -746,6 +760,7 @@ func (d *decoder) genMap(assignto string, typ *types.Map, obj types.Object) {
keySize
,
keyFixed
:=
typeSizeFixed
(
typ
.
Key
())
elemSize
,
elemFixed
:=
typeSizeFixed
(
typ
.
Elem
())
itemFixed
:=
keyFixed
&&
elemFixed
overflowCheckedCur
:=
d
.
overflowChecked
if
itemFixed
{
d
.
overflowCheckpoint
()
d
.
overflowCheckSize
.
AddExpr
(
"l * %v"
,
keySize
+
elemSize
)
...
...
@@ -788,10 +803,7 @@ func (d *decoder) genMap(assignto string, typ *types.Map, obj types.Object) {
d
.
emit
(
"}"
)
d
.
overflowCheckpoint
()
d
.
resetPos
()
//d.emit("%v= string(data[:l])", assignto)
d
.
overflowChecked
=
overflowCheckedCur
d
.
emit
(
"}"
)
}
...
...
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