[fidl] Continuing the migration
Changing socket server to use the new Go runtime methods.
At the same time, changing the codegen to use DispatchNew, instead of the
now deprecated Dispatch.
Change-Id: Ib4ea33889163ebd3718c183f04e7179697f6ba04
diff --git a/garnet/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go b/garnet/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go
index 65d2f36..dcbbf9b 100644
--- a/garnet/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go
+++ b/garnet/go/src/fidl/compiler/backend/golang/templates/interface.tmpl.go
@@ -171,10 +171,6 @@
Impl {{ .Name }}
}
-func (s *{{ .StubName }}) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *{{ .StubName }}) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
{{- range .Methods }}
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json.go.golden
index 71dd9e1..5a05051 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json.go.golden
+++ b/garnet/go/src/fidl/compiler/backend/goldens/doc_comments.test.fidl.json.go.golden
@@ -153,10 +153,6 @@
Impl Interface
}
-func (s *InterfaceStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *InterfaceStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case InterfaceMethodOrdinal:
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/ordinal_switch.test.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/goldens/ordinal_switch.test.fidl.json.go.golden
index 55630b34..4a6fe24 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/ordinal_switch.test.fidl.json.go.golden
+++ b/garnet/go/src/fidl/compiler/backend/goldens/ordinal_switch.test.fidl.json.go.golden
@@ -69,10 +69,6 @@
Impl SwitchingOrdinals
}
-func (s *SwitchingOrdinalsStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *SwitchingOrdinalsStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case SwitchingOrdinalsOrdinalFiveOrdinal:
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json.go.golden
index 533f05d..786e5b8 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json.go.golden
+++ b/garnet/go/src/fidl/compiler/backend/goldens/protocol_request.test.fidl.json.go.golden
@@ -35,10 +35,6 @@
Impl Child
}
-func (s *ChildStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *ChildStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
}
@@ -171,10 +167,6 @@
Impl Parent
}
-func (s *ParentStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *ParentStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case ParentGetChildOrdinal:
diff --git a/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json.go.golden b/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json.go.golden
index 691838e..d842807 100644
--- a/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json.go.golden
+++ b/garnet/go/src/fidl/compiler/backend/goldens/protocols.test.fidl.json.go.golden
@@ -270,10 +270,6 @@
Impl WithAndWithoutRequestResponse
}
-func (s *WithAndWithoutRequestResponseStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *WithAndWithoutRequestResponseStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case WithAndWithoutRequestResponseNoRequestNoResponseOrdinal:
@@ -406,10 +402,6 @@
Impl WithErrorSyntax
}
-func (s *WithErrorSyntaxStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *WithErrorSyntaxStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case WithErrorSyntaxErrorAsPrimitiveOrdinal:
@@ -580,10 +572,6 @@
Impl OvernetInternalProtocol
}
-func (s *OvernetInternalProtocolStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *OvernetInternalProtocolStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case OvernetInternalProtocolMethodAOrdinal:
@@ -770,10 +758,6 @@
Impl SocketControlProtocol
}
-func (s *SocketControlProtocolStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *SocketControlProtocolStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case SocketControlProtocolMethodAOrdinal:
@@ -954,10 +938,6 @@
Impl ChannelProtocol
}
-func (s *ChannelProtocolStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *ChannelProtocolStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case ChannelProtocolMethodAOrdinal:
@@ -1150,10 +1130,6 @@
Impl KitchenSink
}
-func (s *KitchenSinkStub) Dispatch(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Payload, error) {
- return s.DispatchNew(ord, b_, h_)
-}
-
func (s *KitchenSinkStub) DispatchNew(ord uint32, b_ []byte, h_ []_zx.Handle) (_bindings.Message, error) {
switch ord {
case KitchenSinkMethodAOrdinal:
diff --git a/src/connectivity/network/netstack/socket_server.go b/src/connectivity/network/netstack/socket_server.go
index 2e5748b..2b47baf 100644
--- a/src/connectivity/network/netstack/socket_server.go
+++ b/src/connectivity/network/netstack/socket_server.go
@@ -397,15 +397,15 @@
msg := respb[:nb]
var header fidl.MessageHeader
- if err := fidl.UnmarshalHeader(msg, &header); err != nil {
+ if _, _, err := fidl.UnmarshalNew(msg, nil, &header); err != nil {
return err
}
- p, err := stub.Dispatch(header.Ordinal, msg[fidl.MessageHeaderSize:], nil)
+ p, err := stub.DispatchNew(header.Ordinal, msg[fidl.MessageHeaderSize:], nil)
if err != nil {
return err
}
- cnb, _, err := fidl.MarshalMessage(&header, p, respb[:], nil)
+ cnb, _, err := fidl.MarshalHeaderThenMessage(&header, p, respb[:], nil)
if err != nil {
return err
}
