core: Change ipc protocol to use time.Deadline
MultiPart: 2/3
Change-Id: I3311ca341b87fe3257c546f62ccfc867daef7fae
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index b2cda94..f4a3b96 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -20,6 +20,7 @@
"v.io/v23/options"
"v.io/v23/security"
"v.io/v23/vdl"
+ vtime "v.io/v23/vdlroot/time"
"v.io/v23/verror"
"v.io/v23/vom"
"v.io/v23/vtrace"
@@ -346,7 +347,7 @@
}
if r, ok := getRetryTimeoutOpt(opts); ok {
// Caller specified deadline.
- deadline = time.Now().Add(time.Duration(r))
+ deadline = time.Now().Add(r)
}
var lastErr error
@@ -468,11 +469,10 @@
go c.tryCreateFlow(ctx, i, server, ch, vcOpts)
}
- delay := time.Duration(ipc.NoTimeout)
- if dl, ok := ctx.Deadline(); ok {
- delay = dl.Sub(time.Now())
+ var timeoutChan <-chan time.Time
+ if deadline, ok := ctx.Deadline(); ok {
+ timeoutChan = time.After(deadline.Sub(time.Now()))
}
- timeoutChan := time.After(delay)
for {
// Block for at least one new response from the server, or the timeout.
@@ -563,14 +563,11 @@
}()
}
- timeout := time.Duration(ipc.NoTimeout)
- if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
- timeout = deadline.Sub(time.Now())
- }
+ deadline, _ := ctx.Deadline()
if noDischarges {
fc.dc = nil
}
- if verr := fc.start(r.suffix, method, args, timeout, grantedB); verr != nil {
+ if verr := fc.start(r.suffix, method, args, deadline, grantedB); verr != nil {
return nil, verror.NoRetry, verr
}
return fc, verror.NoRetry, nil
@@ -786,7 +783,7 @@
return err
}
-func (fc *flowClient) start(suffix, method string, args []interface{}, timeout time.Duration, blessings security.Blessings) error {
+func (fc *flowClient) start(suffix, method string, args []interface{}, deadline time.Time, blessings security.Blessings) error {
// Fetch any discharges for third-party caveats on the client's blessings
// if this client owns a discharge-client.
if self := fc.flow.LocalBlessings(); fc.dc != nil {
@@ -812,7 +809,7 @@
Suffix: suffix,
Method: method,
NumPosArgs: uint64(len(args)),
- Timeout: int64(timeout),
+ Deadline: vtime.Deadline{deadline},
GrantedBlessings: security.MarshalBlessings(blessings),
Blessings: blessingsRequest,
Discharges: discharges,
diff --git a/runtimes/google/ipc/server.go b/runtimes/google/ipc/server.go
index f1f42f3..006d562 100644
--- a/runtimes/google/ipc/server.go
+++ b/runtimes/google/ipc/server.go
@@ -1044,8 +1044,8 @@
fs.T, _ = vtrace.SetContinuedTrace(fs.T, spanName, req.TraceRequest)
var cancel context.CancelFunc
- if req.Timeout != ipc.NoTimeout {
- fs.T, cancel = context.WithDeadline(fs.T, fs.starttime.Add(time.Duration(req.Timeout)))
+ if !req.Deadline.IsZero() {
+ fs.T, cancel = context.WithDeadline(fs.T, req.Deadline.Time)
} else {
fs.T, cancel = context.WithCancel(fs.T)
}
diff --git a/services/wsprd/app/app.vdl b/services/wsprd/app/app.vdl
index 7feeead..7fb239f 100644
--- a/services/wsprd/app/app.vdl
+++ b/services/wsprd/app/app.vdl
@@ -7,11 +7,12 @@
)
type VeyronRPCRequest struct {
- Name string
- Method string
- NumInArgs int32
- NumOutArgs int32
- IsStreaming bool
+ Name string
+ Method string
+ NumInArgs int32
+ NumOutArgs int32
+ IsStreaming bool
+ // TODO(bjornick): Change Timeout to use time.WireDeadline instead.
Timeout int64
TraceRequest vtrace.Request
}
diff --git a/services/wsprd/app/app.vdl.go b/services/wsprd/app/app.vdl.go
index ededee2..450683e 100644
--- a/services/wsprd/app/app.vdl.go
+++ b/services/wsprd/app/app.vdl.go
@@ -14,11 +14,12 @@
)
type VeyronRPCRequest struct {
- Name string
- Method string
- NumInArgs int32
- NumOutArgs int32
- IsStreaming bool
+ Name string
+ Method string
+ NumInArgs int32
+ NumOutArgs int32
+ IsStreaming bool
+ // TODO(bjornick): Change Timeout to use time.WireDeadline instead.
Timeout int64
TraceRequest vtrace.Request
}
diff --git a/services/wsprd/ipc/server/server.go b/services/wsprd/ipc/server/server.go
index 17f735e..82e3b3b 100644
--- a/services/wsprd/ipc/server/server.go
+++ b/services/wsprd/ipc/server/server.go
@@ -353,11 +353,10 @@
}
// TODO(bprosnitz) Consider using a different timeout than the standard ipc timeout.
- delay := time.Duration(ipc.NoTimeout)
- if dl, ok := ctx.Context().Deadline(); ok {
- delay = dl.Sub(time.Now())
+ var timeoutChan <-chan time.Time
+ if deadline, ok := ctx.Context().Deadline(); ok {
+ timeoutChan = time.After(deadline.Sub(time.Now()))
}
- timeoutChan := time.After(delay)
select {
case <-timeoutChan:
diff --git a/services/wsprd/lib/time.go b/services/wsprd/lib/time.go
index 7b417cf..715112c 100644
--- a/services/wsprd/lib/time.go
+++ b/services/wsprd/lib/time.go
@@ -1,23 +1,19 @@
package lib
-import (
- "time"
+import "time"
- "v.io/v23/ipc"
-)
-
-const nanosecondsPerMillisecond = 1000000
-
-// Javascript uses millisecond time units, not nanoseconds.
-// This is both because they are the native time unit, and because
-// otherwise JS numbers would not be capable of representing the
-// full time range available to Go programs.
-const JSIPCNoTimeout = ipc.NoTimeout / nanosecondsPerMillisecond
+// Javascript uses millisecond time units. This is both because they are the
+// native time unit, and because otherwise JS numbers would not be capable of
+// representing the full time range available to Go programs.
+//
+// TODO(bjornick,toddw): Pick a better sentry for no timeout, or change to using
+// VDL time.WireDeadline.
+const JSIPCNoTimeout = int64(6307200000000) // 200 years in milliseconds
func GoToJSDuration(d time.Duration) int64 {
- return int64(d) / nanosecondsPerMillisecond
+ return int64(d / time.Millisecond)
}
func JSToGoDuration(d int64) time.Duration {
- return time.Duration(d * nanosecondsPerMillisecond)
+ return time.Duration(d) * time.Millisecond
}
