veryon2/naming: Pipe contexts through the mounttable client library.
In the process I had to move the context into its own package. I
think this is OK because ServerContext, of which the context should be
a subset, only depends on security currently, and security already has
the problem that it can't depend on anything. So I think there is
actually a fair shot that we will not have to add problematic
dependencies to the context type.
I'm happy to take suggestions about the name of the type (currently
it's context.T).
Change-Id: I89529de4e881e6ee7d692796a3c37f3f339214c4
diff --git a/examples/boxes/android/src/boxesp2p/main.go b/examples/boxes/android/src/boxesp2p/main.go
index b9938ed..e2359d9 100644
--- a/examples/boxes/android/src/boxesp2p/main.go
+++ b/examples/boxes/android/src/boxesp2p/main.go
@@ -151,7 +151,7 @@
if err != nil {
panic(fmt.Errorf("Failed to Bind Store:%v", err))
}
- var ctx ipc.Context
+ ctx := gs.runtime.NewContext()
req := watch.Request{Query: query.Query{}}
stream, err := rst.Watch(ctx, req, veyron2.CallTimeout(ipc.NoTimeout))
if err != nil {
@@ -200,7 +200,7 @@
func (gs *goState) updateStore(endpoint string) {
initSyncService(endpoint)
- var ctx ipc.Context
+ ctx := gs.runtime.NewContext()
vst, err := vstore.New(gs.storeEndpoint)
if err != nil {
panic(fmt.Errorf("Failed to init veyron store:%v", err))
diff --git a/examples/boxes/boxes.vdl.go b/examples/boxes/boxes.vdl.go
index f8ef8cd..f6a561c 100644
--- a/examples/boxes/boxes.vdl.go
+++ b/examples/boxes/boxes.vdl.go
@@ -8,6 +8,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -30,9 +31,9 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type BoxSignalling_ExcludingUniversal interface {
// Add endpoint information to the signalling server.
- Add(ctx _gen_ipc.Context, Endpoint string, opts ..._gen_ipc.CallOpt) (err error)
+ Add(ctx _gen_context.T, Endpoint string, opts ..._gen_ipc.CallOpt) (err error)
// Get endpoint information about a peer.
- Get(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply string, err error)
+ Get(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply string, err error)
}
type BoxSignalling interface {
_gen_ipc.UniversalServiceMethods
@@ -91,7 +92,7 @@
name string
}
-func (__gen_c *clientStubBoxSignalling) Add(ctx _gen_ipc.Context, Endpoint string, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubBoxSignalling) Add(ctx _gen_context.T, Endpoint string, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Add", []interface{}{Endpoint}, opts...); err != nil {
return
@@ -102,7 +103,7 @@
return
}
-func (__gen_c *clientStubBoxSignalling) Get(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply string, err error) {
+func (__gen_c *clientStubBoxSignalling) Get(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Get", nil, opts...); err != nil {
return
@@ -113,7 +114,7 @@
return
}
-func (__gen_c *clientStubBoxSignalling) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubBoxSignalling) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -124,7 +125,7 @@
return
}
-func (__gen_c *clientStubBoxSignalling) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubBoxSignalling) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -135,7 +136,7 @@
return
}
-func (__gen_c *clientStubBoxSignalling) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubBoxSignalling) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
@@ -225,10 +226,10 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type DrawInterface_ExcludingUniversal interface {
// Draw is used to send/receive a stream of boxes to another peer
- Draw(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply DrawInterfaceDrawStream, err error)
+ Draw(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply DrawInterfaceDrawStream, err error)
// SyncBoxes is used to setup a sync service over store to send/receive
// boxes to another peer
- SyncBoxes(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ SyncBoxes(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
}
type DrawInterface interface {
_gen_ipc.UniversalServiceMethods
@@ -369,7 +370,7 @@
name string
}
-func (__gen_c *clientStubDrawInterface) Draw(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply DrawInterfaceDrawStream, err error) {
+func (__gen_c *clientStubDrawInterface) Draw(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply DrawInterfaceDrawStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Draw", nil, opts...); err != nil {
return
@@ -378,7 +379,7 @@
return
}
-func (__gen_c *clientStubDrawInterface) SyncBoxes(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubDrawInterface) SyncBoxes(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "SyncBoxes", nil, opts...); err != nil {
return
@@ -389,7 +390,7 @@
return
}
-func (__gen_c *clientStubDrawInterface) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubDrawInterface) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -400,7 +401,7 @@
return
}
-func (__gen_c *clientStubDrawInterface) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubDrawInterface) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -411,7 +412,7 @@
return
}
-func (__gen_c *clientStubDrawInterface) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubDrawInterface) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/fortune/fortune.vdl.go b/examples/fortune/fortune.vdl.go
index 09f5323..ddce22e 100644
--- a/examples/fortune/fortune.vdl.go
+++ b/examples/fortune/fortune.vdl.go
@@ -8,6 +8,7 @@
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -21,9 +22,9 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type Fortune_ExcludingUniversal interface {
// Get returns a random fortune.
- Get(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply string, err error)
+ Get(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply string, err error)
// Add stores a fortune in the set used by Get.
- Add(ctx _gen_ipc.Context, Fortune string, opts ..._gen_ipc.CallOpt) (err error)
+ Add(ctx _gen_context.T, Fortune string, opts ..._gen_ipc.CallOpt) (err error)
}
type Fortune interface {
_gen_ipc.UniversalServiceMethods
@@ -82,7 +83,7 @@
name string
}
-func (__gen_c *clientStubFortune) Get(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply string, err error) {
+func (__gen_c *clientStubFortune) Get(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Get", nil, opts...); err != nil {
return
@@ -93,7 +94,7 @@
return
}
-func (__gen_c *clientStubFortune) Add(ctx _gen_ipc.Context, Fortune string, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubFortune) Add(ctx _gen_context.T, Fortune string, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Add", []interface{}{Fortune}, opts...); err != nil {
return
@@ -104,7 +105,7 @@
return
}
-func (__gen_c *clientStubFortune) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubFortune) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -115,7 +116,7 @@
return
}
-func (__gen_c *clientStubFortune) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubFortune) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -126,7 +127,7 @@
return
}
-func (__gen_c *clientStubFortune) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubFortune) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/inspector/inspector.vdl.go b/examples/inspector/inspector.vdl.go
index ede2f60..ba04668 100644
--- a/examples/inspector/inspector.vdl.go
+++ b/examples/inspector/inspector.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -29,8 +30,8 @@
// Inspector_ExcludingUniversal is the interface without internal framework-added methods
// to enable embedding without method collisions. Not to be used directly by clients.
type Inspector_ExcludingUniversal interface {
- Ls(ctx _gen_ipc.Context, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsStream, err error)
- LsDetails(ctx _gen_ipc.Context, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsDetailsStream, err error)
+ Ls(ctx _gen_context.T, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsStream, err error)
+ LsDetails(ctx _gen_context.T, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsDetailsStream, err error)
}
type Inspector interface {
_gen_ipc.UniversalServiceMethods
@@ -194,7 +195,7 @@
name string
}
-func (__gen_c *clientStubInspector) Ls(ctx _gen_ipc.Context, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsStream, err error) {
+func (__gen_c *clientStubInspector) Ls(ctx _gen_context.T, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Ls", []interface{}{Glob}, opts...); err != nil {
return
@@ -203,7 +204,7 @@
return
}
-func (__gen_c *clientStubInspector) LsDetails(ctx _gen_ipc.Context, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsDetailsStream, err error) {
+func (__gen_c *clientStubInspector) LsDetails(ctx _gen_context.T, Glob string, opts ..._gen_ipc.CallOpt) (reply InspectorLsDetailsStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "LsDetails", []interface{}{Glob}, opts...); err != nil {
return
@@ -212,7 +213,7 @@
return
}
-func (__gen_c *clientStubInspector) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubInspector) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -223,7 +224,7 @@
return
}
-func (__gen_c *clientStubInspector) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubInspector) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -234,7 +235,7 @@
return
}
-func (__gen_c *clientStubInspector) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubInspector) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/pipetobrowser/p2b.vdl.go b/examples/pipetobrowser/p2b.vdl.go
index b9bd36f..7e2719d 100644
--- a/examples/pipetobrowser/p2b.vdl.go
+++ b/examples/pipetobrowser/p2b.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -19,7 +20,7 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type Viewer_ExcludingUniversal interface {
// Pipe creates a bidirectional pipe between client and viewer service, returns a success message provided by the client
- Pipe(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply ViewerPipeStream, err error)
+ Pipe(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply ViewerPipeStream, err error)
}
type Viewer interface {
_gen_ipc.UniversalServiceMethods
@@ -141,7 +142,7 @@
name string
}
-func (__gen_c *clientStubViewer) Pipe(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply ViewerPipeStream, err error) {
+func (__gen_c *clientStubViewer) Pipe(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply ViewerPipeStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Pipe", nil, opts...); err != nil {
return
@@ -150,7 +151,7 @@
return
}
-func (__gen_c *clientStubViewer) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubViewer) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -161,7 +162,7 @@
return
}
-func (__gen_c *clientStubViewer) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubViewer) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -172,7 +173,7 @@
return
}
-func (__gen_c *clientStubViewer) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubViewer) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/rockpaperscissors/common/common.go b/examples/rockpaperscissors/common/common.go
index 8b3850d..63bbadd 100644
--- a/examples/rockpaperscissors/common/common.go
+++ b/examples/rockpaperscissors/common/common.go
@@ -11,6 +11,7 @@
rps "veyron/examples/rockpaperscissors"
"veyron2/naming"
+ "veyron2/rt"
"veyron2/vlog"
)
@@ -69,7 +70,7 @@
func findAll(mt naming.MountTable, t string) ([]string, error) {
start := time.Now()
- c, err := mt.Glob("rps/" + t + "/*")
+ c, err := mt.Glob(rt.R().TODOContext(), "rps/"+t+"/*")
if err != nil {
vlog.Infof("mt.Glob failed: %v", err)
return nil, err
diff --git a/examples/rockpaperscissors/service.vdl.go b/examples/rockpaperscissors/service.vdl.go
index 3b2c8cd..2e23af2 100644
--- a/examples/rockpaperscissors/service.vdl.go
+++ b/examples/rockpaperscissors/service.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -84,9 +85,9 @@
type Judge_ExcludingUniversal interface {
// CreateGame creates a new game with the given game options and returns a game
// identifier that can be used by the players to join the game.
- CreateGame(ctx _gen_ipc.Context, Opts GameOptions, opts ..._gen_ipc.CallOpt) (reply GameID, err error)
+ CreateGame(ctx _gen_context.T, Opts GameOptions, opts ..._gen_ipc.CallOpt) (reply GameID, err error)
// Play lets a player join an existing game and play.
- Play(ctx _gen_ipc.Context, ID GameID, opts ..._gen_ipc.CallOpt) (reply JudgePlayStream, err error)
+ Play(ctx _gen_context.T, ID GameID, opts ..._gen_ipc.CallOpt) (reply JudgePlayStream, err error)
}
type Judge interface {
_gen_ipc.UniversalServiceMethods
@@ -227,7 +228,7 @@
name string
}
-func (__gen_c *clientStubJudge) CreateGame(ctx _gen_ipc.Context, Opts GameOptions, opts ..._gen_ipc.CallOpt) (reply GameID, err error) {
+func (__gen_c *clientStubJudge) CreateGame(ctx _gen_context.T, Opts GameOptions, opts ..._gen_ipc.CallOpt) (reply GameID, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "CreateGame", []interface{}{Opts}, opts...); err != nil {
return
@@ -238,7 +239,7 @@
return
}
-func (__gen_c *clientStubJudge) Play(ctx _gen_ipc.Context, ID GameID, opts ..._gen_ipc.CallOpt) (reply JudgePlayStream, err error) {
+func (__gen_c *clientStubJudge) Play(ctx _gen_context.T, ID GameID, opts ..._gen_ipc.CallOpt) (reply JudgePlayStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Play", []interface{}{ID}, opts...); err != nil {
return
@@ -247,7 +248,7 @@
return
}
-func (__gen_c *clientStubJudge) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubJudge) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -258,7 +259,7 @@
return
}
-func (__gen_c *clientStubJudge) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubJudge) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -269,7 +270,7 @@
return
}
-func (__gen_c *clientStubJudge) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubJudge) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
@@ -416,7 +417,7 @@
type Player_ExcludingUniversal interface {
// Challenge is used by other players to challenge this player to a game. If
// the challenge is accepted, the method returns nil.
- Challenge(ctx _gen_ipc.Context, Address string, ID GameID, opts ..._gen_ipc.CallOpt) (err error)
+ Challenge(ctx _gen_context.T, Address string, ID GameID, opts ..._gen_ipc.CallOpt) (err error)
}
type Player interface {
_gen_ipc.UniversalServiceMethods
@@ -474,7 +475,7 @@
name string
}
-func (__gen_c *clientStubPlayer) Challenge(ctx _gen_ipc.Context, Address string, ID GameID, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubPlayer) Challenge(ctx _gen_context.T, Address string, ID GameID, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Challenge", []interface{}{Address, ID}, opts...); err != nil {
return
@@ -485,7 +486,7 @@
return
}
-func (__gen_c *clientStubPlayer) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubPlayer) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -496,7 +497,7 @@
return
}
-func (__gen_c *clientStubPlayer) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubPlayer) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -507,7 +508,7 @@
return
}
-func (__gen_c *clientStubPlayer) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubPlayer) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
@@ -588,7 +589,7 @@
// ScoreKeeper_ExcludingUniversal is the interface without internal framework-added methods
// to enable embedding without method collisions. Not to be used directly by clients.
type ScoreKeeper_ExcludingUniversal interface {
- Record(ctx _gen_ipc.Context, Score ScoreCard, opts ..._gen_ipc.CallOpt) (err error)
+ Record(ctx _gen_context.T, Score ScoreCard, opts ..._gen_ipc.CallOpt) (err error)
}
type ScoreKeeper interface {
_gen_ipc.UniversalServiceMethods
@@ -643,7 +644,7 @@
name string
}
-func (__gen_c *clientStubScoreKeeper) Record(ctx _gen_ipc.Context, Score ScoreCard, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubScoreKeeper) Record(ctx _gen_context.T, Score ScoreCard, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Record", []interface{}{Score}, opts...); err != nil {
return
@@ -654,7 +655,7 @@
return
}
-func (__gen_c *clientStubScoreKeeper) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubScoreKeeper) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -665,7 +666,7 @@
return
}
-func (__gen_c *clientStubScoreKeeper) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubScoreKeeper) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -676,7 +677,7 @@
return
}
-func (__gen_c *clientStubScoreKeeper) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubScoreKeeper) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
@@ -848,7 +849,7 @@
name string
}
-func (__gen_c *clientStubRockPaperScissors) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubRockPaperScissors) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -859,7 +860,7 @@
return
}
-func (__gen_c *clientStubRockPaperScissors) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubRockPaperScissors) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -870,7 +871,7 @@
return
}
-func (__gen_c *clientStubRockPaperScissors) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubRockPaperScissors) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/tunnel/tunnel.vdl.go b/examples/tunnel/tunnel.vdl.go
index 32fbb6c..ca892f6 100644
--- a/examples/tunnel/tunnel.vdl.go
+++ b/examples/tunnel/tunnel.vdl.go
@@ -8,6 +8,7 @@
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -45,13 +46,13 @@
// the byte stream is forwarded to the requested network address and all the
// data received from that network connection is sent back in the reply
// stream.
- Forward(ctx _gen_ipc.Context, network string, address string, opts ..._gen_ipc.CallOpt) (reply TunnelForwardStream, err error)
+ Forward(ctx _gen_context.T, network string, address string, opts ..._gen_ipc.CallOpt) (reply TunnelForwardStream, err error)
// The Shell method is used to either run shell commands remotely, or to open
// an interactive shell. The data received over the byte stream is sent to the
// shell's stdin, and the data received from the shell's stdout and stderr is
// sent back in the reply stream. It returns the exit status of the shell
// command.
- Shell(ctx _gen_ipc.Context, command string, shellOpts ShellOpts, opts ..._gen_ipc.CallOpt) (reply TunnelShellStream, err error)
+ Shell(ctx _gen_context.T, command string, shellOpts ShellOpts, opts ..._gen_ipc.CallOpt) (reply TunnelShellStream, err error)
}
type Tunnel interface {
_gen_ipc.UniversalServiceMethods
@@ -279,7 +280,7 @@
name string
}
-func (__gen_c *clientStubTunnel) Forward(ctx _gen_ipc.Context, network string, address string, opts ..._gen_ipc.CallOpt) (reply TunnelForwardStream, err error) {
+func (__gen_c *clientStubTunnel) Forward(ctx _gen_context.T, network string, address string, opts ..._gen_ipc.CallOpt) (reply TunnelForwardStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Forward", []interface{}{network, address}, opts...); err != nil {
return
@@ -288,7 +289,7 @@
return
}
-func (__gen_c *clientStubTunnel) Shell(ctx _gen_ipc.Context, command string, shellOpts ShellOpts, opts ..._gen_ipc.CallOpt) (reply TunnelShellStream, err error) {
+func (__gen_c *clientStubTunnel) Shell(ctx _gen_context.T, command string, shellOpts ShellOpts, opts ..._gen_ipc.CallOpt) (reply TunnelShellStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Shell", []interface{}{command, shellOpts}, opts...); err != nil {
return
@@ -297,7 +298,7 @@
return
}
-func (__gen_c *clientStubTunnel) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubTunnel) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -308,7 +309,7 @@
return
}
-func (__gen_c *clientStubTunnel) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubTunnel) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -319,7 +320,7 @@
return
}
-func (__gen_c *clientStubTunnel) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubTunnel) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/unresolve/test_util.go b/examples/unresolve/test_util.go
index 09d877c..7e3ada1 100644
--- a/examples/unresolve/test_util.go
+++ b/examples/unresolve/test_util.go
@@ -5,6 +5,7 @@
"testing"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/naming"
"veyron2/rt"
@@ -109,7 +110,7 @@
}
func (*fortuneCustomUnresolve) UnresolveStep(context ipc.ServerContext) ([]string, error) {
- servers, err := rt.R().MountTable().ResolveToMountTable("I/want/to/know")
+ servers, err := rt.R().MountTable().ResolveToMountTable(rt.R().NewContext(), "I/want/to/know")
if err != nil {
return nil, err
}
@@ -127,7 +128,7 @@
oa = naming.MakeTerminal(naming.JoinAddressName(ep, "tell/me"))
// Doesn't get unmounted. Fine for a test.
oa = naming.MakeTerminal(oa)
- rt.R().MountTable().Mount("I/want/to/know", oa, 0)
+ rt.R().MountTable().Mount(rt.R().NewContext(), "I/want/to/know", oa, 0)
return oa
}
@@ -150,7 +151,7 @@
}
func (*fortuneNoIDL) UnresolveStep(ipc.ServerCall) ([]string, error) {
- servers, err := rt.R().MountTable().ResolveToMountTable("g")
+ servers, err := rt.R().MountTable().ResolveToMountTable(rt.R().NewContext(), "g")
if err != nil {
return nil, err
}
@@ -185,7 +186,7 @@
}
func resolve(t *testing.T, mt naming.MountTable, name string) string {
- results, err := mt.Resolve(name)
+ results, err := mt.Resolve(rt.R().NewContext(), name)
if err != nil {
t.Errorf("Resolve failed with %v", err)
return ""
@@ -198,10 +199,10 @@
}
type unresolver interface {
- UnresolveStep(ipc.Context, ...ipc.CallOpt) ([]string, error)
+ UnresolveStep(context.T, ...ipc.CallOpt) ([]string, error)
}
-func unresolveStep(t *testing.T, ctx ipc.Context, c unresolver) string {
+func unresolveStep(t *testing.T, ctx context.T, c unresolver) string {
unres, err := c.UnresolveStep(ctx)
if err != nil {
t.Errorf("UnresolveStep failed with %v", err)
@@ -215,7 +216,7 @@
}
func unresolve(t *testing.T, mt naming.MountTable, name string) string {
- results, err := mt.Unresolve(name)
+ results, err := mt.Unresolve(rt.R().NewContext(), name)
if err != nil {
t.Errorf("Unresolve failed with %v", err)
return ""
diff --git a/examples/wspr_sample/cache.vdl.go b/examples/wspr_sample/cache.vdl.go
index d19d606..810616d 100644
--- a/examples/wspr_sample/cache.vdl.go
+++ b/examples/wspr_sample/cache.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -25,45 +26,45 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type Cache_ExcludingUniversal interface {
// Set sets a value for a key.
- Set(ctx _gen_ipc.Context, key string, value _gen_vdl.Any, opts ..._gen_ipc.CallOpt) (err error)
+ Set(ctx _gen_context.T, key string, value _gen_vdl.Any, opts ..._gen_ipc.CallOpt) (err error)
// Get returns the value for a key. If the value is not found, returns
// a not found error.
- Get(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply _gen_vdl.Any, err error)
+ Get(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply _gen_vdl.Any, err error)
// Same as Get, but casts the return argument to an byte.
- GetAsByte(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply byte, err error)
+ GetAsByte(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply byte, err error)
// Same as Get, but casts the return argument to an int32.
- GetAsInt32(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply int32, err error)
+ GetAsInt32(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply int32, err error)
// Same as Get, but casts the return argument to an int64.
- GetAsInt64(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply int64, err error)
+ GetAsInt64(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply int64, err error)
// Same as Get, but casts the return argument to an uint32.
- GetAsUint32(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply uint32, err error)
+ GetAsUint32(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply uint32, err error)
// Same as Get, but casts the return argument to an uint64.
- GetAsUint64(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply uint64, err error)
+ GetAsUint64(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply uint64, err error)
// Same as Get, but casts the return argument to an float32.
- GetAsFloat32(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply float32, err error)
+ GetAsFloat32(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply float32, err error)
// Same as Get, but casts the return argument to an float64.
- GetAsFloat64(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply float64, err error)
+ GetAsFloat64(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply float64, err error)
// Same as Get, but casts the return argument to a string.
- GetAsString(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply string, err error)
+ GetAsString(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply string, err error)
// Same as Get, but casts the return argument to a bool.
- GetAsBool(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply bool, err error)
+ GetAsBool(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply bool, err error)
// Same as Get, but casts the return argument to an error.
- GetAsError(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply error, err error)
+ GetAsError(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply error, err error)
// AsMap returns the full contents of the cache as a map.
- AsMap(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply map[string]_gen_vdl.Any, err error)
+ AsMap(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply map[string]_gen_vdl.Any, err error)
// KeyValuePairs returns the full contents of the cache as a slice of pairs.
- KeyValuePairs(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []KeyValuePair, err error)
+ KeyValuePairs(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []KeyValuePair, err error)
// MostRecentSet returns the key and value and the timestamp for the most
// recent set operation
// TODO(bprosnitz) support type types and change time to native time type
- MostRecentSet(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (value KeyValuePair, time int64, err error)
+ MostRecentSet(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (value KeyValuePair, time int64, err error)
// KeyPage indexes into the keys (in alphanumerically sorted order) and
// returns the indexth page of 10 keys.
- KeyPage(ctx _gen_ipc.Context, index int64, opts ..._gen_ipc.CallOpt) (reply [10]string, err error)
+ KeyPage(ctx _gen_context.T, index int64, opts ..._gen_ipc.CallOpt) (reply [10]string, err error)
// Size returns the total number of entries in the cache.
- Size(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply int64, err error)
+ Size(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply int64, err error)
// MultiGet sets up a stream that allows fetching multiple keys.
- MultiGet(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply CacheMultiGetStream, err error)
+ MultiGet(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply CacheMultiGetStream, err error)
}
type Cache interface {
_gen_ipc.UniversalServiceMethods
@@ -239,7 +240,7 @@
name string
}
-func (__gen_c *clientStubCache) Set(ctx _gen_ipc.Context, key string, value _gen_vdl.Any, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubCache) Set(ctx _gen_context.T, key string, value _gen_vdl.Any, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Set", []interface{}{key, value}, opts...); err != nil {
return
@@ -250,7 +251,7 @@
return
}
-func (__gen_c *clientStubCache) Get(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply _gen_vdl.Any, err error) {
+func (__gen_c *clientStubCache) Get(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply _gen_vdl.Any, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Get", []interface{}{key}, opts...); err != nil {
return
@@ -261,7 +262,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsByte(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply byte, err error) {
+func (__gen_c *clientStubCache) GetAsByte(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply byte, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsByte", []interface{}{key}, opts...); err != nil {
return
@@ -272,7 +273,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsInt32(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply int32, err error) {
+func (__gen_c *clientStubCache) GetAsInt32(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply int32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsInt32", []interface{}{key}, opts...); err != nil {
return
@@ -283,7 +284,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsInt64(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply int64, err error) {
+func (__gen_c *clientStubCache) GetAsInt64(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply int64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsInt64", []interface{}{key}, opts...); err != nil {
return
@@ -294,7 +295,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsUint32(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply uint32, err error) {
+func (__gen_c *clientStubCache) GetAsUint32(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply uint32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsUint32", []interface{}{key}, opts...); err != nil {
return
@@ -305,7 +306,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsUint64(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply uint64, err error) {
+func (__gen_c *clientStubCache) GetAsUint64(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply uint64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsUint64", []interface{}{key}, opts...); err != nil {
return
@@ -316,7 +317,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsFloat32(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply float32, err error) {
+func (__gen_c *clientStubCache) GetAsFloat32(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply float32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsFloat32", []interface{}{key}, opts...); err != nil {
return
@@ -327,7 +328,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsFloat64(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply float64, err error) {
+func (__gen_c *clientStubCache) GetAsFloat64(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply float64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsFloat64", []interface{}{key}, opts...); err != nil {
return
@@ -338,7 +339,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsString(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply string, err error) {
+func (__gen_c *clientStubCache) GetAsString(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsString", []interface{}{key}, opts...); err != nil {
return
@@ -349,7 +350,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsBool(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply bool, err error) {
+func (__gen_c *clientStubCache) GetAsBool(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply bool, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsBool", []interface{}{key}, opts...); err != nil {
return
@@ -360,7 +361,7 @@
return
}
-func (__gen_c *clientStubCache) GetAsError(ctx _gen_ipc.Context, key string, opts ..._gen_ipc.CallOpt) (reply error, err error) {
+func (__gen_c *clientStubCache) GetAsError(ctx _gen_context.T, key string, opts ..._gen_ipc.CallOpt) (reply error, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetAsError", []interface{}{key}, opts...); err != nil {
return
@@ -371,7 +372,7 @@
return
}
-func (__gen_c *clientStubCache) AsMap(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply map[string]_gen_vdl.Any, err error) {
+func (__gen_c *clientStubCache) AsMap(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply map[string]_gen_vdl.Any, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "AsMap", nil, opts...); err != nil {
return
@@ -382,7 +383,7 @@
return
}
-func (__gen_c *clientStubCache) KeyValuePairs(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []KeyValuePair, err error) {
+func (__gen_c *clientStubCache) KeyValuePairs(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []KeyValuePair, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "KeyValuePairs", nil, opts...); err != nil {
return
@@ -393,7 +394,7 @@
return
}
-func (__gen_c *clientStubCache) MostRecentSet(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (value KeyValuePair, time int64, err error) {
+func (__gen_c *clientStubCache) MostRecentSet(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (value KeyValuePair, time int64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "MostRecentSet", nil, opts...); err != nil {
return
@@ -404,7 +405,7 @@
return
}
-func (__gen_c *clientStubCache) KeyPage(ctx _gen_ipc.Context, index int64, opts ..._gen_ipc.CallOpt) (reply [10]string, err error) {
+func (__gen_c *clientStubCache) KeyPage(ctx _gen_context.T, index int64, opts ..._gen_ipc.CallOpt) (reply [10]string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "KeyPage", []interface{}{index}, opts...); err != nil {
return
@@ -415,7 +416,7 @@
return
}
-func (__gen_c *clientStubCache) Size(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply int64, err error) {
+func (__gen_c *clientStubCache) Size(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply int64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Size", nil, opts...); err != nil {
return
@@ -426,7 +427,7 @@
return
}
-func (__gen_c *clientStubCache) MultiGet(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply CacheMultiGetStream, err error) {
+func (__gen_c *clientStubCache) MultiGet(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply CacheMultiGetStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "MultiGet", nil, opts...); err != nil {
return
@@ -435,7 +436,7 @@
return
}
-func (__gen_c *clientStubCache) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubCache) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -446,7 +447,7 @@
return
}
-func (__gen_c *clientStubCache) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubCache) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -457,7 +458,7 @@
return
}
-func (__gen_c *clientStubCache) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubCache) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/wspr_sample/error_thrower.vdl.go b/examples/wspr_sample/error_thrower.vdl.go
index 765ec73..9eba7a1 100644
--- a/examples/wspr_sample/error_thrower.vdl.go
+++ b/examples/wspr_sample/error_thrower.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -19,25 +20,25 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type ErrorThrower_ExcludingUniversal interface {
// Throws veyron2/vError.Aborted error
- ThrowAborted(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowAborted(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws veyron2/vError.BadArg error
- ThrowBadArg(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowBadArg(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws veyron2/vError.BadProtocol error
- ThrowBadProtocol(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowBadProtocol(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws veyron2/vError.Internal error
- ThrowInternal(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowInternal(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws veyron2/vError.NotAuthorized error
- ThrowNotAuthorized(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowNotAuthorized(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws veyron2/vError.NotFound error
- ThrowNotFound(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowNotFound(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws veyron2/vError.Unknown error
- ThrowUnknown(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowUnknown(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws normal Go error
- ThrowGoError(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowGoError(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Throws custom error created by using Standard
- ThrowCustomStandardError(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ ThrowCustomStandardError(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
// Lists all errors Ids available in veyron2/verror
- ListAllBuiltInErrorIDs(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error)
+ ListAllBuiltInErrorIDs(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error)
}
type ErrorThrower interface {
_gen_ipc.UniversalServiceMethods
@@ -112,7 +113,7 @@
name string
}
-func (__gen_c *clientStubErrorThrower) ThrowAborted(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowAborted(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowAborted", nil, opts...); err != nil {
return
@@ -123,7 +124,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowBadArg(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowBadArg(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowBadArg", nil, opts...); err != nil {
return
@@ -134,7 +135,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowBadProtocol(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowBadProtocol(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowBadProtocol", nil, opts...); err != nil {
return
@@ -145,7 +146,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowInternal(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowInternal(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowInternal", nil, opts...); err != nil {
return
@@ -156,7 +157,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowNotAuthorized(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowNotAuthorized(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowNotAuthorized", nil, opts...); err != nil {
return
@@ -167,7 +168,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowNotFound(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowNotFound(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowNotFound", nil, opts...); err != nil {
return
@@ -178,7 +179,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowUnknown(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowUnknown(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowUnknown", nil, opts...); err != nil {
return
@@ -189,7 +190,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowGoError(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowGoError(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowGoError", nil, opts...); err != nil {
return
@@ -200,7 +201,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ThrowCustomStandardError(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubErrorThrower) ThrowCustomStandardError(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ThrowCustomStandardError", nil, opts...); err != nil {
return
@@ -211,7 +212,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) ListAllBuiltInErrorIDs(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubErrorThrower) ListAllBuiltInErrorIDs(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "ListAllBuiltInErrorIDs", nil, opts...); err != nil {
return
@@ -222,7 +223,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubErrorThrower) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -233,7 +234,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubErrorThrower) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -244,7 +245,7 @@
return
}
-func (__gen_c *clientStubErrorThrower) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubErrorThrower) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/examples/wspr_sample/sampled/lib/sampled.go b/examples/wspr_sample/sampled/lib/sampled.go
index 2a3dc43..901d459 100644
--- a/examples/wspr_sample/sampled/lib/sampled.go
+++ b/examples/wspr_sample/sampled/lib/sampled.go
@@ -20,7 +20,6 @@
}
func StartServer(r veyron2.Runtime) (ipc.Server, naming.Endpoint, error) {
-
// Create a new server instance.
s, err := r.NewServer()
if err != nil {
diff --git a/examples/wspr_sample/sampled/lib/sampled_test.go b/examples/wspr_sample/sampled/lib/sampled_test.go
index 9ee0d18..d9a0d30 100644
--- a/examples/wspr_sample/sampled/lib/sampled_test.go
+++ b/examples/wspr_sample/sampled/lib/sampled_test.go
@@ -6,6 +6,7 @@
"testing"
"time"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/naming"
"veyron2/rt"
@@ -94,11 +95,11 @@
// settable mirrors the cache's Set method to provide a consistent way to populate test cases.
type settable interface {
- Set(ctx ipc.Context, key string, val vdl.Any, opts ...ipc.CallOpt) error
+ Set(ctx context.T, key string, val vdl.Any, opts ...ipc.CallOpt) error
}
// populateObject populates a settable with 12 values.
-func populateObject(ctx ipc.Context, s settable) error {
+func populateObject(ctx context.T, s settable) error {
if err := s.Set(ctx, "A", int8(3)); err != nil {
return err
}
@@ -167,7 +168,7 @@
// settableMap is a map that implements the settable interface.
type settableMap map[string]vdl.Any
-func (sm settableMap) Set(ctx ipc.Context, key string, val vdl.Any, opts ...ipc.CallOpt) error {
+func (sm settableMap) Set(ctx context.T, key string, val vdl.Any, opts ...ipc.CallOpt) error {
sm[key] = val
return nil
}
diff --git a/runtimes/google/daemon/proxyd/main.go b/runtimes/google/daemon/proxyd/main.go
index bca0e4d..9689067 100644
--- a/runtimes/google/daemon/proxyd/main.go
+++ b/runtimes/google/daemon/proxyd/main.go
@@ -39,7 +39,7 @@
defer proxy.Shutdown()
if len(*name) > 0 {
- publisher := publisher.New(r.MountTable(), time.Minute)
+ publisher := publisher.New(r.NewContext(), r.MountTable(), time.Minute)
defer publisher.WaitForStop()
defer publisher.Stop()
publisher.AddServer(naming.JoinAddressName(proxy.Endpoint().String(), ""))
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index d974020..f758190 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -11,6 +11,7 @@
isecurity "veyron/runtimes/google/security"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/ipc/stream"
"veyron2/naming"
@@ -115,13 +116,13 @@
return flow, suffix, nil
}
-func (c *client) StartCall(ctx ipc.Context, name, method string, args []interface{}, opts ...ipc.CallOpt) (ipc.Call, error) {
- return c.startCall(name, method, args, opts...)
+func (c *client) StartCall(ctx context.T, name, method string, args []interface{}, opts ...ipc.CallOpt) (ipc.Call, error) {
+ return c.startCall(ctx, name, method, args, opts...)
}
// startCall ensures StartCall always returns verror.E.
-func (c *client) startCall(name, method string, args []interface{}, opts ...ipc.CallOpt) (ipc.Call, verror.E) {
- servers, err := c.mt.Resolve(name)
+func (c *client) startCall(ctx context.T, name, method string, args []interface{}, opts ...ipc.CallOpt) (ipc.Call, verror.E) {
+ servers, err := c.mt.Resolve(ctx, name)
if err != nil {
return nil, verror.NotFoundf("ipc: Resolve(%q) failed: %v", name, err)
}
diff --git a/runtimes/google/ipc/context.go b/runtimes/google/ipc/context.go
index 561886d..78fcfa1 100644
--- a/runtimes/google/ipc/context.go
+++ b/runtimes/google/ipc/context.go
@@ -1,14 +1,16 @@
package ipc
import (
- "veyron2/ipc"
+ "veyron2/context"
)
-// context implements the ipc.ServerContext interface.
-type context struct{}
+// contextImpl implements the context.T interface.
+// TODO(mattr): Consider moving this to a separate package to mirror the layout of the
+// interfaces in veyron2.
+type contextImpl struct{}
-// InternalNewContext creates a new ipc.Context. This function should only
+// InternalNewContext creates a new context.T. This function should only
// be called from within the runtime implementation.
-func InternalNewContext() ipc.Context {
- return &context{}
+func InternalNewContext() context.T {
+ return &contextImpl{}
}
diff --git a/runtimes/google/ipc/full_test.go b/runtimes/google/ipc/full_test.go
index 5858e11..32f4e91 100644
--- a/runtimes/google/ipc/full_test.go
+++ b/runtimes/google/ipc/full_test.go
@@ -23,6 +23,7 @@
"veyron/security/caveat"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/ipc/stream"
"veyron2/naming"
@@ -135,7 +136,7 @@
return &mountTable{mounts: make(map[string][]string)}
}
-func (mt *mountTable) Mount(name, server string, _ time.Duration) error {
+func (mt *mountTable) Mount(ctx context.T, name, server string, _ time.Duration) error {
mt.Lock()
defer mt.Unlock()
for n, _ := range mt.mounts {
@@ -147,7 +148,7 @@
return nil
}
-func (mt *mountTable) Unmount(name, server string) error {
+func (mt *mountTable) Unmount(ctx context.T, name, server string) error {
var servers []string
mt.Lock()
defer mt.Unlock()
@@ -165,7 +166,7 @@
return nil
}
-func (mt *mountTable) Resolve(name string) ([]string, error) {
+func (mt *mountTable) Resolve(ctx context.T, name string) ([]string, error) {
if address, _ := naming.SplitAddressName(name); len(address) > 0 {
return []string{name}, nil
}
@@ -184,17 +185,17 @@
return nil, verror.NotFoundf("Resolve name %q not found in %v", name, mt.mounts)
}
-func (mt *mountTable) ResolveToMountTable(name string) ([]string, error) {
+func (mt *mountTable) ResolveToMountTable(ctx context.T, name string) ([]string, error) {
panic("ResolveToMountTable not implemented")
return nil, nil
}
-func (mt *mountTable) Unresolve(name string) ([]string, error) {
+func (mt *mountTable) Unresolve(ctx context.T, name string) ([]string, error) {
panic("Unresolve not implemented")
return nil, nil
}
-func (mt *mountTable) Glob(pattern string) (chan naming.MountEntry, error) {
+func (mt *mountTable) Glob(ctx context.T, pattern string) (chan naming.MountEntry, error) {
panic("Glob not implemented")
return nil, nil
}
@@ -206,7 +207,7 @@
func startServer(t *testing.T, serverID security.PrivateID, sm stream.Manager, mt naming.MountTable, ts interface{}) ipc.Server {
vlog.VI(1).Info("InternalNewServer")
- server, err := InternalNewServer(sm, mt, veyron2.LocalID(serverID))
+ server, err := InternalNewServer(InternalNewContext(), sm, mt, veyron2.LocalID(serverID))
if err != nil {
t.Errorf("InternalNewServer failed: %v", err)
}
@@ -227,13 +228,13 @@
}
func verifyMount(t *testing.T, mt naming.MountTable, name string) {
- if _, err := mt.Resolve(name); err != nil {
+ if _, err := mt.Resolve(InternalNewContext(), name); err != nil {
t.Errorf("%s not found in mounttable", name)
}
}
func verifyMountMissing(t *testing.T, mt naming.MountTable, name string) {
- if servers, err := mt.Resolve(name); err == nil {
+ if servers, err := mt.Resolve(InternalNewContext(), name); err == nil {
t.Errorf("%s not supposed to be found in mounttable; got %d servers instead", name, len(servers))
}
}
@@ -722,7 +723,7 @@
defer b.cleanup(t)
// Publish some incompatible endpoints.
- publisher := publisher.New(b.mt, publishPeriod)
+ publisher := publisher.New(InternalNewContext(), b.mt, publishPeriod)
defer publisher.WaitForStop()
defer publisher.Stop()
publisher.AddName("incompatible")
@@ -767,7 +768,7 @@
{[]ipc.ServerOpt{veyron2.PublishFirst, veyron2.EndpointRewriteOpt("example.com")}, []string{"example.com"}},
}
for i, c := range cases {
- server, err := InternalNewServer(sm, mt, append([]ipc.ServerOpt{veyron2.LocalID(serverID)}, c.opts...)...)
+ server, err := InternalNewServer(InternalNewContext(), sm, mt, append([]ipc.ServerOpt{veyron2.LocalID(serverID)}, c.opts...)...)
if err != nil {
t.Errorf("InternalNewServer failed: %v", err)
continue
@@ -787,7 +788,7 @@
server.Stop()
continue
}
- servers, err := mt.Resolve("mountpoint")
+ servers, err := mt.Resolve(InternalNewContext(), "mountpoint")
if err != nil {
t.Errorf("mountpoint not found in mounttable")
server.Stop()
@@ -884,7 +885,7 @@
mt := newMountTable()
id := loadIdentityFromFile(argv[1])
isecurity.TrustIdentityProviders(id)
- server, err := InternalNewServer(mgr, mt, veyron2.LocalID(id))
+ server, err := InternalNewServer(InternalNewContext(), mgr, mt, veyron2.LocalID(id))
if err != nil {
vlog.Fatalf("InternalNewServer failed: %v", err)
}
diff --git a/runtimes/google/ipc/jni/arg_getter.go b/runtimes/google/ipc/jni/arg_getter.go
index 5b3c4ba..4cb0c6e 100644
--- a/runtimes/google/ipc/jni/arg_getter.go
+++ b/runtimes/google/ipc/jni/arg_getter.go
@@ -8,6 +8,7 @@
// Imported VDLs. Please add a link to all VDLs you care about here,
// and add all interfaces you care about to the init() function below.
"veyron/examples/fortune"
+ "veyron2/context"
"veyron2/ipc"
)
@@ -31,7 +32,7 @@
panic(fmt.Sprintf("expected interface type for %q, got: %v", ifacePtr, t.Kind()))
}
- contextType := reflect.TypeOf((*ipc.Context)(nil)).Elem()
+ contextType := reflect.TypeOf((*context.T)(nil)).Elem()
serverContextType := reflect.TypeOf((*ipc.ServerContext)(nil)).Elem()
optType := reflect.TypeOf(([]ipc.CallOpt)(nil))
// Create a new arg getter.
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index 00d1290..3f2395b 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -14,6 +14,7 @@
isecurity "veyron/runtimes/google/security"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/ipc/stream"
"veyron2/naming"
@@ -34,6 +35,7 @@
type server struct {
sync.Mutex
+ ctx context.T // context used by the server to make internal RPCs.
streamMgr stream.Manager // stream manager to listen for new flows.
disptrie *disptrie // dispatch trie for method dispatching.
publisher publisher.Publisher // publisher to publish mounttable mounts.
@@ -46,11 +48,12 @@
servesMountTable bool
}
-func InternalNewServer(streamMgr stream.Manager, mt naming.MountTable, opts ...ipc.ServerOpt) (ipc.Server, error) {
+func InternalNewServer(ctx context.T, streamMgr stream.Manager, mt naming.MountTable, opts ...ipc.ServerOpt) (ipc.Server, error) {
s := &server{
+ ctx: ctx,
streamMgr: streamMgr,
disptrie: newDisptrie(),
- publisher: publisher.New(mt, publishPeriod),
+ publisher: publisher.New(ctx, mt, publishPeriod),
mt: mt,
}
for _, opt := range opts {
@@ -94,7 +97,7 @@
if s.mt == nil {
return address
}
- names, err := s.mt.Resolve(address)
+ names, err := s.mt.Resolve(s.ctx, address)
if err != nil {
return address
}
diff --git a/runtimes/google/lib/publisher/publisher.go b/runtimes/google/lib/publisher/publisher.go
index 8c99e7f..d724da3 100644
--- a/runtimes/google/lib/publisher/publisher.go
+++ b/runtimes/google/lib/publisher/publisher.go
@@ -8,6 +8,7 @@
"strings"
"time"
+ "veyron2/context"
"veyron2/naming"
"veyron2/vlog"
)
@@ -58,12 +59,12 @@
type publishedCmd chan []string // published names are sent when cmd is done
// New returns a new publisher that updates mounts on mt every period.
-func New(mt naming.MountTable, period time.Duration) Publisher {
+func New(ctx context.T, mt naming.MountTable, period time.Duration) Publisher {
p := &publisher{
cmdchan: make(chan interface{}, 10),
donechan: make(chan struct{}),
}
- go p.runLoop(mt, period)
+ go p.runLoop(ctx, mt, period)
return p
}
@@ -121,9 +122,9 @@
<-p.donechan
}
-func (p *publisher) runLoop(mt naming.MountTable, period time.Duration) {
+func (p *publisher) runLoop(ctx context.T, mt naming.MountTable, period time.Duration) {
vlog.VI(1).Info("ipc pub: start runLoop")
- state := newPubState(mt, period)
+ state := newPubState(ctx, mt, period)
for {
select {
case cmd, ok := <-p.cmdchan:
@@ -159,6 +160,7 @@
// pubState maintains the state for our periodic mounts. It is not thread-safe;
// it's only used in the sequential publisher runLoop.
type pubState struct {
+ ctx context.T
mt naming.MountTable
period time.Duration
deadline time.Time // deadline for the next mountAll call
@@ -179,7 +181,7 @@
lastUnmountErr error
}
-func newPubState(mt naming.MountTable, period time.Duration) *pubState {
+func newPubState(ctx context.T, mt naming.MountTable, period time.Duration) *pubState {
return &pubState{
mt: mt,
period: period,
@@ -228,7 +230,7 @@
// to mountAll will occur within the next period, and refresh all mounts.
ttl := ps.period + mountTTLSlack
status.lastMount = time.Now()
- status.lastMountErr = ps.mt.Mount(name, server, ttl)
+ status.lastMountErr = ps.mt.Mount(ps.ctx, name, server, ttl)
if status.lastMountErr != nil {
vlog.Errorf("ipc pub: couldn't mount(%v, %v, %v): %v", name, server, ttl, status.lastMountErr)
} else {
@@ -245,7 +247,7 @@
func (ps *pubState) unmount(name, server string, status *mountStatus) {
status.lastUnmount = time.Now()
- status.lastUnmountErr = ps.mt.Unmount(name, server)
+ status.lastUnmountErr = ps.mt.Unmount(ps.ctx, name, server)
if status.lastUnmountErr != nil {
vlog.Errorf("ipc pub: couldn't unmount(%v, %v): %v", name, server, status.lastUnmountErr)
} else {
@@ -262,7 +264,7 @@
func (ps *pubState) published() []string {
var ret []string
for _, name := range ps.names {
- mtServers, err := ps.mt.ResolveToMountTable(name)
+ mtServers, err := ps.mt.ResolveToMountTable(ps.ctx, name)
if err != nil {
vlog.Errorf("ipc pub: couldn't resolve %v to mount table: %v", name, err)
continue
diff --git a/runtimes/google/naming/mounttable/all_test.go b/runtimes/google/naming/mounttable/all_test.go
index a3d67b8..f34fd27 100644
--- a/runtimes/google/naming/mounttable/all_test.go
+++ b/runtimes/google/naming/mounttable/all_test.go
@@ -10,6 +10,7 @@
service "veyron/services/mounttable/lib"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/naming"
"veyron2/rt"
@@ -21,10 +22,10 @@
t.Fatal(string(debug.Stack()))
}
-func doGlob(t *testing.T, mt naming.MountTable, pattern string) []string {
+func doGlob(t *testing.T, ctx context.T, mt naming.MountTable, pattern string) []string {
var replies []string
- rc, err := mt.Glob(pattern)
+ rc, err := mt.Glob(ctx, pattern)
if err != nil {
boom(t, "Glob(%s): %s", pattern, err)
}
@@ -95,8 +96,8 @@
mt5Prefix = "mt5"
)
-func testResolveToMountTable(t *testing.T, mt naming.MountTable, name, want string) {
- servers, err := mt.ResolveToMountTable(name)
+func testResolveToMountTable(t *testing.T, ctx context.T, mt naming.MountTable, name, want string) {
+ servers, err := mt.ResolveToMountTable(ctx, name)
if err != nil {
boom(t, "Failed to ResolveToMountTable %q: %s", name, err)
}
@@ -105,8 +106,8 @@
}
}
-func testResolve(t *testing.T, mt naming.MountTable, name, want string) {
- servers, err := mt.Resolve(name)
+func testResolve(t *testing.T, ctx context.T, mt naming.MountTable, name, want string) {
+ servers, err := mt.Resolve(ctx, name)
if err != nil {
boom(t, "Failed to Resolve %q: %s", name, err)
}
@@ -193,12 +194,14 @@
}
mt := r.MountTable()
+ ctx := r.NewContext()
+
// Create a DAG of mount table servers using relative addresses.
ttl := time.Duration(100) * time.Second
// Mount using a relative name starting with //. This means don't walk out of the
// namespace's root mount table even if there is already something mounted at mt2.
mt2Name := naming.JoinAddressName(estr, mt2Prefix)
- if err := mt.Mount("//mt2", mt2Name, ttl); err != nil {
+ if err := mt.Mount(ctx, "//mt2", mt2Name, ttl); err != nil {
boom(t, "Failed to Mount //mt2: %s", err)
}
// Mount using the relative name not starting with //. This means walk through mt3
@@ -209,7 +212,7 @@
// we MUST use the // form or it will try to mount the second inside the first rather
// than at the same place as the first.
mt3Name := naming.JoinAddressName(estr, mt3Prefix)
- if err := mt.Mount("mt3", mt3Name, ttl); err != nil {
+ if err := mt.Mount(ctx, "mt3", mt3Name, ttl); err != nil {
boom(t, "Failed to Mount mt3: %s", err)
}
@@ -219,52 +222,52 @@
// After the mounts above we have MountTables at /<estr>/mt1{//mt2,//mt3},
// with server addresses as per below.
- testResolveToMountTable(t, mt, "", mt1MT)
- testResolveToMountTable(t, mt, "mt2", mt2MT)
- testResolveToMountTable(t, mt, "mt3", mt3MT)
- testResolveToMountTable(t, mt, "//mt3", naming.JoinAddressName(estr, "//mt1//mt3"))
+ testResolveToMountTable(t, ctx, mt, "", mt1MT)
+ testResolveToMountTable(t, ctx, mt, "mt2", mt2MT)
+ testResolveToMountTable(t, ctx, mt, "mt3", mt3MT)
+ testResolveToMountTable(t, ctx, mt, "//mt3", naming.JoinAddressName(estr, "//mt1//mt3"))
// We can resolve to the MountTables using rooted, terminal names
// as follows, both mt1 and mt1/{mt2,mt3} are served by the
// top-level MountTable
- testResolve(t, mt, naming.JoinAddressName(estr, "//mt1"), mt1MT)
- testResolve(t, mt, naming.JoinAddressName(estr, "//mt1/mt2"), mt2MT)
- testResolve(t, mt, naming.JoinAddressName(estr, "//mt1/mt3"), mt3MT)
+ testResolve(t, ctx, mt, naming.JoinAddressName(estr, "//mt1"), mt1MT)
+ testResolve(t, ctx, mt, naming.JoinAddressName(estr, "//mt1/mt2"), mt2MT)
+ testResolve(t, ctx, mt, naming.JoinAddressName(estr, "//mt1/mt3"), mt3MT)
// returns [mt2, mt3]
- vlog.Infof("GLOB: %s", doGlob(t, mt, "*"))
+ vlog.Infof("GLOB: %s", doGlob(t, ctx, mt, "*"))
// Perform two mounts that have to actually walk through other mount tables.
- if err := mt.Mount("mt2/mt4", naming.JoinAddressName(estr, mt4Prefix), ttl); err != nil {
+ if err := mt.Mount(ctx, "mt2/mt4", naming.JoinAddressName(estr, mt4Prefix), ttl); err != nil {
boom(t, "Failed to Mount mt2/mt4: %s", err)
}
- if err := mt.Mount("mt3/mt4", naming.JoinAddressName(estr, mt4Prefix), ttl); err != nil {
+ if err := mt.Mount(ctx, "mt3/mt4", naming.JoinAddressName(estr, mt4Prefix), ttl); err != nil {
boom(t, "Failed to Mount mt3/mt4: %s", err)
}
// After the mounts above we now have /<estr>{/mt1/mt2/mt4,/mt1/mt3/mt4}.
- testResolveToMountTable(t, mt, "mt2/mt4", naming.JoinAddressName(estr, "//mt2/mt4"))
- testResolveToMountTable(t, mt, "mt3/mt4", naming.JoinAddressName(estr, "//mt3/mt4"))
+ testResolveToMountTable(t, ctx, mt, "mt2/mt4", naming.JoinAddressName(estr, "//mt2/mt4"))
+ testResolveToMountTable(t, ctx, mt, "mt3/mt4", naming.JoinAddressName(estr, "//mt3/mt4"))
- testResolve(t, mt, naming.JoinAddressName(estr, "//mt1/mt2/mt4"), naming.JoinAddressName(estr, "//mt1/mt2/mt4"))
+ testResolve(t, ctx, mt, naming.JoinAddressName(estr, "//mt1/mt2/mt4"), naming.JoinAddressName(estr, "//mt1/mt2/mt4"))
// Perform a mount that uses a global name as the mount point rather than
// one relative to our namespace's root.
global := naming.JoinAddressName(estr, "mt3/mt4/mt5")
- if err := mt.Mount(global, naming.JoinAddressName(estr, mt5Prefix), ttl); err != nil {
+ if err := mt.Mount(ctx, global, naming.JoinAddressName(estr, mt5Prefix), ttl); err != nil {
boom(t, "Failed to Mount %s: %s", global, err)
}
// This mounts the service OA (ep/joke1) as joke1.
- if err := mt.Mount("joke1", naming.JoinAddressName(estr, "//joke1"), ttl); err != nil {
+ if err := mt.Mount(ctx, "joke1", naming.JoinAddressName(estr, "//joke1"), ttl); err != nil {
boom(t, "Failed to Mount joke1: %s", err)
}
// This mounts the raw server endpoint as joke2 -- like Publish would.
- if err := mt.Mount("joke2", naming.JoinAddressName(estr, "")+"//", ttl); err != nil {
+ if err := mt.Mount(ctx, "joke2", naming.JoinAddressName(estr, "")+"//", ttl); err != nil {
boom(t, "Failed to Mount joke2: %s", err)
}
// This mounts the raw server endpoint as joke3 in mt3 -- like Publish would.
- if err := mt.Mount("mt3/joke3", naming.JoinAddressName(estr, "")+"//", ttl); err != nil {
+ if err := mt.Mount(ctx, "mt3/joke3", naming.JoinAddressName(estr, "")+"//", ttl); err != nil {
boom(t, "Failed to Mount joke3: %s", err)
}
@@ -276,24 +279,24 @@
// what we expected AND that we can actually resolve the results.
// Get back an error since this will walk through mt5 to its root.
- _, err = mt.Resolve("mt3/mt4/mt5")
+ _, err = mt.Resolve(ctx, "mt3/mt4/mt5")
if err == nil {
boom(t, "Should have failed to mt3/mt4/mt5")
}
// Resolving m3/mt4/mt5 to a MountTable using the local MountTable gives
// us /<estr>//mt4/mt5.
- testResolveToMountTable(t, mt, "mt3/mt4/mt5", naming.JoinAddressName(estr, "//mt4/mt5"))
- testResolveToMountTable(t, mt, "mt3/mt4//mt5", naming.JoinAddressName(estr, "//mt4//mt5"))
+ testResolveToMountTable(t, ctx, mt, "mt3/mt4/mt5", naming.JoinAddressName(estr, "//mt4/mt5"))
+ testResolveToMountTable(t, ctx, mt, "mt3/mt4//mt5", naming.JoinAddressName(estr, "//mt4//mt5"))
// But looking up mt4/mt5 in the local MountTable will give us
// /<estr>//mt1/mt4/mt5 since the localMountTable has mt1 as its root!
- testResolveToMountTable(t, mt, "mt4/mt5", naming.JoinAddressName(estr, "//mt1/mt4/mt5"))
+ testResolveToMountTable(t, ctx, mt, "mt4/mt5", naming.JoinAddressName(estr, "//mt1/mt4/mt5"))
// Looking mt3//mt4/mt5 will return the MountTable that serves //mt4/mt5.
- testResolveToMountTable(t, mt, "mt3//mt4/mt5", naming.JoinAddressName(estr, "//mt3//mt4/mt5"))
+ testResolveToMountTable(t, ctx, mt, "mt3//mt4/mt5", naming.JoinAddressName(estr, "//mt3//mt4/mt5"))
// And the MountTable that serves //mt4/mt5 is /<epstr>//mt1/mt4/mt5
- testResolveToMountTable(t, mt, "//mt4/mt5", naming.JoinAddressName(estr, "//mt1//mt4/mt5"))
+ testResolveToMountTable(t, ctx, mt, "//mt4/mt5", naming.JoinAddressName(estr, "//mt1//mt4/mt5"))
vlog.Infof("\n-------------------------------------------------")
jokeTests := []struct {
@@ -305,7 +308,7 @@
}
for _, test := range jokeTests {
- servers, err := mt.Resolve(test.name)
+ servers, err := mt.Resolve(ctx, test.name)
if err != nil {
boom(t, "Failed to Resolve %s: %s", test.name, err)
}
@@ -313,7 +316,7 @@
boom(t, "Resolve %s returned wrong servers: %v, expected: %s", test.name, servers, test.resolved)
}
- servers, err = mt.ResolveToMountTable(test.name)
+ servers, err = mt.ResolveToMountTable(ctx, test.name)
if err != nil {
boom(t, "Failed to ResolveToMountTable %s: %s", test.name, err)
}
@@ -340,7 +343,7 @@
{"mt2/mt4/*5", []string{"mt2/mt4/mt5"}},
}
for _, test := range globTests {
- out := doGlob(t, mt, test.pattern)
+ out := doGlob(t, ctx, mt, test.pattern)
checkMatch(t, test.pattern, test.expected, out)
}
diff --git a/runtimes/google/naming/mounttable/glob.go b/runtimes/google/naming/mounttable/glob.go
index ddc5ae6..29ae756 100644
--- a/runtimes/google/naming/mounttable/glob.go
+++ b/runtimes/google/naming/mounttable/glob.go
@@ -8,6 +8,7 @@
"veyron/lib/glob"
+ "veyron2/context"
"veyron2/naming"
"veyron2/vlog"
)
@@ -21,7 +22,7 @@
// l the list to add results to.
// recursive true to continue below the matched pattern
// We return a bool foundRoot which indicates whether the empty name "" was found on a target server.
-func (ns *namespace) globAtServer(server *naming.MountEntry, pattern *glob.Glob, l *list.List) (bool, error) {
+func (ns *namespace) globAtServer(ctx context.T, server *naming.MountEntry, pattern *glob.Glob, l *list.List) (bool, error) {
pstr := pattern.String()
foundRoot := false
vlog.VI(2).Infof("globAtServer(%v, %v)", *server, pstr)
@@ -29,7 +30,7 @@
var lastErr error
// Trying each instance till we get one that works.
for _, s := range server.Servers {
- mtServers, err := ns.ResolveToMountTable(s.Server)
+ mtServers, err := ns.ResolveToMountTable(ctx, s.Server)
if err != nil {
lastErr = err
continue
@@ -37,7 +38,7 @@
for _, s := range mtServers {
client := ns.rt.Client()
- call, err := client.StartCall(ns.rt.TODOContext(), s, "Glob", []interface{}{pstr}, callTimeout)
+ call, err := client.StartCall(ctx, s, "Glob", []interface{}{pstr}, callTimeout)
if err != nil {
lastErr = err
continue // try another instance
@@ -78,7 +79,7 @@
}
// Glob implements naming.MountTable.Glob.
-func (ns *namespace) Glob(pattern string) (chan naming.MountEntry, error) {
+func (ns *namespace) Glob(ctx context.T, pattern string) (chan naming.MountEntry, error) {
g, err := glob.Parse(pattern)
if err != nil {
return nil, err
@@ -96,7 +97,7 @@
return nil, naming.ErrNoMountTable
}
reply := make(chan naming.MountEntry, 100)
- go ns.globLoop(servers, prefix, g, reply)
+ go ns.globLoop(ctx, servers, prefix, g, reply)
return reply, nil
}
@@ -127,7 +128,7 @@
return strings.Count(name, "/") - strings.Count(name, "//") + 1
}
-func (ns *namespace) globLoop(servers []string, prefix string, pattern *glob.Glob, reply chan naming.MountEntry) {
+func (ns *namespace) globLoop(ctx context.T, servers []string, prefix string, pattern *glob.Glob, reply chan naming.MountEntry) {
defer close(reply)
l := list.New()
@@ -142,7 +143,7 @@
suffix := pattern.Split(depth(e.Name))
// Perform a glob at the server.
- foundRoot, err := ns.globAtServer(e, suffix, l)
+ foundRoot, err := ns.globAtServer(ctx, e, suffix, l)
// We want to output this entry if:
// 1. There was a real error, we return whatever name gave us the error.
diff --git a/runtimes/google/naming/mounttable/mount.go b/runtimes/google/naming/mounttable/mount.go
index c781f3d..f35f045 100644
--- a/runtimes/google/naming/mounttable/mount.go
+++ b/runtimes/google/naming/mounttable/mount.go
@@ -3,13 +3,13 @@
import (
"time"
- "veyron2"
+ "veyron2/context"
+ "veyron2/ipc"
)
// mountIntoMountTable mounts a single server into a single mount table.
-func mountIntoMountTable(runtime veyron2.Runtime, name, server string, ttl time.Duration) error {
- client := runtime.Client()
- call, err := client.StartCall(runtime.TODOContext(), name, "Mount", []interface{}{server, uint32(ttl.Seconds())}, callTimeout)
+func mountIntoMountTable(ctx context.T, client ipc.Client, name, server string, ttl time.Duration) error {
+ call, err := client.StartCall(ctx, name, "Mount", []interface{}{server, uint32(ttl.Seconds())}, callTimeout)
if err != nil {
return err
}
@@ -20,9 +20,8 @@
}
// unmountFromMountTable removes a single mounted server from a single mount table.
-func unmountFromMountTable(runtime veyron2.Runtime, name, server string) error {
- client := runtime.Client()
- call, err := client.StartCall(runtime.TODOContext(), name, "Unmount", []interface{}{server}, callTimeout)
+func unmountFromMountTable(ctx context.T, client ipc.Client, name, server string) error {
+ call, err := client.StartCall(ctx, name, "Unmount", []interface{}{server}, callTimeout)
if err != nil {
return err
}
@@ -32,9 +31,9 @@
return err
}
-func (ns *namespace) Mount(name, server string, ttl time.Duration) error {
+func (ns *namespace) Mount(ctx context.T, name, server string, ttl time.Duration) error {
// Resolve to all the mount tables implementing name.
- mtServers, err := ns.ResolveToMountTable(name)
+ mtServers, err := ns.ResolveToMountTable(ctx, name)
if err != nil {
return err
}
@@ -42,7 +41,7 @@
c := make(chan error, len(mtServers))
for _, mt := range mtServers {
go func() {
- c <- mountIntoMountTable(ns.rt, mt, server, ttl)
+ c <- mountIntoMountTable(ctx, ns.rt.Client(), mt, server, ttl)
}()
}
// Return error if any mounts failed, since otherwise we'll get
@@ -56,8 +55,8 @@
return finalerr
}
-func (ns *namespace) Unmount(name, server string) error {
- mts, err := ns.ResolveToMountTable(name)
+func (ns *namespace) Unmount(ctx context.T, name, server string) error {
+ mts, err := ns.ResolveToMountTable(ctx, name)
if err != nil {
return err
}
@@ -66,7 +65,7 @@
c := make(chan error, len(mts))
for _, mt := range mts {
go func() {
- c <- unmountFromMountTable(ns.rt, mt, server)
+ c <- unmountFromMountTable(ctx, ns.rt.Client(), mt, server)
}()
}
// Return error if any mounts failed, since otherwise we'll get
diff --git a/runtimes/google/naming/mounttable/resolve.go b/runtimes/google/naming/mounttable/resolve.go
index 43d9b59..365325d 100644
--- a/runtimes/google/naming/mounttable/resolve.go
+++ b/runtimes/google/naming/mounttable/resolve.go
@@ -3,7 +3,7 @@
import (
"errors"
- "veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/naming"
"veyron2/verror"
@@ -19,8 +19,7 @@
return
}
-func resolveAgainstMountTable(runtime veyron2.Runtime, names []string) ([]string, error) {
- client := runtime.Client()
+func resolveAgainstMountTable(ctx context.T, client ipc.Client, names []string) ([]string, error) {
// Try each server till one answers.
finalErr := errors.New("no servers to resolve query")
for _, name := range names {
@@ -28,7 +27,7 @@
// address, without recursing through ourselves. To this we force
// the entire name component to be terminal.
name = naming.MakeTerminal(name)
- call, err := client.StartCall(runtime.TODOContext(), name, "ResolveStep", nil, callTimeout)
+ call, err := client.StartCall(ctx, name, "ResolveStep", nil, callTimeout)
if err != nil {
finalErr = err
vlog.VI(2).Infof("ResolveStep.StartCall %s failed: %s", name, err)
@@ -74,7 +73,7 @@
}
// Resolve implements veyron2/naming.MountTable.
-func (ns *namespace) Resolve(name string) ([]string, error) {
+func (ns *namespace) Resolve(ctx context.T, name string) ([]string, error) {
vlog.VI(2).Infof("Resolve %s", name)
names := ns.rootName(name)
if len(names) == 0 {
@@ -88,7 +87,7 @@
}
var err error
curr := names
- if names, err = resolveAgainstMountTable(ns.rt, names); err != nil {
+ if names, err = resolveAgainstMountTable(ctx, ns.rt.Client(), names); err != nil {
// If the name could not be found in the mount table, return an error.
if verror.Equal(naming.ErrNoSuchNameRoot, err) {
@@ -107,7 +106,7 @@
}
// ResolveToMountTable implements veyron2/naming.MountTable.
-func (ns *namespace) ResolveToMountTable(name string) ([]string, error) {
+func (ns *namespace) ResolveToMountTable(ctx context.T, name string) ([]string, error) {
names := ns.rootName(name)
vlog.VI(2).Infof("ResolveToMountTable %s -> rootNames %s", name, names)
if len(names) == 0 {
@@ -121,7 +120,7 @@
if terminal(curr) {
return makeTerminal(last), nil
}
- if names, err = resolveAgainstMountTable(ns.rt, names); err != nil {
+ if names, err = resolveAgainstMountTable(ctx, ns.rt.Client(), names); err != nil {
if verror.Equal(naming.ErrNoSuchNameRoot, err) {
return makeTerminal(last), nil
}
@@ -156,12 +155,11 @@
return newNames, unresolveErr
}
-func unresolveAgainstServer(runtime veyron2.Runtime, names []string) ([]string, error) {
- client := runtime.Client()
+func unresolveAgainstServer(ctx context.T, client ipc.Client, names []string) ([]string, error) {
finalErr := errors.New("no servers to unresolve")
for _, name := range names {
name = naming.MakeTerminal(name)
- call, err := client.StartCall(runtime.TODOContext(), name, "UnresolveStep", nil, callTimeout)
+ call, err := client.StartCall(ctx, name, "UnresolveStep", nil, callTimeout)
if err != nil {
finalErr = err
vlog.VI(2).Infof("StartCall %q.UnresolveStep() failed: %s", name, err)
@@ -187,16 +185,16 @@
// branches?).
// Unesolve implements veyron2/naming.MountTable.
-func (ns *namespace) Unresolve(name string) ([]string, error) {
+func (ns *namespace) Unresolve(ctx context.T, name string) ([]string, error) {
vlog.VI(2).Infof("Unresolve %s", name)
- names, err := ns.Resolve(name)
+ names, err := ns.Resolve(ctx, name)
if err != nil {
return nil, err
}
for remaining := maxDepth; remaining > 0; remaining-- {
vlog.VI(2).Infof("Unresolve loop %s", names)
curr := names
- if names, err = unresolveAgainstServer(ns.rt, names); err != nil {
+ if names, err = unresolveAgainstServer(ctx, ns.rt.Client(), names); err != nil {
return nil, err
}
if len(names) == 0 {
diff --git a/runtimes/google/rt/ipc.go b/runtimes/google/rt/ipc.go
index 2c16c3d..5945ded 100644
--- a/runtimes/google/rt/ipc.go
+++ b/runtimes/google/rt/ipc.go
@@ -5,6 +5,7 @@
imanager "veyron/runtimes/google/ipc/stream/manager"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/ipc/stream"
"veyron2/naming"
@@ -37,11 +38,11 @@
return rt.client
}
-func (rt *vrt) NewContext() ipc.Context {
+func (rt *vrt) NewContext() context.T {
return iipc.InternalNewContext()
}
-func (rt *vrt) TODOContext() ipc.Context {
+func (rt *vrt) TODOContext() context.T {
return iipc.InternalNewContext()
}
@@ -69,7 +70,9 @@
if !idSpecified && rt.id.PrivateID != nil {
otherOpts = append(otherOpts, rt.id)
}
- return iipc.InternalNewServer(sm, mt, otherOpts...)
+
+ ctx := rt.NewContext()
+ return iipc.InternalNewServer(ctx, sm, mt, otherOpts...)
}
func (rt *vrt) NewStreamManager(opts ...stream.ManagerOpt) (stream.Manager, error) {
diff --git a/runtimes/google/testing/mocks/ipc/simple_client.go b/runtimes/google/testing/mocks/ipc/simple_client.go
index 907ecf8..9c50041 100644
--- a/runtimes/google/testing/mocks/ipc/simple_client.go
+++ b/runtimes/google/testing/mocks/ipc/simple_client.go
@@ -6,6 +6,7 @@
"reflect"
"sync"
+ "veyron2/context"
"veyron2/ipc"
)
@@ -39,7 +40,7 @@
func (c *SimpleMockClient) IPCBindOpt() {}
// StartCall Implements ipc.Client
-func (c *SimpleMockClient) StartCall(ctx ipc.Context, name, method string, args []interface{}, opts ...ipc.CallOpt) (ipc.Call, error) {
+func (c *SimpleMockClient) StartCall(ctx context.T, name, method string, args []interface{}, opts ...ipc.CallOpt) (ipc.Call, error) {
results, ok := c.results[method]
if !ok {
return nil, errors.New(fmt.Sprintf("method %s not found", method))
diff --git a/runtimes/google/vsync/vsync.vdl.go b/runtimes/google/vsync/vsync.vdl.go
index 82037e2..2055734 100644
--- a/runtimes/google/vsync/vsync.vdl.go
+++ b/runtimes/google/vsync/vsync.vdl.go
@@ -10,6 +10,7 @@
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -77,7 +78,7 @@
type Sync_ExcludingUniversal interface {
// GetDeltas returns a device's current generation vector and all the missing log records
// when compared to the incoming generation vector.
- GetDeltas(ctx _gen_ipc.Context, In GenVector, ClientID DeviceID, opts ..._gen_ipc.CallOpt) (reply SyncGetDeltasStream, err error)
+ GetDeltas(ctx _gen_context.T, In GenVector, ClientID DeviceID, opts ..._gen_ipc.CallOpt) (reply SyncGetDeltasStream, err error)
}
type Sync interface {
_gen_ipc.UniversalServiceMethods
@@ -189,7 +190,7 @@
name string
}
-func (__gen_c *clientStubSync) GetDeltas(ctx _gen_ipc.Context, In GenVector, ClientID DeviceID, opts ..._gen_ipc.CallOpt) (reply SyncGetDeltasStream, err error) {
+func (__gen_c *clientStubSync) GetDeltas(ctx _gen_context.T, In GenVector, ClientID DeviceID, opts ..._gen_ipc.CallOpt) (reply SyncGetDeltasStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetDeltas", []interface{}{In, ClientID}, opts...); err != nil {
return
@@ -198,7 +199,7 @@
return
}
-func (__gen_c *clientStubSync) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubSync) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -209,7 +210,7 @@
return
}
-func (__gen_c *clientStubSync) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubSync) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -220,7 +221,7 @@
return
}
-func (__gen_c *clientStubSync) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubSync) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/runtimes/google/vsync/watcher_test.go b/runtimes/google/vsync/watcher_test.go
index 73b5af7..39c05d8 100644
--- a/runtimes/google/vsync/watcher_test.go
+++ b/runtimes/google/vsync/watcher_test.go
@@ -12,6 +12,7 @@
"veyron/services/store/raw"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/rt"
"veyron2/services/watch"
@@ -39,19 +40,19 @@
type fakeVStore struct {
}
-func (*fakeVStore) GetMethodTags(_ ipc.Context, _ string, _ ...ipc.CallOpt) ([]interface{}, error) {
+func (*fakeVStore) GetMethodTags(_ context.T, _ string, _ ...ipc.CallOpt) ([]interface{}, error) {
panic("not implemented")
}
-func (*fakeVStore) UnresolveStep(_ ipc.Context, _ ...ipc.CallOpt) ([]string, error) {
+func (*fakeVStore) UnresolveStep(_ context.T, _ ...ipc.CallOpt) ([]string, error) {
panic("not implemented")
}
-func (*fakeVStore) Signature(_ ipc.Context, _ ...ipc.CallOpt) (ipc.ServiceSignature, error) {
+func (*fakeVStore) Signature(_ context.T, _ ...ipc.CallOpt) (ipc.ServiceSignature, error) {
panic("not implemented")
}
-func (v *fakeVStore) Watch(_ ipc.Context, req watch.Request, _ ...ipc.CallOpt) (watch.WatcherWatchStream, error) {
+func (v *fakeVStore) Watch(_ context.T, req watch.Request, _ ...ipc.CallOpt) (watch.WatcherWatchStream, error) {
// If "failWatch" is set, simulate a failed RPC call.
if info.failWatch {
info.failWatchCount++
@@ -65,7 +66,7 @@
return newFakeStream(), nil
}
-func (*fakeVStore) PutMutations(_ ipc.Context, _ ...ipc.CallOpt) (raw.StorePutMutationsStream, error) {
+func (*fakeVStore) PutMutations(_ context.T, _ ...ipc.CallOpt) (raw.StorePutMutationsStream, error) {
panic("not implemented")
}
diff --git a/services/mgmt/application/application.vdl.go b/services/mgmt/application/application.vdl.go
index 3e54da9..0d5b605 100644
--- a/services/mgmt/application/application.vdl.go
+++ b/services/mgmt/application/application.vdl.go
@@ -12,6 +12,7 @@
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -44,7 +45,7 @@
// Put adds the given tuple of application version (specified
// through the veyron name suffix) and application envelope to all
// of the given application profiles.
- Put(ctx _gen_ipc.Context, Profiles []string, Envelope application.Envelope, opts ..._gen_ipc.CallOpt) (err error)
+ Put(ctx _gen_context.T, Profiles []string, Envelope application.Envelope, opts ..._gen_ipc.CallOpt) (err error)
// Remove removes the application envelope for the given profile
// name and application version (specified through the veyron name
// suffix). If no version is specified as part of the suffix, the
@@ -52,7 +53,7 @@
//
// TODO(jsimsa): Add support for using "*" to specify all profiles
// when Matt implements Globing (or Ken implements querying).
- Remove(ctx _gen_ipc.Context, Profile string, opts ..._gen_ipc.CallOpt) (err error)
+ Remove(ctx _gen_context.T, Profile string, opts ..._gen_ipc.CallOpt) (err error)
}
type Repository interface {
_gen_ipc.UniversalServiceMethods
@@ -138,7 +139,7 @@
name string
}
-func (__gen_c *clientStubRepository) Put(ctx _gen_ipc.Context, Profiles []string, Envelope application.Envelope, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubRepository) Put(ctx _gen_context.T, Profiles []string, Envelope application.Envelope, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Put", []interface{}{Profiles, Envelope}, opts...); err != nil {
return
@@ -149,7 +150,7 @@
return
}
-func (__gen_c *clientStubRepository) Remove(ctx _gen_ipc.Context, Profile string, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubRepository) Remove(ctx _gen_context.T, Profile string, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Remove", []interface{}{Profile}, opts...); err != nil {
return
@@ -160,7 +161,7 @@
return
}
-func (__gen_c *clientStubRepository) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubRepository) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -171,7 +172,7 @@
return
}
-func (__gen_c *clientStubRepository) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubRepository) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -182,7 +183,7 @@
return
}
-func (__gen_c *clientStubRepository) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubRepository) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/services/mgmt/node/impl/impl_test.go b/services/mgmt/node/impl/impl_test.go
index ad89b20..2367074 100644
--- a/services/mgmt/node/impl/impl_test.go
+++ b/services/mgmt/node/impl/impl_test.go
@@ -253,11 +253,12 @@
//arName := naming.Join(mtName, arSuffix)
defer arCleanup()
- if s, err := mt.Resolve(arSuffix); err != nil || s[0] != "/"+arEndpoint.String()+"//ar" {
+ ctx := runtime.NewContext()
+ if s, err := mt.Resolve(ctx, arSuffix); err != nil || s[0] != "/"+arEndpoint.String()+"//ar" {
t.Errorf("failed to resolve %q", arSuffix)
t.Errorf("err: %v, got %v, want /%v//ar", err, s[0], arEndpoint)
}
- if s, err := mt.Resolve(cmSuffix); err != nil || s[0] != "/"+cmEndpoint.String()+"//cm" {
+ if s, err := mt.Resolve(ctx, cmSuffix); err != nil || s[0] != "/"+cmEndpoint.String()+"//cm" {
t.Errorf("failed to resolve %q", cmSuffix)
t.Errorf("err: %v, got %v, want /%v//cm", err, s[0], cmEndpoint)
}
@@ -277,7 +278,7 @@
envelope.Binary = cmName
name := naming.Join(mtName, "nm")
- results, err := mt.Resolve(name)
+ results, err := mt.Resolve(ctx, name)
if err != nil {
t.Fatalf("Resolve(%v) failed: %v", name, err)
}
@@ -292,7 +293,7 @@
invokeUpdate(t, nmAddress)
pid := getProcessID(t, child)
- if results, err := mt.Resolve(name); err != nil {
+ if results, err := mt.Resolve(ctx, name); err != nil {
t.Fatalf("Resolve(%v) failed: %v", name, err)
} else {
if expected, got := 2, len(results); expected != got {
diff --git a/services/mgmt/profile/profile.vdl.go b/services/mgmt/profile/profile.vdl.go
index f5914a3..fc8af95 100644
--- a/services/mgmt/profile/profile.vdl.go
+++ b/services/mgmt/profile/profile.vdl.go
@@ -12,6 +12,7 @@
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -67,13 +68,13 @@
profile.Profile_ExcludingUniversal
// Specification returns the profile specification for the profile
// identified through the veyron name suffix.
- Specification(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply Specification, err error)
+ Specification(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply Specification, err error)
// Put sets the profile specification for the profile identified
// through the veyron name suffix.
- Put(ctx _gen_ipc.Context, Specification Specification, opts ..._gen_ipc.CallOpt) (err error)
+ Put(ctx _gen_context.T, Specification Specification, opts ..._gen_ipc.CallOpt) (err error)
// Remove removes the profile specification for the profile
// identified through the veyron name suffix.
- Remove(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
+ Remove(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
}
type Profile interface {
_gen_ipc.UniversalServiceMethods
@@ -146,7 +147,7 @@
name string
}
-func (__gen_c *clientStubProfile) Specification(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply Specification, err error) {
+func (__gen_c *clientStubProfile) Specification(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply Specification, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Specification", nil, opts...); err != nil {
return
@@ -157,7 +158,7 @@
return
}
-func (__gen_c *clientStubProfile) Put(ctx _gen_ipc.Context, Specification Specification, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubProfile) Put(ctx _gen_context.T, Specification Specification, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Put", []interface{}{Specification}, opts...); err != nil {
return
@@ -168,7 +169,7 @@
return
}
-func (__gen_c *clientStubProfile) Remove(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubProfile) Remove(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Remove", nil, opts...); err != nil {
return
@@ -179,7 +180,7 @@
return
}
-func (__gen_c *clientStubProfile) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubProfile) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -190,7 +191,7 @@
return
}
-func (__gen_c *clientStubProfile) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubProfile) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -201,7 +202,7 @@
return
}
-func (__gen_c *clientStubProfile) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubProfile) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/services/mgmt/root/root.vdl.go b/services/mgmt/root/root.vdl.go
index 6fb23f5..5f62698 100644
--- a/services/mgmt/root/root.vdl.go
+++ b/services/mgmt/root/root.vdl.go
@@ -8,6 +8,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -23,7 +24,7 @@
type Root_ExcludingUniversal interface {
// Reset waits for the given deadline (in milliseconds) and then
// restars the host node machine.
- Reset(ctx _gen_ipc.Context, Deadline uint64, opts ..._gen_ipc.CallOpt) (err error)
+ Reset(ctx _gen_context.T, Deadline uint64, opts ..._gen_ipc.CallOpt) (err error)
}
type Root interface {
_gen_ipc.UniversalServiceMethods
@@ -81,7 +82,7 @@
name string
}
-func (__gen_c *clientStubRoot) Reset(ctx _gen_ipc.Context, Deadline uint64, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubRoot) Reset(ctx _gen_context.T, Deadline uint64, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Reset", []interface{}{Deadline}, opts...); err != nil {
return
@@ -92,7 +93,7 @@
return
}
-func (__gen_c *clientStubRoot) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubRoot) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -103,7 +104,7 @@
return
}
-func (__gen_c *clientStubRoot) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubRoot) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -114,7 +115,7 @@
return
}
-func (__gen_c *clientStubRoot) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubRoot) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/services/mounttable/lib/collection_test.vdl.go b/services/mounttable/lib/collection_test.vdl.go
index cd99693..986224c 100644
--- a/services/mounttable/lib/collection_test.vdl.go
+++ b/services/mounttable/lib/collection_test.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -21,10 +22,10 @@
// an entry exists, if Overwrite is true, then the binding is replaced,
// otherwise the call fails with an error. The Val must be no larger than
// MaxSize bytes.
- Export(ctx _gen_ipc.Context, Val string, Overwrite bool, opts ..._gen_ipc.CallOpt) (err error)
+ Export(ctx _gen_context.T, Val string, Overwrite bool, opts ..._gen_ipc.CallOpt) (err error)
// Lookup retrieves the value associated with a name. Returns an error if
// there is no such binding.
- Lookup(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []byte, err error)
+ Lookup(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []byte, err error)
}
type Collection interface {
_gen_ipc.UniversalServiceMethods
@@ -87,7 +88,7 @@
name string
}
-func (__gen_c *clientStubCollection) Export(ctx _gen_ipc.Context, Val string, Overwrite bool, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubCollection) Export(ctx _gen_context.T, Val string, Overwrite bool, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Export", []interface{}{Val, Overwrite}, opts...); err != nil {
return
@@ -98,7 +99,7 @@
return
}
-func (__gen_c *clientStubCollection) Lookup(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []byte, err error) {
+func (__gen_c *clientStubCollection) Lookup(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []byte, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Lookup", nil, opts...); err != nil {
return
@@ -109,7 +110,7 @@
return
}
-func (__gen_c *clientStubCollection) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubCollection) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -120,7 +121,7 @@
return
}
-func (__gen_c *clientStubCollection) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubCollection) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -131,7 +132,7 @@
return
}
-func (__gen_c *clientStubCollection) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubCollection) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/services/mounttable/lib/mounttable_test.go b/services/mounttable/lib/mounttable_test.go
index 8bd0f82..04616c1 100644
--- a/services/mounttable/lib/mounttable_test.go
+++ b/services/mounttable/lib/mounttable_test.go
@@ -13,6 +13,7 @@
_ "veyron/lib/testutil"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/naming"
"veyron2/rt"
@@ -51,16 +52,16 @@
return c
}
-func (stupidMT) Mount(string, string, time.Duration) error {
+func (stupidMT) Mount(context.T, string, string, time.Duration) error {
return errors.New("unimplemented")
}
-func (stupidMT) Unmount(string, string) error {
+func (stupidMT) Unmount(context.T, string, string) error {
return errors.New("unimplemented")
}
// Resolve will only go one level deep, i.e., it doesn't walk past the first mount point.
-func (mt stupidMT) Resolve(name string) ([]string, error) {
+func (mt stupidMT) Resolve(ctx context.T, name string) ([]string, error) {
vlog.VI(1).Infof("MyResolve %q", name)
address, suffix := naming.SplitAddressName(name)
if len(address) == 0 {
@@ -88,16 +89,16 @@
return servers, nil
}
-func (s stupidMT) Unresolve(name string) ([]string, error) {
- return s.Resolve(name)
+func (s stupidMT) Unresolve(ctx context.T, name string) ([]string, error) {
+ return s.Resolve(ctx, name)
}
-func (stupidMT) ResolveToMountTable(name string) ([]string, error) {
+func (stupidMT) ResolveToMountTable(ctx context.T, name string) ([]string, error) {
return nil, errors.New("ResolveToMountTable is not implemented in this MountTable")
}
// Glob implements naming.MountTable.Glob.
-func (stupidMT) Glob(pattern string) (chan naming.MountEntry, error) {
+func (stupidMT) Glob(ctx context.T, pattern string) (chan naming.MountEntry, error) {
return nil, errors.New("Glob is not implemented in this MountTable")
}
diff --git a/services/store/raw/service.vdl.go b/services/store/raw/service.vdl.go
index a031a4d..ea7bb7b 100644
--- a/services/store/raw/service.vdl.go
+++ b/services/store/raw/service.vdl.go
@@ -14,6 +14,7 @@
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -63,7 +64,7 @@
// PutMutations atomically commits a stream of Mutations when the stream is
// closed. Mutations are not committed if the request is cancelled before
// the stream has been closed.
- PutMutations(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply StorePutMutationsStream, err error)
+ PutMutations(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply StorePutMutationsStream, err error)
}
type Store interface {
_gen_ipc.UniversalServiceMethods
@@ -194,7 +195,7 @@
name string
}
-func (__gen_c *clientStubStore) PutMutations(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply StorePutMutationsStream, err error) {
+func (__gen_c *clientStubStore) PutMutations(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply StorePutMutationsStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "PutMutations", nil, opts...); err != nil {
return
@@ -203,7 +204,7 @@
return
}
-func (__gen_c *clientStubStore) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubStore) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -214,7 +215,7 @@
return
}
-func (__gen_c *clientStubStore) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubStore) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -225,7 +226,7 @@
return
}
-func (__gen_c *clientStubStore) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubStore) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
diff --git a/services/wspr/wsprd/lib/signature_manager.go b/services/wspr/wsprd/lib/signature_manager.go
index 034e743..642dfe8 100644
--- a/services/wspr/wsprd/lib/signature_manager.go
+++ b/services/wspr/wsprd/lib/signature_manager.go
@@ -4,6 +4,7 @@
"sync"
"time"
+ "veyron2/context"
"veyron2/ipc"
)
@@ -40,7 +41,7 @@
// signature uses the given client to fetch the signature for the given service name.
// It locks until it fetches the service signature from the remote server, if not a cache hit.
-func (sm *signatureManager) signature(ctx ipc.Context, name string, client ipc.Client) (*ipc.ServiceSignature, error) {
+func (sm *signatureManager) signature(ctx context.T, name string, client ipc.Client) (*ipc.ServiceSignature, error) {
sm.Lock()
defer sm.Unlock()
diff --git a/tools/mounttable/impl/impl.go b/tools/mounttable/impl/impl.go
index bc250a8..d12d6e3 100644
--- a/tools/mounttable/impl/impl.go
+++ b/tools/mounttable/impl/impl.go
@@ -12,7 +12,8 @@
)
func bindMT(name string) (mounttable.MountTable, error) {
- mts, err := rt.R().MountTable().ResolveToMountTable(name)
+ ctx := rt.R().NewContext()
+ mts, err := rt.R().MountTable().ResolveToMountTable(ctx, name)
if err != nil {
return nil, err
}
diff --git a/tools/vrpc/impl/impl.go b/tools/vrpc/impl/impl.go
index 8ace3da..05579b7 100644
--- a/tools/vrpc/impl/impl.go
+++ b/tools/vrpc/impl/impl.go
@@ -9,6 +9,7 @@
idl_test_base "veyron/tools/vrpc/test_base"
"veyron2"
+ "veyron2/context"
"veyron2/ipc"
"veyron2/rt"
"veyron2/vdl"
@@ -209,7 +210,7 @@
return client, nil
}
-func getSignature(ctx ipc.Context, cmd *cmdline.Command, server string, client ipc.Client) (ipc.ServiceSignature, error) {
+func getSignature(ctx context.T, cmd *cmdline.Command, server string, client ipc.Client) (ipc.ServiceSignature, error) {
call, err := client.StartCall(ctx, server, "Signature", nil)
if err != nil {
return ipc.ServiceSignature{}, fmt.Errorf("client.StartCall(%s, Signature, nil) failed with %v", server, err)
diff --git a/tools/vrpc/test_base/test_base.vdl.go b/tools/vrpc/test_base/test_base.vdl.go
index 8334c68..eabe26a 100644
--- a/tools/vrpc/test_base/test_base.vdl.go
+++ b/tools/vrpc/test_base/test_base.vdl.go
@@ -6,6 +6,7 @@
import (
// The non-user imports are prefixed with "_gen_" to prevent collisions.
_gen_veyron2 "veyron2"
+ _gen_context "veyron2/context"
_gen_ipc "veyron2/ipc"
_gen_naming "veyron2/naming"
_gen_rt "veyron2/rt"
@@ -23,29 +24,29 @@
// to enable embedding without method collisions. Not to be used directly by clients.
type TypeTester_ExcludingUniversal interface {
// Methods to test support for generic types.
- Bool(ctx _gen_ipc.Context, I1 bool, opts ..._gen_ipc.CallOpt) (reply bool, err error)
- Float32(ctx _gen_ipc.Context, I1 float32, opts ..._gen_ipc.CallOpt) (reply float32, err error)
- Float64(ctx _gen_ipc.Context, I1 float64, opts ..._gen_ipc.CallOpt) (reply float64, err error)
- Int32(ctx _gen_ipc.Context, I1 int32, opts ..._gen_ipc.CallOpt) (reply int32, err error)
- Int64(ctx _gen_ipc.Context, I1 int64, opts ..._gen_ipc.CallOpt) (reply int64, err error)
- String(ctx _gen_ipc.Context, I1 string, opts ..._gen_ipc.CallOpt) (reply string, err error)
- Byte(ctx _gen_ipc.Context, I1 byte, opts ..._gen_ipc.CallOpt) (reply byte, err error)
- UInt32(ctx _gen_ipc.Context, I1 uint32, opts ..._gen_ipc.CallOpt) (reply uint32, err error)
- UInt64(ctx _gen_ipc.Context, I1 uint64, opts ..._gen_ipc.CallOpt) (reply uint64, err error)
+ Bool(ctx _gen_context.T, I1 bool, opts ..._gen_ipc.CallOpt) (reply bool, err error)
+ Float32(ctx _gen_context.T, I1 float32, opts ..._gen_ipc.CallOpt) (reply float32, err error)
+ Float64(ctx _gen_context.T, I1 float64, opts ..._gen_ipc.CallOpt) (reply float64, err error)
+ Int32(ctx _gen_context.T, I1 int32, opts ..._gen_ipc.CallOpt) (reply int32, err error)
+ Int64(ctx _gen_context.T, I1 int64, opts ..._gen_ipc.CallOpt) (reply int64, err error)
+ String(ctx _gen_context.T, I1 string, opts ..._gen_ipc.CallOpt) (reply string, err error)
+ Byte(ctx _gen_context.T, I1 byte, opts ..._gen_ipc.CallOpt) (reply byte, err error)
+ UInt32(ctx _gen_context.T, I1 uint32, opts ..._gen_ipc.CallOpt) (reply uint32, err error)
+ UInt64(ctx _gen_context.T, I1 uint64, opts ..._gen_ipc.CallOpt) (reply uint64, err error)
// Methods to test support for composite types.
- InputArray(ctx _gen_ipc.Context, I1 [2]byte, opts ..._gen_ipc.CallOpt) (err error)
- InputMap(ctx _gen_ipc.Context, I1 map[byte]byte, opts ..._gen_ipc.CallOpt) (err error)
- InputSlice(ctx _gen_ipc.Context, I1 []byte, opts ..._gen_ipc.CallOpt) (err error)
- InputStruct(ctx _gen_ipc.Context, I1 Struct, opts ..._gen_ipc.CallOpt) (err error)
- OutputArray(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply [2]byte, err error)
- OutputMap(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply map[byte]byte, err error)
- OutputSlice(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []byte, err error)
- OutputStruct(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply Struct, err error)
+ InputArray(ctx _gen_context.T, I1 [2]byte, opts ..._gen_ipc.CallOpt) (err error)
+ InputMap(ctx _gen_context.T, I1 map[byte]byte, opts ..._gen_ipc.CallOpt) (err error)
+ InputSlice(ctx _gen_context.T, I1 []byte, opts ..._gen_ipc.CallOpt) (err error)
+ InputStruct(ctx _gen_context.T, I1 Struct, opts ..._gen_ipc.CallOpt) (err error)
+ OutputArray(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply [2]byte, err error)
+ OutputMap(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply map[byte]byte, err error)
+ OutputSlice(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []byte, err error)
+ OutputStruct(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply Struct, err error)
// Methods to test support for different number of arguments.
- NoArguments(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error)
- MultipleArguments(ctx _gen_ipc.Context, I1 int32, I2 int32, opts ..._gen_ipc.CallOpt) (O1 int32, O2 int32, err error)
+ NoArguments(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error)
+ MultipleArguments(ctx _gen_context.T, I1 int32, I2 int32, opts ..._gen_ipc.CallOpt) (O1 int32, O2 int32, err error)
// Methods to test support for streaming.
- StreamingOutput(ctx _gen_ipc.Context, NumStreamItems int32, StreamItem bool, opts ..._gen_ipc.CallOpt) (reply TypeTesterStreamingOutputStream, err error)
+ StreamingOutput(ctx _gen_context.T, NumStreamItems int32, StreamItem bool, opts ..._gen_ipc.CallOpt) (reply TypeTesterStreamingOutputStream, err error)
}
type TypeTester interface {
_gen_ipc.UniversalServiceMethods
@@ -178,7 +179,7 @@
name string
}
-func (__gen_c *clientStubTypeTester) Bool(ctx _gen_ipc.Context, I1 bool, opts ..._gen_ipc.CallOpt) (reply bool, err error) {
+func (__gen_c *clientStubTypeTester) Bool(ctx _gen_context.T, I1 bool, opts ..._gen_ipc.CallOpt) (reply bool, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Bool", []interface{}{I1}, opts...); err != nil {
return
@@ -189,7 +190,7 @@
return
}
-func (__gen_c *clientStubTypeTester) Float32(ctx _gen_ipc.Context, I1 float32, opts ..._gen_ipc.CallOpt) (reply float32, err error) {
+func (__gen_c *clientStubTypeTester) Float32(ctx _gen_context.T, I1 float32, opts ..._gen_ipc.CallOpt) (reply float32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Float32", []interface{}{I1}, opts...); err != nil {
return
@@ -200,7 +201,7 @@
return
}
-func (__gen_c *clientStubTypeTester) Float64(ctx _gen_ipc.Context, I1 float64, opts ..._gen_ipc.CallOpt) (reply float64, err error) {
+func (__gen_c *clientStubTypeTester) Float64(ctx _gen_context.T, I1 float64, opts ..._gen_ipc.CallOpt) (reply float64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Float64", []interface{}{I1}, opts...); err != nil {
return
@@ -211,7 +212,7 @@
return
}
-func (__gen_c *clientStubTypeTester) Int32(ctx _gen_ipc.Context, I1 int32, opts ..._gen_ipc.CallOpt) (reply int32, err error) {
+func (__gen_c *clientStubTypeTester) Int32(ctx _gen_context.T, I1 int32, opts ..._gen_ipc.CallOpt) (reply int32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Int32", []interface{}{I1}, opts...); err != nil {
return
@@ -222,7 +223,7 @@
return
}
-func (__gen_c *clientStubTypeTester) Int64(ctx _gen_ipc.Context, I1 int64, opts ..._gen_ipc.CallOpt) (reply int64, err error) {
+func (__gen_c *clientStubTypeTester) Int64(ctx _gen_context.T, I1 int64, opts ..._gen_ipc.CallOpt) (reply int64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Int64", []interface{}{I1}, opts...); err != nil {
return
@@ -233,7 +234,7 @@
return
}
-func (__gen_c *clientStubTypeTester) String(ctx _gen_ipc.Context, I1 string, opts ..._gen_ipc.CallOpt) (reply string, err error) {
+func (__gen_c *clientStubTypeTester) String(ctx _gen_context.T, I1 string, opts ..._gen_ipc.CallOpt) (reply string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "String", []interface{}{I1}, opts...); err != nil {
return
@@ -244,7 +245,7 @@
return
}
-func (__gen_c *clientStubTypeTester) Byte(ctx _gen_ipc.Context, I1 byte, opts ..._gen_ipc.CallOpt) (reply byte, err error) {
+func (__gen_c *clientStubTypeTester) Byte(ctx _gen_context.T, I1 byte, opts ..._gen_ipc.CallOpt) (reply byte, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Byte", []interface{}{I1}, opts...); err != nil {
return
@@ -255,7 +256,7 @@
return
}
-func (__gen_c *clientStubTypeTester) UInt32(ctx _gen_ipc.Context, I1 uint32, opts ..._gen_ipc.CallOpt) (reply uint32, err error) {
+func (__gen_c *clientStubTypeTester) UInt32(ctx _gen_context.T, I1 uint32, opts ..._gen_ipc.CallOpt) (reply uint32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UInt32", []interface{}{I1}, opts...); err != nil {
return
@@ -266,7 +267,7 @@
return
}
-func (__gen_c *clientStubTypeTester) UInt64(ctx _gen_ipc.Context, I1 uint64, opts ..._gen_ipc.CallOpt) (reply uint64, err error) {
+func (__gen_c *clientStubTypeTester) UInt64(ctx _gen_context.T, I1 uint64, opts ..._gen_ipc.CallOpt) (reply uint64, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UInt64", []interface{}{I1}, opts...); err != nil {
return
@@ -277,7 +278,7 @@
return
}
-func (__gen_c *clientStubTypeTester) InputArray(ctx _gen_ipc.Context, I1 [2]byte, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubTypeTester) InputArray(ctx _gen_context.T, I1 [2]byte, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "InputArray", []interface{}{I1}, opts...); err != nil {
return
@@ -288,7 +289,7 @@
return
}
-func (__gen_c *clientStubTypeTester) InputMap(ctx _gen_ipc.Context, I1 map[byte]byte, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubTypeTester) InputMap(ctx _gen_context.T, I1 map[byte]byte, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "InputMap", []interface{}{I1}, opts...); err != nil {
return
@@ -299,7 +300,7 @@
return
}
-func (__gen_c *clientStubTypeTester) InputSlice(ctx _gen_ipc.Context, I1 []byte, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubTypeTester) InputSlice(ctx _gen_context.T, I1 []byte, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "InputSlice", []interface{}{I1}, opts...); err != nil {
return
@@ -310,7 +311,7 @@
return
}
-func (__gen_c *clientStubTypeTester) InputStruct(ctx _gen_ipc.Context, I1 Struct, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubTypeTester) InputStruct(ctx _gen_context.T, I1 Struct, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "InputStruct", []interface{}{I1}, opts...); err != nil {
return
@@ -321,7 +322,7 @@
return
}
-func (__gen_c *clientStubTypeTester) OutputArray(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply [2]byte, err error) {
+func (__gen_c *clientStubTypeTester) OutputArray(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply [2]byte, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "OutputArray", nil, opts...); err != nil {
return
@@ -332,7 +333,7 @@
return
}
-func (__gen_c *clientStubTypeTester) OutputMap(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply map[byte]byte, err error) {
+func (__gen_c *clientStubTypeTester) OutputMap(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply map[byte]byte, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "OutputMap", nil, opts...); err != nil {
return
@@ -343,7 +344,7 @@
return
}
-func (__gen_c *clientStubTypeTester) OutputSlice(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []byte, err error) {
+func (__gen_c *clientStubTypeTester) OutputSlice(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []byte, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "OutputSlice", nil, opts...); err != nil {
return
@@ -354,7 +355,7 @@
return
}
-func (__gen_c *clientStubTypeTester) OutputStruct(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply Struct, err error) {
+func (__gen_c *clientStubTypeTester) OutputStruct(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply Struct, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "OutputStruct", nil, opts...); err != nil {
return
@@ -365,7 +366,7 @@
return
}
-func (__gen_c *clientStubTypeTester) NoArguments(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (err error) {
+func (__gen_c *clientStubTypeTester) NoArguments(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "NoArguments", nil, opts...); err != nil {
return
@@ -376,7 +377,7 @@
return
}
-func (__gen_c *clientStubTypeTester) MultipleArguments(ctx _gen_ipc.Context, I1 int32, I2 int32, opts ..._gen_ipc.CallOpt) (O1 int32, O2 int32, err error) {
+func (__gen_c *clientStubTypeTester) MultipleArguments(ctx _gen_context.T, I1 int32, I2 int32, opts ..._gen_ipc.CallOpt) (O1 int32, O2 int32, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "MultipleArguments", []interface{}{I1, I2}, opts...); err != nil {
return
@@ -387,7 +388,7 @@
return
}
-func (__gen_c *clientStubTypeTester) StreamingOutput(ctx _gen_ipc.Context, NumStreamItems int32, StreamItem bool, opts ..._gen_ipc.CallOpt) (reply TypeTesterStreamingOutputStream, err error) {
+func (__gen_c *clientStubTypeTester) StreamingOutput(ctx _gen_context.T, NumStreamItems int32, StreamItem bool, opts ..._gen_ipc.CallOpt) (reply TypeTesterStreamingOutputStream, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "StreamingOutput", []interface{}{NumStreamItems, StreamItem}, opts...); err != nil {
return
@@ -396,7 +397,7 @@
return
}
-func (__gen_c *clientStubTypeTester) UnresolveStep(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
+func (__gen_c *clientStubTypeTester) UnresolveStep(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply []string, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "UnresolveStep", nil, opts...); err != nil {
return
@@ -407,7 +408,7 @@
return
}
-func (__gen_c *clientStubTypeTester) Signature(ctx _gen_ipc.Context, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
+func (__gen_c *clientStubTypeTester) Signature(ctx _gen_context.T, opts ..._gen_ipc.CallOpt) (reply _gen_ipc.ServiceSignature, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "Signature", nil, opts...); err != nil {
return
@@ -418,7 +419,7 @@
return
}
-func (__gen_c *clientStubTypeTester) GetMethodTags(ctx _gen_ipc.Context, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
+func (__gen_c *clientStubTypeTester) GetMethodTags(ctx _gen_context.T, method string, opts ..._gen_ipc.CallOpt) (reply []interface{}, err error) {
var call _gen_ipc.Call
if call, err = __gen_c.client.StartCall(ctx, __gen_c.name, "GetMethodTags", []interface{}{method}, opts...); err != nil {
return
