d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename HASTCTL_ defines, which are used for conversion between main

Browse Source 
hastd process and workers, remove unused one and set different range
of numbers. This is done in order not to confuse them with HASTCTL_CMD
defines, used for conversation between hastctl and hastd, and to avoid
bugs like the one fixed in in r221075.

Approved by:	pjd (mentor)
MFC after:	1 week
This commit is contained in:
Mikolaj Golub 2011-04-26 19:38:30 +00:00
parent 1768fba5c0
commit 7a2b83683d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=221076
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/hastd/control.c
View File

@ -162,7 +162,7 @@ control_status_worker(struct hast_resource *res, struct nv *nvout,
* Prepare and send command to worker process.
*/
cnvout = nv_alloc();
nv_add_uint8(cnvout, HASTCTL_STATUS, "cmd");
nv_add_uint8(cnvout, CONTROL_STATUS, "cmd");
error = nv_error(cnvout);
if (error != 0) {
pjdlog_common(LOG_ERR, 0, error,
@ -427,7 +427,7 @@ ctrl_thread(void *arg)
}
nvout = nv_alloc();
switch (cmd) {
case HASTCTL_STATUS:
case CONTROL_STATUS:
if (res->hr_remotein != NULL &&
res->hr_remoteout != NULL) {
nv_add_string(nvout, "complete", "status");
@ -448,7 +448,7 @@ ctrl_thread(void *arg)
}
nv_add_int16(nvout, 0, "error");
break;
case HASTCTL_RELOAD:
case CONTROL_RELOAD:
/*
* When parent receives SIGHUP and discovers that
* something related to us has changes, it sends reload

5
sbin/hastd/control.h
View File

@ -32,9 +32,8 @@
#ifndef _CONTROL_H_
#define _CONTROL_H_
#define HASTCTL_SET_ROLE 1
#define HASTCTL_STATUS 2
#define HASTCTL_RELOAD 3
#define CONTROL_STATUS 10
#define CONTROL_RELOAD 11
struct hastd_config;
struct hast_resource;

2
sbin/hastd/hastd.c
View File

@ -424,7 +424,7 @@ resource_reload(const struct hast_resource *res)
PJDLOG_ASSERT(res->hr_role == HAST_ROLE_PRIMARY);
nvout = nv_alloc();
nv_add_uint8(nvout, HASTCTL_RELOAD, "cmd");
nv_add_uint8(nvout, CONTROL_RELOAD, "cmd");
nv_add_string(nvout, res->hr_remoteaddr, "remoteaddr");
nv_add_string(nvout, res->hr_sourceaddr, "sourceaddr");
nv_add_int32(nvout, (int32_t)res->hr_replication, "replication");