Deleted Added
full compact
control.c (256281) control.c (260006)
1/*-
2 * Copyright (c) 2009-2010 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Pawel Jakub Dawidek under sponsorship from
6 * the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009-2010 The FreeBSD Foundation
3 * All rights reserved.
4 *
5 * This software was developed by Pawel Jakub Dawidek under sponsorship from
6 * the FreeBSD Foundation.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: stable/10/sbin/hastd/control.c 252472 2013-07-01 18:41:07Z trociny $");
31__FBSDID("$FreeBSD: stable/10/sbin/hastd/control.c 260006 2013-12-28 19:21:22Z trociny $");
32
33#include <sys/types.h>
34#include <sys/wait.h>
35
36#include <errno.h>
37#include <pthread.h>
38#include <signal.h>
39#include <stdio.h>

--- 170 unchanged lines hidden (view full) ---

210 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_read_error"),
211 "stat_read_error%u", no);
212 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_write_error"),
213 "stat_write_error%u", no);
214 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_delete_error"),
215 "stat_delete_error%u", no);
216 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_flush_error"),
217 "stat_flush_error%u", no);
32
33#include <sys/types.h>
34#include <sys/wait.h>
35
36#include <errno.h>
37#include <pthread.h>
38#include <signal.h>
39#include <stdio.h>

--- 170 unchanged lines hidden (view full) ---

210 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_read_error"),
211 "stat_read_error%u", no);
212 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_write_error"),
213 "stat_write_error%u", no);
214 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_delete_error"),
215 "stat_delete_error%u", no);
216 nv_add_uint64(nvout, nv_get_uint64(cnvin, "stat_flush_error"),
217 "stat_flush_error%u", no);
218 nv_add_uint64(nvout, nv_get_uint64(cnvin, "idle_queue_size"),
219 "idle_queue_size%u", no);
220 nv_add_uint64(nvout, nv_get_uint64(cnvin, "local_queue_size"),
221 "local_queue_size%u", no);
222 nv_add_uint64(nvout, nv_get_uint64(cnvin, "send_queue_size"),
223 "send_queue_size%u", no);
224 nv_add_uint64(nvout, nv_get_uint64(cnvin, "recv_queue_size"),
225 "recv_queue_size%u", no);
226 nv_add_uint64(nvout, nv_get_uint64(cnvin, "done_queue_size"),
227 "done_queue_size%u", no);
218end:
219 if (cnvin != NULL)
220 nv_free(cnvin);
221 if (cnvout != NULL)
222 nv_free(cnvout);
223 if (error != 0)
224 nv_add_int16(nvout, error, "error");
225}

--- 247 unchanged lines hidden (view full) ---

473 nv_add_uint64(nvout, res->hr_stat_write_error +
474 res->hr_stat_activemap_write_error,
475 "stat_write_error");
476 nv_add_uint64(nvout, res->hr_stat_delete_error,
477 "stat_delete_error");
478 nv_add_uint64(nvout, res->hr_stat_flush_error +
479 res->hr_stat_activemap_flush_error,
480 "stat_flush_error");
228end:
229 if (cnvin != NULL)
230 nv_free(cnvin);
231 if (cnvout != NULL)
232 nv_free(cnvout);
233 if (error != 0)
234 nv_add_int16(nvout, error, "error");
235}

--- 247 unchanged lines hidden (view full) ---

483 nv_add_uint64(nvout, res->hr_stat_write_error +
484 res->hr_stat_activemap_write_error,
485 "stat_write_error");
486 nv_add_uint64(nvout, res->hr_stat_delete_error,
487 "stat_delete_error");
488 nv_add_uint64(nvout, res->hr_stat_flush_error +
489 res->hr_stat_activemap_flush_error,
490 "stat_flush_error");
491 res->output_status_aux(nvout);
481 nv_add_int16(nvout, 0, "error");
482 break;
483 case CONTROL_RELOAD:
484 /*
485 * When parent receives SIGHUP and discovers that
486 * something related to us has changes, it sends reload
487 * message to us.
488 */

--- 23 unchanged lines hidden ---
492 nv_add_int16(nvout, 0, "error");
493 break;
494 case CONTROL_RELOAD:
495 /*
496 * When parent receives SIGHUP and discovers that
497 * something related to us has changes, it sends reload
498 * message to us.
499 */

--- 23 unchanged lines hidden ---