| control.c (218218) | control.c (219351) |
|---|---|
| 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: head/sbin/hastd/control.c 218218 2011-02-03 11:39:49Z pjd $"); | 31__FBSDID("$FreeBSD: head/sbin/hastd/control.c 219351 2011-03-06 22:56:14Z pjd $"); |
| 32 33#include <sys/types.h> 34#include <sys/wait.h> 35 36#include <assert.h> 37#include <errno.h> 38#include <pthread.h> 39#include <signal.h> 40#include <stdio.h> 41#include <string.h> 42#include <unistd.h> 43 44#include "hast.h" 45#include "hastd.h" | 32 33#include <sys/types.h> 34#include <sys/wait.h> 35 36#include <assert.h> 37#include <errno.h> 38#include <pthread.h> 39#include <signal.h> 40#include <stdio.h> 41#include <string.h> 42#include <unistd.h> 43 44#include "hast.h" 45#include "hastd.h" |
| 46#include "hast_checksum.h" |
|
| 46#include "hast_proto.h" 47#include "hooks.h" 48#include "nv.h" 49#include "pjdlog.h" 50#include "proto.h" 51#include "subr.h" 52 53#include "control.h" --- 187 unchanged lines hidden (view full) --- 241 break; 242 case HAST_REPLICATION_ASYNC: 243 nv_add_string(nvout, "async", "replication%u", no); 244 break; 245 default: 246 nv_add_string(nvout, "unknown", "replication%u", no); 247 break; 248 } | 47#include "hast_proto.h" 48#include "hooks.h" 49#include "nv.h" 50#include "pjdlog.h" 51#include "proto.h" 52#include "subr.h" 53 54#include "control.h" --- 187 unchanged lines hidden (view full) --- 242 break; 243 case HAST_REPLICATION_ASYNC: 244 nv_add_string(nvout, "async", "replication%u", no); 245 break; 246 default: 247 nv_add_string(nvout, "unknown", "replication%u", no); 248 break; 249 } |
| 250 nv_add_string(nvout, checksum_name(res->hr_checksum), 251 "checksum%u", no); |
|
| 249 nv_add_string(nvout, role2str(res->hr_role), "role%u", no); 250 251 switch (res->hr_role) { 252 case HAST_ROLE_PRIMARY: 253 assert(res->hr_workerpid != 0); 254 /* FALLTHROUGH */ 255 case HAST_ROLE_SECONDARY: 256 if (res->hr_workerpid != 0) --- 215 unchanged lines hidden --- | 252 nv_add_string(nvout, role2str(res->hr_role), "role%u", no); 253 254 switch (res->hr_role) { 255 case HAST_ROLE_PRIMARY: 256 assert(res->hr_workerpid != 0); 257 /* FALLTHROUGH */ 258 case HAST_ROLE_SECONDARY: 259 if (res->hr_workerpid != 0) --- 215 unchanged lines hidden --- |