Compare revisions

Allan MacKinnon · Allan MacKinnon · Allan MacKinnon · James Robinson · Aaron Green · Roland McGrath
--- a/build/fuzzing/fuzzer.gni
+++ b/build/fuzzing/fuzzer.gni
@@ -8,9 +8,9 @@ import("//build/package.gni")
 # TODO(aarongreen): SEC-224.  Add tests to catch fuzzer building/packaging
 # regressions.

-# Defines a fuzz target component
+# Defines a fuzzer binary.
 #
-# The fuzz_target template is used to create components containing binaries
+# The fuzzer template is used to create components containing binaries
 # which leverage LLVM's libFuzzer to perform fuzz testing.
 #
 # Parameters
@@ -21,7 +21,7 @@ import("//build/package.gni")
 #
 #   binary (optional)
 #     [path] The path to the primary binary for the component. This can be
-#     used to indicate a fuzz_target binary built in a different phase of the
+#     used to indicate a fuzzer binary built in a different phase of the
 #     build, e.g. in zircon.
 #
 #     NOTE: Exactly one of sources or binary must be set.
@@ -35,16 +35,16 @@ import("//build/package.gni")
 #     [file] If specified, a file containing inputs, one per line, that the
 #     fuzzer will use to generate new mutations.
 #
-template("fuzz_target") {
+template("fuzzer") {
  assert(
      (defined(invoker.binary) && !defined(invoker.sources)) ||
          (!defined(invoker.binary) || defined(invoker.sources)),
      "Exactly one of `binary` or `sources` must be defined for $target_name")
-  fuzz_target_name = target_name
+  fuzzer_name = target_name

  # If not specified, generate the component binary
  if (!defined(invoker.binary)) {
-    executable(fuzz_target_name) {
+    executable(fuzzer_name) {
      # Explicitly forward visibility, implicitly forward everything else.
      # See comment in //build/config/BUILDCONFIG.gn for details on this pattern.
      forward_variables_from(invoker, [ "visibility" ])
@@ -61,11 +61,11 @@ template("fuzz_target") {
  }

  # Generate the component manifest
-  fuzz_target_cmx = "${target_gen_dir}/${fuzz_target_name}.cmx"
-  action("${fuzz_target_name}_cmx") {
+  fuzzer_cmx = "${target_gen_dir}/${fuzzer_name}.cmx"
+  action("${fuzzer_name}_cmx") {
    script = "//build/fuzzing/gen_fuzzer_manifest.py"
    outputs = [
-      fuzz_target_cmx,
+      fuzzer_cmx,
    ]
    args = [
      "--out",
@@ -75,7 +75,7 @@ template("fuzz_target") {
    if (defined(invoker.binary)) {
      args += [ invoker.binary ]
    } else {
-      args += [ fuzz_target_name ]
+      args += [ fuzzer_name ]
    }
    if (defined(invoker.cmx)) {
      args += [
@@ -86,9 +86,9 @@ template("fuzz_target") {
  }

  # Generate data files needed at runtime
-  output_dictionary = "${target_gen_dir}/${fuzz_target_name}/dictionary"
+  output_dictionary = "${target_gen_dir}/${fuzzer_name}/dictionary"
  if (defined(invoker.dictionary)) {
-    copy("${fuzz_target_name}_dictionary") {
+    copy("${fuzzer_name}_dictionary") {
      sources = [
        invoker.dictionary,
      ]
@@ -97,47 +97,47 @@ template("fuzz_target") {
      ]
    }
  } else {
-    generated_file("${fuzz_target_name}_dictionary") {
+    generated_file("${fuzzer_name}_dictionary") {
      contents = []
      outputs = [
        output_dictionary,
      ]
    }
  }
-  generated_file("${fuzz_target_name}_options") {
+  generated_file("${fuzzer_name}_options") {
    contents = []
    if (defined(invoker.options)) {
      contents = invoker.options
    }
    outputs = [
-      "${target_gen_dir}/${fuzz_target_name}/options",
+      "${target_gen_dir}/${fuzzer_name}/options",
    ]
  }

-  # Create the fuzz_target component
-  deprecated_fuchsia_component("${fuzz_target_name}_component") {
+  # Create the fuzzer component
+  deprecated_fuchsia_component("${fuzzer_name}_component") {
    testonly = true
-    manifest = fuzz_target_cmx
+    manifest = fuzzer_cmx
    if (defined(invoker.binary)) {
      binary = invoker.binary
    } else {
-      binary = "${fuzz_target_name}"
+      binary = "${fuzzer_name}"
    }
    resources = [
      {
-        path = "${target_gen_dir}/${fuzz_target_name}/dictionary"
-        dest = "${fuzz_target_name}/dictionary"
+        path = "${target_gen_dir}/${fuzzer_name}/dictionary"
+        dest = "${fuzzer_name}/dictionary"
      },
      {
-        path = "${target_gen_dir}/${fuzz_target_name}/options"
-        dest = "${fuzz_target_name}/options"
+        path = "${target_gen_dir}/${fuzzer_name}/options"
+        dest = "${fuzzer_name}/options"
      },
    ]
    deps = []
    forward_variables_from(invoker, [ "visibility" ])
    if (!defined(invoker.binary)) {
-      # deps, public_deps, and data_deps are forwarded to ${fuzz_target_name}
-      deps += [ ":${fuzz_target_name}" ]
+      # deps, public_deps, and data_deps are forwarded to ${fuzzer_name}
+      deps += [ ":${fuzzer_name}" ]
    } else {
      forward_variables_from(invoker,
                             [
@@ -147,31 +147,31 @@ template("fuzz_target") {
                             ])
    }
    deps += [
-      ":${fuzz_target_name}_cmx",
-      ":${fuzz_target_name}_dictionary",
-      ":${fuzz_target_name}_options",
+      ":${fuzzer_name}_cmx",
+      ":${fuzzer_name}_dictionary",
+      ":${fuzzer_name}_options",
    ]
  }
 }

-set_defaults("fuzz_target") {
+set_defaults("fuzzer") {
  configs = default_executable_configs +
            [ "//build/fuzzing:fuzzing_build_mode_unsafe_for_production" ]
 }

-# Defines a package of fuzz target components
+# Defines a package of fuzzers
 #
-# The fuzz_package template is used to bundle several fuzz_targets and their
+# The fuzzers_package template is used to bundle several fuzzers and their
 # associated data into a single Fuchsia package.
 #
 # Parameters
 #
-#   targets (required)
-#     [list of labels] The fuzz_target() targets to include in this package.
+#   fuzzers (required)
+#     [list of labels] The fuzzer() labels to include in this package.
 #
 #   sanitizers (optional)
 #     [list of variants] A set of sanitizer variants.  The resulting package
-#     will contain binaries for each sanitizer/target combination. Defaults to
+#     will contain binaries for each sanitizer/fuzzer combination. Defaults to
 #     [ "asan", "ubsan" ]
 #
 #   fuzz_host (optional)
@@ -193,8 +193,8 @@ set_defaults("fuzz_target") {
 #   data_deps (optional)
 #   testonly (optional)
 #     Usual GN meanings.
-template("fuzz_package") {
-  assert(defined(invoker.targets), "targets must be defined for $target_name}")
+template("fuzzers_package") {
+  assert(defined(invoker.fuzzers), "fuzzers must be defined for $target_name}")

  if (defined(invoker.sanitizers)) {
    sanitizers = invoker.sanitizers
@@ -211,38 +211,38 @@ template("fuzz_package") {
    fuzz_host = false
  }

-  # Collect the selected fuzz targets listed in this package based on the
-  # variants selected in args.gn and filtered by the package's list of
-  # supported sanitizers.
+  # Collect the selected fuzzers listed in this package based on the variants
+  # selected in args.gn and filtered by the package's list of supported
+  # sanitizers.
  selected = false
-  selected_targets = []
-  foreach(fuzz_target, invoker.targets) {
+  selected_fuzzers = []
+  foreach(fuzzer, invoker.fuzzers) {
    selected = false
    foreach(sanitizer, sanitizers) {
      foreach(selector, select_variant_canonical) {
        if (!selected && selector.variant == "${sanitizer}-fuzzer" &&
            ((defined(selector.target_type) &&
              selector.target_type == [ "fuzzed_executable" ]) ||
-             (defined(selector.name) && selector.name == [ fuzz_target ]) ||
+             (defined(selector.name) && selector.name == [ fuzzer ]) ||
             (defined(selector.output_name) &&
-              selector.output_name == [ fuzz_target ]))) {
+              selector.output_name == [ fuzzer ]))) {
          selected = true
-          selected_targets += [ fuzz_target ]
+          selected_fuzzers += [ fuzzer ]
        }
      }
    }
  }

  # Assemble the Fuchsia package
-  if (selected_targets != []) {
+  if (selected_fuzzers != []) {
    package(target_name) {
      metadata = {
        fuzz_spec = [
          {
-            fuzz_package = target_name
-            fuzz_targets = []
-            foreach(selected_target, selected_targets) {
-              fuzz_targets += [ get_label_info(selected_target, "name") ]
+            fuzzers_package = target_name
+            fuzzers = []
+            foreach(selected_target, selected_fuzzers) {
+              fuzzers += [ get_label_info(selected_target, "name") ]
            }
            fuzz_host = fuzz_host
          },
@@ -257,13 +257,13 @@ template("fuzz_package") {
      forward_variables_from(invoker,
                             "*",
                             [
-                               "targets",
+                               "fuzzers",
                               "sanitizers",
                               "visibility",
                               "fuzz_host",
                             ])
      testonly = true
-      foreach(selected_target, selected_targets) {
+      foreach(selected_target, selected_fuzzers) {
        components += [ "${selected_target}_component" ]
      }
      if (fuzz_host) {
@@ -277,9 +277,9 @@ template("fuzz_package") {
    if (fuzz_host) {
      install_host_tools("host_${target_name}") {
        testonly = true
-        deps = selected_targets
+        deps = selected_fuzzers
        outputs = []
-        foreach(target, selected_targets) {
+        foreach(target, selected_fuzzers) {
          outputs += [ get_label_info(target, "name") ]
        }
      }
@@ -295,3 +295,22 @@ template("fuzz_package") {
               ])
  }
 }
+
+# TODO(aarongreen): Complete soft transition and remove.
+# These templates are the old names for `fuzzer` and `fuzzers_package`. They
+# are included to allow third_party projects to transition softly.
+template("fuzz_target") {
+  source_set(target_name) {
+  }
+  not_needed(invoker, "*")
+}
+
+set_defaults("fuzz_target") {
+  configs = []
+}
+
+template("fuzz_package") {
+  group(target_name) {
+  }
+  not_needed(invoker, "*")
+}
--- a/build/gn/write_package_json.py
+++ b/build/gn/write_package_json.py
@@ -16,7 +16,11 @@ def main():
    args = parser.parse_args()

    with open(args.path, 'w') as f:
-        json.dump({'name': args.name, 'version': args.version}, f)
+        json.dump(
+            {'name': args.name, 'version': args.version},
+            f,
+            separators=(',', ':'),
+            sort_keys=True)

    return 0


--- a/build/rust/rustc_artifact.gni
+++ b/build/rust/rustc_artifact.gni
@@ -448,6 +448,15 @@ template("rustc_artifact") {
      args += [ "--with-unit-tests" ]
    }

+    if (defined(invoker.non_rust_deps)) {
+      foreach(dep, invoker.non_rust_deps) {
+        args += [
+          "--lib-dir",
+          rebase_path(get_label_info(dep, "target_out_dir")),
+        ]
+      }
+    }
+
    args += dep_info_paths
    outputs = [
      output_file,

--- a/docs/gen/build_arguments.md
+++ b/docs/gen/build_arguments.md
--- a/docs/run-examples.md
+++ b/docs/run-examples.md
+
+# Run the examples
+
+While exploring the source code, you may have noticed the `examples` directory.
+This guide will show you how to build Fuchsia to include these examples and then
+run them on the device.
+
+## Explore the GN file
+
+Go ahead and open the `BUILD.gn` file in the `examples` directory.
+
+If you aren't familiar with GN, take a look at the
+[introductory presentation](https://docs.google.com/presentation/d/15Zwb53JcncHfEwHpnG_PoIbbzQ3GQi_cpujYwbpcbZo/view#slide=id.g119d702868_0_12)
+or [docs](https://gn.googlesource.com/gn/+/master/docs/). In short, GN is a meta
+build system. Its output files serve as inputs to
+[Ninja](https://ninja-build.org/), the actual build system.
+
+In this file, you can see that the examples are designated as a named group.
+This group names three targets as dependencies:
+
+```gn
+group("examples") {
+  testonly = true
+  deps = [
+    "cowsay",
+    "fortune",
+    "hello_world",
+  ]
+}
+```
+
+You can find a directory for each of these dependencies. Each directory has its
+own `BUILD.gn` file that defines a package for the specific example.
+
+Note: You can look at the `build/package.gni` file to learn more about how
+Fuchsia packages are defined by GN.
+
+Let's take a look at each example.
+
+### Cowsay
+
+This sample takes a word and repeats it back from an ASCII-art cow.
+
+To access a shell on the device, use the `fx shell` command:
+
+```
+fx shell
+```
+
+Now run the binary directly:
+
+```
+cowsay hi
+```
+
+```uglyprint
+ _____
+| hi  |
+ -----
+     \  ^__^
+      \ (oo)\_____
+        (__)\     )\/\
+           ||----w |
+           ||     ||
+```
+
+You may notice that you can run this program without any changes to the build
+you already served to the device. Why? This example is pulled in as part of the
+command line utilities in `garnet/packages/prod/BUILD.gn`. But this isn't
+typically how you run a Fuchsia package; you will see that soon.
+
+### Fortune
+
+This sample prints a pithy observation. Let's try to run it using the extended
+format for `fx shell` that accepts command arguments:
+
+```
+fx shell fortune # won't work, no package in build
+```
+
+This won't work since this package wasn't pulled into the last build. You can
+confirm it isn't in the build by listing the contents of the `bin` directory:
+
+```
+fx shell ls bin
+```
+
+`cowsay` is there, but not `fortune`. Don't worry, you will add it soon.
+
+### Hello world
+
+This sample outputs `Hello, world!` and is written in both C++ and Rust. You may
+notice something different about this sample: each language-dependent directory
+also contains a `meta` subdirectory with `.cmx` files.
+
+This type of file is known as a
+[component manifest](glossary.md#component-manifest) and describes how to run
+the application on Fuchsia as a [component](glossary.md#component). This is
+the proper way to create a Fuchsia package.
+
+You run a Fuchsia component by referencing its
+[Fuchsia package URI](glossary.md#fuchsia_pkg-uri).
+
+## Set the build to include examples
+
+You can include the examples in the build, but you need to determine where they
+will be included:
+
+*   Base: Packages that are included in paving images produced by the build.
+    They are included in over-the-air updates and are always updated as a
+    single unit.
+
+*   Cache: Packages that are included in paving images, but are not included in
+    over-the-air system updates. These packages can be updated at any time that
+    updates are available.
+
+*   Universe: Packages that are additional optional packages that can be
+    fetched and run on-demand, but are not pre-baked into any paving images.
+
+(For more information, see [fx workflows](development/workflows/fx.md).)
+
+To include this package in Universe so it can be fetched on-demand, use the
+`--with` flag when setting the product and board:
+
+```
+fx set ... --with //examples
+fx build
+```
+
+You now have a build that includes the examples. Now you need to serve this new
+build to the device. You probably already have `fx serve` running, but if not,
+go ahead and start it:
+
+```
+fx serve
+```
+
+## Try the examples
+
+Open a shell on the device to try the examples:
+
+```
+fx shell
+```
+
+### Cowsay
+
+This should work the same as before. It is still pulled into the base image.
+
+### Fortune
+
+Try to run the fortune example again:
+
+```
+fortune
+```
+
+It should now return a pithy quote.
+
+### Hello world
+
+You can't run this sample as the other two (try to run `hello_world_cpp` or
+`hello_world_rust`). To run a Fuchsia component, you need to run it's Fuchsia
+package URI. Lucily, there are some built-in conveniences to help you find this.
+You can use the `run` command:
+
+```
+run fuchsia-pkg://fuchsia.com/hello_world_cpp#meta/hello_world_cpp.cmx
+```
+
+And it should output the following:
+
+```uglyprint
+Hello, World!
+```
+
+Important: You must have `fx serve` running in order to serve components from
+your repository to the device. If it is not running, you may get an error from
+the device (for example,
+`fuchsia-pkg://fuchsia.com/hello_world_cpp#meta/hello_world_cpp.cmx: not
+found`).
+
+The `run` command can expand a string to a URI if the string only matches one
+component in your product configuration:
+
+```
+run hello_world_cpp
+```
+
+If there are multiple matches, the command will list them for you to choose
+from:
+
+```
+run hello
+```
+
+```uglyprint
+fuchsia-pkg://fuchsia.com/hello_world_cpp#meta/hello_world_cpp.cmx
+fuchsia-pkg://fuchsia.com/hello_world_rust#meta/hello_world_rust.cmx
+Error: "hello" matched multiple components.
+```
+
+You can explore what components are in your product configuration using the
+`locate` command.
+
+*   Find your favorite component.
+
+    ```
+    locate hello_world_cpp
+    ```
+
+*   Find all runnable components in your universe.
+
+    ```
+    locate --list cmx
+    ```
+
+*   Find multiple test components.
+
+    ```
+    locate --list test
+    ```
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -17,5 +17,6 @@ group("tests") {
  testonly = true
  deps = [
    "hello_world:tests",
+    "rust_static_linking:static_linking_tests",
  ]
 }
--- a/examples/rust_static_linking/BUILD.gn
+++ b/examples/rust_static_linking/BUILD.gn
+# Copyright 2019 The Fuchsia Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("//build/package.gni")
+import("//build/rust/rustc_library.gni")
+
+rustc_library("static_linking") {
+  name = "static_linking"
+  with_unit_tests = true
+  version = "0.1.0"
+  edition = "2018"
+  non_rust_deps = [
+    ":static",
+  ]
+}
+
+static_library("static") {
+  sources = [
+    "static.c",
+  ]
+}
+
+package("static_linking_tests") {
+  testonly = true
+  deps = [
+    ":static_linking",
+  ]
+  tests = [
+    {
+      name = "static_linking_lib_test"
+    },
+  ]
+}
--- a/zircon/system/ulib/blobfs/test/main.cpp
+++ b/zircon/system/ulib/blobfs/test/main.cpp
@@ -2,18 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-#include <unittest/unittest.h>
-#include <zxtest/c/zxtest.h>
+#[link(name = "static", kind = "static")]
+extern "C" {
+    pub fn returns_two() -> u32;
+}

-int main(int argc, char** argv) {
-    const bool success = unittest_run_all_tests(argc, argv);
-    if (!success) {
-        return EXIT_FAILURE;
-    }
+#[cfg(test)]
+mod tests {
+    use super::returns_two;

-    const bool zxtest_success = RUN_ALL_TESTS(argc, argv) == 0;
-    if (!zxtest_success) {
-        return EXIT_FAILURE;
+    #[test]
+    fn linking_works() {
+        assert_eq!(unsafe { returns_two() }, 2);
    }
-    return EXIT_SUCCESS;
 }
--- a/examples/rust_static_linking/static.c
+++ b/examples/rust_static_linking/static.c
+// Copyright 2019 The Fuchsia Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include <stdint.h>
+
+uint32_t returns_two() {
+  return 2;
+}
--- a/garnet/bin/auth/OWNERS
+++ b/garnet/bin/auth/OWNERS
-jsankey@google.com
-ukode@google.com
-*
--- a/garnet/bin/auth/README.md
+++ b/garnet/bin/auth/README.md
-`/bin/auth` contains component binaries related to user identity and
-authentication. Please refer to the more detailed README.md file in each
-package for more information.
-
--- a/garnet/bin/cmc/meta/example.cml
+++ b/garnet/bin/cmc/meta/example.cml
@@ -29,11 +29,11 @@
  "children": [
    {
      "name": "logger",
-      "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+      "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
    },
    {
      "name": "netstack",
-      "uri": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
+      "url": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
    },
  ],
  "facets": {

--- a/garnet/bin/cmc/src/cml.rs
+++ b/garnet/bin/cmc/src/cml.rs
@@ -56,7 +56,7 @@ pub struct To {
 #[derive(Deserialize, Debug)]
 pub struct Child {
    pub name: String,
-    pub uri: String,
+    pub url: String,
    pub startup: Option<String>,
 }


--- a/garnet/bin/cmc/src/compile.rs
+++ b/garnet/bin/cmc/src/compile.rs
@@ -154,7 +154,7 @@ fn translate_children(children_in: &Vec<cml::Child>) -> Result<Vec<cm::Child>, E
                return Err(Error::internal(format!("invalid startup")));
            }
        };
-        out_children.push(cm::Child { name: child.name.clone(), uri: child.uri.clone(), startup });
+        out_children.push(cm::Child { name: child.name.clone(), url: child.url.clone(), startup });
    }
    Ok(out_children)
 }
@@ -328,7 +328,7 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    },
                ]
            }),
@@ -358,7 +358,7 @@ mod tests {
    "children": [
        {
            "name": "logger",
-            "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+            "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
            "startup": "lazy"
        }
    ]
@@ -386,15 +386,15 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    },
                    {
                        "name": "echo_server",
-                        "uri": "fuchsia-pkg://fuchsia.com/echo_server/stable#meta/echo_server.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/echo_server/stable#meta/echo_server.cm"
                    },
                    {
                        "name": "netstack",
-                        "uri": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm"
                    }
                ]
            }),
@@ -438,17 +438,17 @@ mod tests {
    "children": [
        {
            "name": "logger",
-            "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+            "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
            "startup": "lazy"
        },
        {
            "name": "echo_server",
-            "uri": "fuchsia-pkg://fuchsia.com/echo_server/stable#meta/echo_server.cm",
+            "url": "fuchsia-pkg://fuchsia.com/echo_server/stable#meta/echo_server.cm",
            "startup": "lazy"
        },
        {
            "name": "netstack",
-            "uri": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
+            "url": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
            "startup": "lazy"
        }
    ]
@@ -459,16 +459,16 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                    },
                    {
                        "name": "gmail",
-                        "uri": "https://www.google.com/gmail",
+                        "url": "https://www.google.com/gmail",
                        "startup": "eager",
                    },
                    {
                        "name": "echo",
-                        "uri": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo.cm",
                        "startup": "lazy",
                    },
                ]
@@ -477,17 +477,17 @@ mod tests {
    "children": [
        {
            "name": "logger",
-            "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+            "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
            "startup": "lazy"
        },
        {
            "name": "gmail",
-            "uri": "https://www.google.com/gmail",
+            "url": "https://www.google.com/gmail",
            "startup": "eager"
        },
        {
            "name": "echo",
-            "uri": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo.cm",
+            "url": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo.cm",
            "startup": "lazy"
        }
    ]
@@ -541,11 +541,11 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    },
                    {
                        "name": "netstack",
-                        "uri": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm"
                    }
                ],
                "facets": {
@@ -597,12 +597,12 @@ mod tests {
    "children": [
        {
            "name": "logger",
-            "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+            "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
            "startup": "lazy"
        },
        {
            "name": "netstack",
-            "uri": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
+            "url": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
            "startup": "lazy"
        }
    ],

--- a/garnet/bin/cmc/src/validate.rs
+++ b/garnet/bin/cmc/src/validate.rs
@@ -692,12 +692,12 @@ mod tests {
                "children": [
                    {
                        "name": "system-logger2",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                        "startup": "lazy"
                    },
                    {
                        "name": "abc123_-",
-                        "uri": "https://www.google.com/gmail",
+                        "url": "https://www.google.com/gmail",
                        "startup": "eager"
                    }
                ]
@@ -708,14 +708,14 @@ mod tests {
            input = json!({
                "children": [ {} ]
            }),
-            result = Err(Error::validate_schema(CM_SCHEMA, "This property is required at /children/0/name, This property is required at /children/0/startup, This property is required at /children/0/uri")),
+            result = Err(Error::validate_schema(CM_SCHEMA, "This property is required at /children/0/name, This property is required at /children/0/startup, This property is required at /children/0/url")),
        },
        test_cm_children_bad_name => {
            input = json!({
                "children": [
                    {
                        "name": "bad^",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                        "startup": "lazy"
                    }
                ]
@@ -827,7 +827,7 @@ mod tests {
                "children": [
                    {
                        "name": "abcdefghijklmnopqrstuvwxyz0123456789_-.",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                        "startup": "lazy"
                    }
                ]
@@ -839,7 +839,7 @@ mod tests {
                "children": [
                    {
                        "name": "#bad",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                        "startup": "lazy"
                    }
                ]
@@ -851,48 +851,48 @@ mod tests {
                "children": [
                    {
                        "name": "a".repeat(101),
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                        "startup": "lazy"
                    }
                ]
            }),
            result = Err(Error::validate_schema(CM_SCHEMA, "MaxLength condition is not met at /children/0/name")),
        },
-        test_cm_uri => {
+        test_cm_url => {
            input = json!({
                "children": [
                    {
                        "name": "logger",
-                        "uri": "my+awesome-scheme.2://abc123!@#$%.com",
+                        "url": "my+awesome-scheme.2://abc123!@#$%.com",
                        "startup": "lazy"
                    }
                ]
            }),
            result = Ok(()),
        },
-        test_cm_uri_invalid => {
+        test_cm_url_invalid => {
            input = json!({
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://",
+                        "url": "fuchsia-pkg://",
                        "startup": "lazy"
                    }
                ]
            }),
-            result = Err(Error::validate_schema(CM_SCHEMA, "Pattern condition is not met at /children/0/uri")),
+            result = Err(Error::validate_schema(CM_SCHEMA, "Pattern condition is not met at /children/0/url")),
        },
-        test_cm_uri_too_long => {
+        test_cm_url_too_long => {
            input = json!({
                "children": [
                    {
                        "name": "logger",
-                        "uri": &format!("fuchsia-pkg://{}", "a".repeat(4083)),
+                        "url": &format!("fuchsia-pkg://{}", "a".repeat(4083)),
                        "startup": "lazy"
                    }
                ]
            }),
-            result = Err(Error::validate_schema(CM_SCHEMA, "MaxLength condition is not met at /children/0/uri")),
+            result = Err(Error::validate_schema(CM_SCHEMA, "MaxLength condition is not met at /children/0/url")),
        },
    }

@@ -907,7 +907,7 @@ mod tests {
            "children": [
                {
                    'name': 'logger',
-                    'uri': 'fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm',
+                    'url': 'fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm',
                },
            ],
        }"##;
@@ -960,7 +960,7 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    }
                ]
            }),
@@ -974,7 +974,7 @@ mod tests {
                "children": [
                    {
                        "name": "abcdefghijklmnopqrstuvwxyz0123456789_-.",
-                        "uri": "https://www.google.com/gmail"
+                        "url": "https://www.google.com/gmail"
                    }
                ]
            }),
@@ -1004,7 +1004,7 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    }
                ]
            }),
@@ -1049,15 +1049,15 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    },
                    {
                        "name": "scenic",
-                        "uri": "fuchsia-pkg://fuchsia.com/scenic/stable#meta/scenic.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/scenic/stable#meta/scenic.cm"
                    },
                    {
                        "name": "echo_server",
-                        "uri": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo_server.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo_server.cm"
                    }
                ]
            }),
@@ -1079,11 +1079,11 @@ mod tests {
                "children": [
                    {
                        "name": "abcdefghijklmnopqrstuvwxyz0123456789_-from",
-                        "uri": "https://www.google.com/gmail"
+                        "url": "https://www.google.com/gmail"
                    },
                    {
                        "name": "abcdefghijklmnopqrstuvwxyz0123456789_-to",
-                        "uri": "https://www.google.com/gmail"
+                        "url": "https://www.google.com/gmail"
                    },
                ]
            }),
@@ -1152,7 +1152,7 @@ mod tests {
                } ],
                "children": [ {
                    "name": "logger",
-                    "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                    "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                } ]
            }),
            result = Err(Error::validate("\"#missing\" is an \"offer\" target but it does not appear in \"children\"")),
@@ -1179,7 +1179,7 @@ mod tests {
                    ],
                } ],
                "children": [ {
-                    "name": "logger", "uri": "fuchsia-pkg://fuchsia.com/logger#meta/logger.cm",
+                    "name": "logger", "url": "fuchsia-pkg://fuchsia.com/logger#meta/logger.cm",
                } ],
            }),
            result = Err(Error::validate("Offer target \"#logger\" is same as source")),
@@ -1206,11 +1206,11 @@ mod tests {
                "children": [
                    {
                        "name": "scenic",
-                        "uri": "fuchsia-pkg://fuchsia.com/scenic/stable#meta/scenic.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/scenic/stable#meta/scenic.cm"
                    },
                    {
                        "name": "echo_server",
-                        "uri": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo_server.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo_server.cm"
                    }
                ]
            }),
@@ -1223,16 +1223,16 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                    },
                    {
                        "name": "gmail",
-                        "uri": "https://www.google.com/gmail",
+                        "url": "https://www.google.com/gmail",
                        "startup": "eager",
                    },
                    {
                        "name": "echo",
-                        "uri": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/echo/stable#meta/echo.cm",
                        "startup": "lazy",
                    },
                ]
@@ -1243,18 +1243,18 @@ mod tests {
            input = json!({
                "children": [ {} ]
            }),
-            result = Err(Error::validate_schema(CML_SCHEMA, "This property is required at /children/0/name, This property is required at /children/0/uri")),
+            result = Err(Error::validate_schema(CML_SCHEMA, "This property is required at /children/0/name, This property is required at /children/0/url")),
        },
        test_cml_children_duplicate_names => {
           input = json!({
               "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm"
                    },
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/beta#meta/logger.cm"
+                        "url": "fuchsia-pkg://fuchsia.com/logger/beta#meta/logger.cm"
                    }
                ]
            }),
@@ -1265,7 +1265,7 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                        "startup": "zzz",
                    },
                ],
@@ -1353,7 +1353,7 @@ mod tests {
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                    },
                ]
            }),
@@ -1364,7 +1364,7 @@ mod tests {
                "children": [
                    {
                        "name": "abcdefghijklmnopqrstuvwxyz0123456789_-.",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                    },
                ]
            }),
@@ -1375,7 +1375,7 @@ mod tests {
                "children": [
                    {
                        "name": "#bad",
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                    },
                ]
            }),
@@ -1386,44 +1386,44 @@ mod tests {
                "children": [
                    {
                        "name": "a".repeat(101),
-                        "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+                        "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
                    }
                ]
            }),
            result = Err(Error::validate_schema(CML_SCHEMA, "MaxLength condition is not met at /children/0/name")),
        },
-        test_cml_uri => {
+        test_cml_url => {
            input = json!({
                "children": [
                    {
                        "name": "logger",
-                        "uri": "my+awesome-scheme.2://abc123!@#$%.com",
+                        "url": "my+awesome-scheme.2://abc123!@#$%.com",
                    },
                ]
            }),
            result = Ok(()),
        },
-        test_cml_uri_invalid => {
+        test_cml_url_invalid => {
            input = json!({
                "children": [
                    {
                        "name": "logger",
-                        "uri": "fuchsia-pkg://",
+                        "url": "fuchsia-pkg://",
                    },
                ]
            }),
-            result = Err(Error::validate_schema(CML_SCHEMA, "Pattern condition is not met at /children/0/uri")),
+            result = Err(Error::validate_schema(CML_SCHEMA, "Pattern condition is not met at /children/0/url")),
        },
-        test_cml_uri_too_long => {
+        test_cml_url_too_long => {
            input = json!({
                "children": [
                    {
                        "name": "logger",
-                        "uri": &format!("fuchsia-pkg://{}", "a".repeat(4083)),
+                        "url": &format!("fuchsia-pkg://{}", "a".repeat(4083)),
                    },
                ]
            }),
-            result = Err(Error::validate_schema(CML_SCHEMA, "MaxLength condition is not met at /children/0/uri")),
+            result = Err(Error::validate_schema(CML_SCHEMA, "MaxLength condition is not met at /children/0/url")),
        },
    }


--- a/garnet/bin/cmc/tests/golden_debug.cm
+++ b/garnet/bin/cmc/tests/golden_debug.cm
@@ -42,12 +42,12 @@
    "children": [
        {
            "name": "logger",
-            "uri": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
+            "url": "fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm",
            "startup": "lazy"
        },
        {
            "name": "netstack",
-            "uri": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
+            "url": "fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm",
            "startup": "lazy"
        }
    ],

--- a/garnet/bin/cmc/tests/golden_release.cm
+++ b/garnet/bin/cmc/tests/golden_release.cm
-{"program":{"binary":"bin/example"},"uses":[{"service":{"source_path":"/fonts/CoolFonts","target_path":"/svc/fuchsia.fonts.Provider"}}],"exposes":[{"directory":{"source":{"myself":{}},"source_path":"/volumes/blobfs","target_path":"/volumes/blobfs"}}],"offers":[{"service":{"source":{"child":{"name":"logger"}},"source_path":"/svc/fuchsia.logger.Log","targets":[{"target_path":"/svc/fuchsia.logger.Log","child_name":"netstack"}]}}],"children":[{"name":"logger","uri":"fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm","startup":"lazy"},{"name":"netstack","uri":"fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm","startup":"lazy"}],"facets":{"author":"Fuchsia","year":2018}}
\ No newline at end of file
+{"program":{"binary":"bin/example"},"uses":[{"service":{"source_path":"/fonts/CoolFonts","target_path":"/svc/fuchsia.fonts.Provider"}}],"exposes":[{"directory":{"source":{"myself":{}},"source_path":"/volumes/blobfs","target_path":"/volumes/blobfs"}}],"offers":[{"service":{"source":{"child":{"name":"logger"}},"source_path":"/svc/fuchsia.logger.Log","targets":[{"target_path":"/svc/fuchsia.logger.Log","child_name":"netstack"}]}}],"children":[{"name":"logger","url":"fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm","startup":"lazy"},{"name":"netstack","url":"fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm","startup":"lazy"}],"facets":{"author":"Fuchsia","year":2018}}
\ No newline at end of file
--- a/garnet/bin/cmc/tests/integration_test.rs
+++ b/garnet/bin/cmc/tests/integration_test.rs
@@ -42,12 +42,12 @@ fn main() {
        let children = vec![
            ChildDecl {
                name: Some("logger".to_string()),
-                uri: Some("fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm".to_string()),
+                url: Some("fuchsia-pkg://fuchsia.com/logger/stable#meta/logger.cm".to_string()),
                startup: Some(StartupMode::Lazy),
            },
            ChildDecl {
                name: Some("netstack".to_string()),
-                uri: Some("fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm".to_string()),
+                url: Some("fuchsia-pkg://fuchsia.com/netstack/stable#meta/netstack.cm".to_string()),
                startup: Some(StartupMode::Lazy),
            },
        ];

--- a/garnet/bin/ktrace_provider/BUILD.gn
+++ b/garnet/bin/ktrace_provider/BUILD.gn
@@ -3,6 +3,25 @@
 # found in the LICENSE file.

 import("//build/package.gni")
+import("//build/test/test_package.gni")
+
+source_set("importer") {
+  sources = [
+    "importer.cc",
+    "importer.h",
+    "reader.cc",
+    "reader.h",
+    "tags.cc",
+    "tags.h",
+  ]
+
+  public_deps = [
+    "//src/lib/fxl",
+    "//zircon/public/lib/fbl",
+    "//zircon/public/lib/trace-engine",
+    "//zircon/public/lib/zircon-internal",
+  ]
+}

 executable("bin") {
  output_name = "ktrace_provider"
@@ -10,18 +29,15 @@ executable("bin") {
  sources = [
    "app.cc",
    "app.h",
-    "importer.cc",
-    "importer.h",
+    "device_reader.cc",
+    "device_reader.h",
    "log_importer.cc",
    "log_importer.h",
    "main.cc",
-    "reader.cc",
-    "reader.h",
-    "tags.cc",
-    "tags.h",
  ]

  deps = [
+    ":importer",
    "//sdk/lib/sys/cpp",
    "//src/lib/fxl",
    "//zircon/public/fidl/fuchsia-tracing-kernel:fuchsia-tracing-kernel_c",
@@ -47,3 +63,36 @@ package("ktrace_provider") {
    },
  ]
 }
+
+executable("importer_test_app") {
+  testonly = true
+  output_name = "importer_tests"
+
+  sources = [
+    "importer_unittest.cc",
+    "test_reader.cc",
+    "test_reader.h",
+  ]
+
+  deps = [
+    ":importer",
+    "//src/lib/fxl",
+    "//third_party/googletest:gtest",
+    "//zircon/public/lib/fbl",
+    "//zircon/public/lib/trace-engine",
+    "//zircon/public/lib/trace-test-utils",
+  ]
+}
+
+test_package("ktrace_provider_tests") {
+  deps = [
+    ":importer_test_app"
+  ]
+
+  tests = [
+    {
+      name = "importer_tests"
+      environments = basic_envs
+    },
+  ]
+}
--- a/garnet/bin/ktrace_provider/app.cc
+++ b/garnet/bin/ktrace_provider/app.cc
@@ -5,21 +5,22 @@
 #include "garnet/bin/ktrace_provider/app.h"

 #include <fcntl.h>
+#include <unistd.h>
+
 #include <fuchsia/tracing/kernel/c/fidl.h>
 #include <lib/async/default.h>
 #include <lib/fdio/fdio.h>
 #include <lib/zx/channel.h>
+#include <src/lib/fxl/arraysize.h>
+#include <src/lib/fxl/logging.h>
 #include <trace-engine/instrumentation.h>
 #include <trace-provider/provider.h>
-#include <unistd.h>
 #include <zircon/device/ktrace.h>
 #include <zircon/status.h>
 #include <zircon/syscalls/log.h>

+#include "garnet/bin/ktrace_provider/device_reader.h"
 #include "garnet/bin/ktrace_provider/importer.h"
-#include "garnet/bin/ktrace_provider/reader.h"
-#include "src/lib/fxl/arraysize.h"
-#include "src/lib/fxl/logging.h"

 namespace ktrace_provider {
 namespace {
@@ -191,7 +192,7 @@ void App::StopKTrace() {
  // Acquire a context for writing to the trace buffer.
  auto buffer_context = trace_acquire_context();

-  Reader reader;
+  DeviceReader reader;
  Importer importer(buffer_context);
  if (!importer.Import(reader)) {
    FXL_LOG(ERROR) << "Errors encountered while importing ktrace data";
No results found