4471 DTrace count() with histogram
4472 DTrace full width distribution histograms
4473 DTrace frequency trails

*** 23,32 ****
--- 23,33 ----
   * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
  /*
+  * Copyright (c) 2013, Joyent, Inc. All rights reserved.
   * Copyright (c) 2012 by Delphix. All rights reserved.
   */
  
  #include <sys/resource.h>
  #include <sys/mman.h>
*** 334,343 ****
--- 335,361 ----
          return (0);
  }
  
  /*ARGSUSED*/
  static int
+ dt_opt_encoding(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
+ {
+         if (arg == NULL)
+                 return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ 
+         if (strcmp(arg, "ascii") == 0)
+                 dtp->dt_encoding = DT_ENCODING_ASCII;
+         else if (strcmp(arg, "utf8") == 0)
+                 dtp->dt_encoding = DT_ENCODING_UTF8;
+         else
+                 return (dt_set_errno(dtp, EDT_BADOPTVAL));
+ 
+         return (0);
+ }
+ 
+ /*ARGSUSED*/
+ static int
  dt_opt_evaltime(dtrace_hdl_t *dtp, const char *arg, uintptr_t option)
  {
          if (arg == NULL)
                  return (dt_set_errno(dtp, EDT_BADOPTVAL));
  
*** 915,924 ****
--- 933,943 ----
          { "dtypes", dt_opt_dtypes },
          { "debug", dt_opt_debug },
          { "define", dt_opt_cpp_opts, (uintptr_t)"-D" },
          { "droptags", dt_opt_droptags },
          { "empty", dt_opt_cflags, DTRACE_C_EMPTY },
+         { "encoding", dt_opt_encoding },
          { "errtags", dt_opt_cflags, DTRACE_C_ETAGS },
          { "evaltime", dt_opt_evaltime },
          { "incdir", dt_opt_cpp_opts, (uintptr_t)"-I" },
          { "iregs", dt_opt_iregs },
          { "kdefs", dt_opt_invcflags, DTRACE_C_KNODEF },
*** 975,989 ****
--- 994,1011 ----
  
  /*
   * Dynamic run-time options.
   */
  static const dt_option_t _dtrace_drtoptions[] = {
+         { "agghist", dt_opt_runtime, DTRACEOPT_AGGHIST },
+         { "aggpack", dt_opt_runtime, DTRACEOPT_AGGPACK },
          { "aggrate", dt_opt_rate, DTRACEOPT_AGGRATE },
          { "aggsortkey", dt_opt_runtime, DTRACEOPT_AGGSORTKEY },
          { "aggsortkeypos", dt_opt_runtime, DTRACEOPT_AGGSORTKEYPOS },
          { "aggsortpos", dt_opt_runtime, DTRACEOPT_AGGSORTPOS },
          { "aggsortrev", dt_opt_runtime, DTRACEOPT_AGGSORTREV },
+         { "aggzoom", dt_opt_runtime, DTRACEOPT_AGGZOOM },
          { "flowindent", dt_opt_runtime, DTRACEOPT_FLOWINDENT },
          { "quiet", dt_opt_runtime, DTRACEOPT_QUIET },
          { "rawbytes", dt_opt_runtime, DTRACEOPT_RAWBYTES },
          { "stackindent", dt_opt_runtime, DTRACEOPT_STACKINDENT },
          { "switchrate", dt_opt_rate, DTRACEOPT_SWITCHRATE },