sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-build: Split protocol-util as a separate subsystem

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2017-09-04 16:00:48 +10:00 committed by Martin Schwenke
parent 2550a88e2f
commit 3783b66fb3
15 changed files with 70 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ctdb/protocol/protocol_api.h
View File

@ -678,22 +678,4 @@ void sock_packet_header_set_reqid(struct sock_packet_header *h,
void sock_packet_header_set_length(struct sock_packet_header *h,
uint32_t length);
/* From protocol/protocol_util.c */
const char *ctdb_runstate_to_string(enum ctdb_runstate runstate);
enum ctdb_runstate ctdb_runstate_from_string(const char *runstate_str);
const char *ctdb_event_to_string(enum ctdb_event event);
enum ctdb_event ctdb_event_from_string(const char *event_str);
const char *ctdb_sock_addr_to_string(TALLOC_CTX *mem_ctx, ctdb_sock_addr *addr);
int ctdb_sock_addr_cmp_ip(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
int ctdb_sock_addr_cmp(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
bool ctdb_sock_addr_same_ip(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
bool ctdb_sock_addr_same(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
#endif /* __CTDB_PROTOCOL_API_H__ */

4
ctdb/protocol/protocol_util.c
View File

@ -21,11 +21,9 @@
#include "system/network.h"
#include <talloc.h>
#include <tdb.h>
#include "protocol.h"
#include "protocol_private.h"
#include "protocol_api.h"
#include "protocol_util.h"
static struct {
enum ctdb_runstate runstate;

43
ctdb/protocol/protocol_util.h Normal file
View File

@ -0,0 +1,43 @@
/*
CTDB protocol marshalling
Copyright (C) Amitay Isaacs 2015
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __CTDB_PROTOCOL_UTIL_H__
#define __CTDB_PROTOCOL_UTIL_H__
#include <talloc.h>
#include "protocol/protocol.h"
const char *ctdb_runstate_to_string(enum ctdb_runstate runstate);
enum ctdb_runstate ctdb_runstate_from_string(const char *runstate_str);
const char *ctdb_event_to_string(enum ctdb_event event);
enum ctdb_event ctdb_event_from_string(const char *event_str);
const char *ctdb_sock_addr_to_string(TALLOC_CTX *mem_ctx, ctdb_sock_addr *addr);
int ctdb_sock_addr_cmp_ip(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
int ctdb_sock_addr_cmp(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
bool ctdb_sock_addr_same_ip(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
bool ctdb_sock_addr_same(const ctdb_sock_addr *addr1,
const ctdb_sock_addr *addr2);
#endif /* __CTDB_PROTOCOL_UTIL_H__ */

1
ctdb/server/ctdb_eventd.c
View File

@ -35,6 +35,7 @@
#include "lib/async_req/async_sock.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "common/comm.h"
#include "common/logging.h"

1
ctdb/server/ctdb_takeover_helper.c
View File

@ -42,6 +42,7 @@
#include "protocol/protocol.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "client/client.h"
#include "common/logging.h"

2
ctdb/server/ipalloc.c
View File

@ -29,7 +29,7 @@
#include "common/logging.h"
#include "common/rb_tree.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "server/ipalloc_private.h"

2
ctdb/server/ipalloc_common.c
View File

@ -32,7 +32,7 @@
#include "common/common.h"
#include "common/rb_tree.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "server/ipalloc_private.h"

2
ctdb/server/ipalloc_lcp2.c
View File

@ -25,7 +25,7 @@
#include "lib/util/debug.h"
#include "common/logging.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "server/ipalloc_private.h"

2
ctdb/server/ipalloc_nondeterministic.c
View File

@ -28,7 +28,7 @@
#include "common/logging.h"
#include "common/common.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "server/ipalloc_private.h"

2
ctdb/tests/src/ctdb_takeover_tests.c
View File

@ -26,7 +26,7 @@
#include "lib/util/debug.h"
#include "protocol/protocol.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "common/logging.h"
#include "common/system.h"

1
ctdb/tests/src/fake_ctdbd.c
View File

@ -34,6 +34,7 @@
#include "protocol/protocol.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "common/comm.h"
#include "common/system.h"

1
ctdb/tools/ctdb.c
View File

@ -39,6 +39,7 @@
#include "common/logging.h"
#include "protocol/protocol.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "common/system.h"
#include "client/client.h"
#include "client/client_sync.h"

2
ctdb/tools/ctdb_event.c
View File

@ -26,7 +26,7 @@
#include "lib/util/debug.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "client/client_event.h"
#include "common/logging.h"

2
ctdb/tools/ctdb_killtcp.c
View File

@ -26,7 +26,7 @@
#include "lib/util/debug.h"
#include "protocol/protocol.h"
#include "protocol/protocol_api.h"
#include "protocol/protocol_util.h"
#include "common/rb_tree.h"
#include "common/system.h"

26
ctdb/wscript
View File

@ -400,12 +400,15 @@ def build(bld):
protocol_keepalive.c
protocol_client.c
protocol_debug.c
protocol_util.c
protocol_event.c
protocol_sock.c'''),
includes='include',
deps='replace talloc tdb')
bld.SAMBA_SUBSYSTEM('ctdb-protocol-util',
source='protocol/protocol_util.c',
deps='replace talloc tdb')
bld.SAMBA_SUBSYSTEM('ctdb-client',
source=bld.SUBDIR('client', 'ctdb_client.c'),
includes='include',
@ -439,7 +442,7 @@ def build(bld):
ipalloc.c
'''),
includes='include',
deps='ctdb-protocol replace talloc tevent')
deps='ctdb-protocol-util replace talloc tevent')
bld.SAMBA_BINARY('ctdbd',
source='server/ctdbd.c ' +
@ -469,21 +472,21 @@ def build(bld):
bld.SAMBA_BINARY('ctdb',
source='tools/ctdb.c',
deps='''ctdb-client2 ctdb-protocol ctdb-util ctdb-system
samba-util sys_rw popt''',
deps='''ctdb-client2 ctdb-protocol ctdb-protocol-util
ctdb-util ctdb-system samba-util sys_rw popt''',
install_path='${BINDIR}',
manpages='ctdb.1')
bld.SAMBA_BINARY('ctdb_killtcp',
source='tools/ctdb_killtcp.c',
deps='''ctdb-protocol ctdb-util ctdb-system
deps='''ctdb-protocol-util ctdb-util ctdb-system
samba-util replace''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_event',
source='tools/ctdb_event.c',
deps='''ctdb-client2 ctdb-protocol ctdb-util ctdb-system
samba-util replace''',
deps='''ctdb-client2 ctdb-protocol ctdb-protocol-util
ctdb-util ctdb-system samba-util replace''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ltdbtool',
@ -495,8 +498,8 @@ def build(bld):
bld.SAMBA_BINARY('ctdb_eventd',
source='server/ctdb_eventd.c',
deps='''ctdb-server-util ctdb-protocol ctdb-util
samba-util LIBASYNC_REQ replace popt''',
deps='''ctdb-server-util ctdb-protocol ctdb-protocol-util
ctdb-util samba-util LIBASYNC_REQ replace popt''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_lock_helper',
@ -840,8 +843,9 @@ def build(bld):
bld.SAMBA_BINARY('fake_ctdbd',
source='''tests/src/fake_ctdbd.c
tests/src/ipalloc_read_known_ips.c''',
deps='''ctdb-util ctdb-protocol ctdb-system
samba-util tevent-util LIBASYNC_REQ popt''',
deps='''ctdb-util ctdb-protocol ctdb-protocol-util
ctdb-system samba-util tevent-util
LIBASYNC_REQ popt''',
install_path='${CTDB_TEST_LIBEXECDIR}')
if bld.env.HAVE_INFINIBAND: