OS-1840 fmdump shall emit JSON

          --- old/usr/src/cmd/fm/fmdump/common/fmdump.h
          +++ new/usr/src/cmd/fm/fmdump/common/fmdump.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *

  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright (c) 2013, Joyent, Inc. All rights reserved.
  23   24   */
  24   25  
  25   26  #ifndef _FMDUMP_H
  26   27  #define _FMDUMP_H
  27   28  
  28   29  #ifdef  __cplusplus
  29   30  extern "C" {
  30   31  #endif
  31   32  
  32   33  #include <assert.h>

  33   34  #include <stdarg.h>
  34   35  #include <stdio.h>
  35   36  #include <synch.h>
  36   37  
  37   38  #include <sys/types.h>
  38   39  #include <sys/fm/protocol.h>
  39   40  
  40   41  #include <fm/fmd_log.h>
  41   42  #include <fm/fmd_msg.h>
  42   43  #include <fm/libtopo.h>
  43   44  
  44   45  #ifdef DEBUG
  45   46  #define ASSERT(x) (assert(x))

  46   47  #else
  47   48  #define ASSERT(x)
  48   49  #endif
  49   50  
  50   51  enum {
  51   52          FMDUMP_SHORT,
  52   53          FMDUMP_VERB1,
  53   54          FMDUMP_VERB2,
  54   55          FMDUMP_PRETTY,
  55   56          FMDUMP_MSG,
       57 +        FMDUMP_JSON,
  56   58          FMDUMP_NFMTS
  57   59  };
  58   60  
  59   61  typedef struct fmdump_ops {
  60   62          const char *do_label;
  61   63          struct fmdump_fmt {
  62   64                  const char *do_hdr;
  63   65                  fmd_log_rec_f *do_func;
  64   66          } do_formats[FMDUMP_NFMTS];
  65   67  } fmdump_ops_t;

  66   68  
  67   69  typedef struct fmdump_arg {
  68   70          const struct fmdump_fmt *da_fmt;
  69   71          fmd_log_filter_t *da_fv;
  70   72          uint_t da_fc;
  71   73          FILE *da_fp;
  72   74  } fmdump_arg_t;
  73   75  
  74   76  typedef struct fmdump_lyr {
  75   77          fmd_log_rec_f *dy_func;
  76   78          void *dy_arg;
  77   79          FILE *dy_fp;
  78   80  } fmdump_lyr_t;
  79   81  
  80   82  extern const fmdump_ops_t fmdump_err_ops;
  81   83  extern const fmdump_ops_t fmdump_flt_ops;
  82   84  extern const fmdump_ops_t fmdump_asru_ops;
  83   85  extern const fmdump_ops_t fmdump_info_ops;
  84   86  
  85   87  extern const char *g_pname;
  86   88  extern ulong_t g_errs;
  87   89  extern ulong_t g_recs;
  88   90  extern char *g_root;
  89   91  
  90   92  extern struct topo_hdl *g_thp;
  91   93  extern fmd_msg_hdl_t *g_msg;
  92   94  
  93   95  extern void fmdump_printf(FILE *, const char *, ...);

  94   96  extern void fmdump_warn(const char *, ...);
  95   97  extern void fmdump_vwarn(const char *, va_list);
  96   98  
  97   99  extern char *fmdump_date(char *, size_t, const fmd_log_record_t *);
  98  100  extern char *fmdump_year(char *, size_t, const fmd_log_record_t *);
  99  101  extern char *fmdump_nvl2str(nvlist_t *nvl);
 100  102  
 101  103  extern int fmdump_render_nvlist(nvlist_prtctl_t, void *, nvlist_t *,
 102  104      const char *, nvlist_t *);
 103  105  
      106 +extern int fmdump_print_json(fmd_log_t *, const fmd_log_record_t *, FILE *);
      107 +
 104  108  #ifdef  __cplusplus
 105  109  }
 106  110  #endif
 107  111  
 108  112  #endif  /* _FMDUMP_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX