Print this page
OS-1840 fmdump shall emit JSON (newlines, fflush)
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/cmd/fm/fmdump/common/nvlrender.c
+++ new/usr/src/cmd/fm/fmdump/common/nvlrender.c
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) 2010, Oracle and/or its affiliates. All rights reserved.
23 23 * Copyright (c) 2013, Joyent, Inc. All rights reserved.
24 24 */
25 25
26 26 /*
27 27 * Rendering functions for nvlist_prt that are of use to all types
28 28 * of log.
29 29 */
30 30
31 31 #include <fmdump.h>
32 32 #include <stdio.h>
33 33 #include <strings.h>
34 34
35 35 extern topo_hdl_t *fmd_fmri_topo_hold(int);
36 36
37 37 /*
38 38 * Can be appointed to be called for dumping all nvlist members of
39 39 * an nvlist we ask to print with nvlist_prt. Return 0 if the
40 40 * nvlist is not recognized as an fmri, and default formatting
41 41 * will be applied; otherwise format as an fmri string and return 1.
42 42 */
43 43
44 44 /*ARGSUSED*/
45 45 int
46 46 fmdump_render_nvlist(nvlist_prtctl_t pctl, void *private, nvlist_t *nvl,
47 47 const char *name, nvlist_t *fmri)
48 48 {
49 49 topo_hdl_t *thp = fmd_fmri_topo_hold(TOPO_VERSION);
50 50 FILE *fp = nvlist_prtctl_getdest(pctl);
51 51 char *class, *fmristr = NULL;
52 52 uint8_t version;
53 53 int err;
54 54
55 55 if (nvlist_lookup_string(fmri, FM_FMRI_SCHEME, &class) != 0 ||
56 56 nvlist_lookup_uint8(fmri, FM_VERSION, &version) != 0)
57 57 return (0);
58 58
59 59 /*
60 60 * Instead of hardcoding known FMRI classes here we'll try
61 61 * topo_fmri_nvl2str which should fail gracefully for invalid
62 62 * schemes (ie an nvlist that just happens to have the expected
63 63 * class and version members but that isn't an FMRI).
64 64 */
65 65 if (topo_fmri_nvl2str(thp, fmri, &fmristr, &err) != 0 ||
66 66 fmristr == NULL)
67 67 return (0);
68 68
69 69 nvlist_prtctl_doindent(pctl, 1);
70 70 nvlist_prtctl_dofmt(pctl, NVLIST_FMT_MEMBER_NAME, name);
|
↓ open down ↓ |
70 lines elided |
↑ open up ↑ |
71 71 (void) fprintf(fp, "%s", fmristr);
72 72 topo_hdl_strfree(thp, fmristr);
73 73
74 74 return (1);
75 75 }
76 76
77 77 /*
78 78 * Thin wrapper around libnvpair's inbuilt JSON routine. Simply dumps the
79 79 * entire log record nvlist without any reformatting.
80 80 */
81 +
82 +/*ARGSUSED*/
81 83 int
82 84 fmdump_print_json(fmd_log_t *lp, const fmd_log_record_t *rp, FILE *fp)
83 85 {
84 - nvlist_print_json(fp, rp->rec_nvl);
85 - fprintf(fp, "\n");
86 + if (nvlist_print_json(fp, rp->rec_nvl) || fprintf(fp, "\n") < 0 ||
87 + fflush(fp) != 0)
88 + return (-1);
86 89
87 90 return (0);
88 91 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX