core: Remove the NewStreamManager and Namespace methods of Runtime.
This is part of the runtimeX migration.
Change-Id: Ib2efd74513b54f8fb06ca78e1016f2b11d9c3ce8
diff --git a/tools/debug/impl.go b/tools/debug/impl.go
index e895973..e85ad2a 100644
--- a/tools/debug/impl.go
+++ b/tools/debug/impl.go
@@ -15,6 +15,7 @@
"v.io/core/veyron/lib/signals"
"v.io/core/veyron/services/mgmt/pprof/client"
istats "v.io/core/veyron/services/mgmt/stats"
+ "v.io/core/veyron2"
"v.io/core/veyron2/context"
"v.io/core/veyron2/naming"
"v.io/core/veyron2/services/mgmt/logreader"
@@ -192,7 +193,7 @@
defer wg.Done()
ctx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
- c, err := runtime.Namespace().Glob(ctx, pattern)
+ c, err := veyron2.GetNamespace(ctx).Glob(ctx, pattern)
if err != nil {
errors <- fmt.Errorf("%s: %v", pattern, err)
return
diff --git a/tools/mounttable/impl.go b/tools/mounttable/impl.go
index 39bd34e..be3df84 100644
--- a/tools/mounttable/impl.go
+++ b/tools/mounttable/impl.go
@@ -27,8 +27,11 @@
}
func runGlob(cmd *cmdline.Command, args []string) error {
+ ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
+ defer cancel()
+
if len(args) == 1 {
- roots := runtime.Namespace().Roots()
+ roots := veyron2.GetNamespace(ctx).Roots()
if len(roots) == 0 {
return errors.New("no namespace root")
}
@@ -37,8 +40,7 @@
if expected, got := 2, len(args); expected != got {
return cmd.UsageErrorf("glob: incorrect number of arguments, expected %d, got %d", expected, got)
}
- ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
- defer cancel()
+
name, pattern := args[0], args[1]
client := veyron2.GetClient(ctx)
call, err := client.StartCall(ctx, name, ipc.GlobMethod, []interface{}{pattern}, options.NoResolve{})
diff --git a/tools/namespace/impl.go b/tools/namespace/impl.go
index d50e2c2..b2df4db 100644
--- a/tools/namespace/impl.go
+++ b/tools/namespace/impl.go
@@ -4,6 +4,7 @@
"fmt"
"time"
+ "v.io/core/veyron2"
"v.io/core/veyron2/context"
"v.io/core/veyron2/naming"
"v.io/core/veyron2/vlog"
@@ -27,9 +28,12 @@
return cmd.UsageErrorf("glob: incorrect number of arguments, expected %d, got %d", expected, got)
}
pattern := args[0]
- ns := runtime.Namespace()
+
ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
defer cancel()
+
+ ns := veyron2.GetNamespace(ctx)
+
c, err := ns.Glob(ctx, pattern)
if err != nil {
vlog.Infof("ns.Glob(%q) failed: %v", pattern, err)
@@ -75,9 +79,12 @@
if err != nil {
return fmt.Errorf("TTL parse error: %v", err)
}
- ns := runtime.Namespace()
+
ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
defer cancel()
+
+ ns := veyron2.GetNamespace(ctx)
+
if err = ns.Mount(ctx, name, server, ttl); err != nil {
vlog.Infof("ns.Mount(%q, %q, %s) failed: %v", name, server, ttl, err)
return err
@@ -104,9 +111,12 @@
}
name := args[0]
server := args[1]
- ns := runtime.Namespace()
+
ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
defer cancel()
+
+ ns := veyron2.GetNamespace(ctx)
+
if err := ns.Unmount(ctx, name, server); err != nil {
vlog.Infof("ns.Unmount(%q, %q) failed: %v", name, server, err)
return err
@@ -129,9 +139,12 @@
return cmd.UsageErrorf("resolve: incorrect number of arguments, expected %d, got %d", expected, got)
}
name := args[0]
- ns := runtime.Namespace()
+
ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
defer cancel()
+
+ ns := veyron2.GetNamespace(ctx)
+
servers, err := ns.Resolve(ctx, name)
if err != nil {
vlog.Infof("ns.Resolve(%q) failed: %v", name, err)
@@ -157,9 +170,12 @@
return cmd.UsageErrorf("resolvetomt: incorrect number of arguments, expected %d, got %d", expected, got)
}
name := args[0]
- ns := runtime.Namespace()
+
ctx, cancel := context.WithTimeout(runtime.NewContext(), time.Minute)
defer cancel()
+
+ ns := veyron2.GetNamespace(ctx)
+
e, err := ns.ResolveToMountTableX(ctx, name)
if err != nil {
vlog.Infof("ns.ResolveToMountTableX(%q) failed: %v", name, err)
diff --git a/tools/naming/simulator/driver.go b/tools/naming/simulator/driver.go
index 1b3a15b..847d224 100644
--- a/tools/naming/simulator/driver.go
+++ b/tools/naming/simulator/driver.go
@@ -17,6 +17,7 @@
"unicode"
"v.io/core/veyron2"
+ "v.io/core/veyron2/context"
"v.io/core/veyron2/rt"
"v.io/core/veyron/lib/expect"
@@ -96,6 +97,7 @@
}
var runtime veyron2.Runtime
+var ctx *context.T
func main() {
var err error
@@ -103,6 +105,7 @@
panic(err)
}
defer runtime.Cleanup()
+ ctx = runtime.NewContext()
// Subprocesses commands are run by fork/execing this binary
// so we must test to see if this instance is a subprocess or the
diff --git a/tools/naming/simulator/shell_functions.go b/tools/naming/simulator/shell_functions.go
index a2eeed0..396fe6d 100644
--- a/tools/naming/simulator/shell_functions.go
+++ b/tools/naming/simulator/shell_functions.go
@@ -5,6 +5,7 @@
"io"
"time"
+ "v.io/core/veyron2"
"v.io/core/veyron2/context"
"v.io/core/veyron2/naming"
@@ -61,8 +62,8 @@
if err != nil {
return fmt.Errorf("failed to parse time from %q", ttlstr)
}
- ns := runtime.Namespace()
- if err := ns.Mount(runtime.NewContext(), mp, server, ttl, opts...); err != nil {
+ ns := veyron2.GetNamespace(ctx)
+ if err := ns.Mount(ctx, mp, server, ttl, opts...); err != nil {
return err
}
fmt.Fprintf(stdout, "Mount(%s, %s, %s, %v)\n", mp, server, ttl, opts)
@@ -82,7 +83,7 @@
default:
return fmt.Errorf("arg must be 'on' or 'off'")
}
- runtime.Namespace().CacheCtl(naming.DisableCache(disable))
+ veyron2.GetNamespace(ctx).CacheCtl(naming.DisableCache(disable))
return nil
}
@@ -93,7 +94,7 @@
return err
}
name := args[1]
- servers, err := fn(runtime.NewContext(), name)
+ servers, err := fn(ctx, name)
if err != nil {
fmt.Fprintf(stdout, "RN=0\n")
return err
@@ -106,13 +107,13 @@
}
func resolveObject(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- return resolve(runtime.Namespace().Resolve, stdin, stdout, stderr, env, args...)
+ return resolve(veyron2.GetNamespace(ctx).Resolve, stdin, stdout, stderr, env, args...)
}
func resolveMT(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- return resolve(runtime.Namespace().ResolveToMountTable, stdin, stdout, stderr, env, args...)
+ return resolve(veyron2.GetNamespace(ctx).ResolveToMountTable, stdin, stdout, stderr, env, args...)
}
func setNamespaceRoots(stdin io.Reader, stdout, stderr io.Writer, env map[string]string, args ...string) error {
- return runtime.Namespace().SetRoots(args[1:]...)
+ return veyron2.GetNamespace(ctx).SetRoots(args[1:]...)
}
