[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] 32/64/endian changes to cpg service requires changes to group/daemon/cpg.c



Dave,

Patch attached.  This should come out in the next version of openais
(0.78).  Basically I changed the nodeId to nodeid, to be a little more
consistent with openais policy of no upper case in the executive
services or libraries we develop in openais.

Regards
-steve
? ccs/ccs_test/ccs_test
? ccs/ccs_tool/.update.c.swp
? ccs/ccs_tool/ccs_tool
? ccs/daemon/.cluster_mgr.c.swp
? ccs/daemon/ccsd
? ccs/lib/libSaAmf.so.1.0
? ccs/lib/libSaCkpt.so.1.0
? ccs/lib/libSaClm.so.1.0
? ccs/lib/libSaEvt.so.1.0
? ccs/lib/libSaLck.so.1.0
? ccs/lib/libSaMsg.so.1.0
? ccs/lib/libais.so.1.0
? ccs/lib/libcman.so.DEVEL.1145480971
? ccs/lib/libcpg.so.1.0
? ccs/lib/libevs.so.1.0
? ccs/make/defines.mk
? cman/cman_tool/cman_tool
? cman/daemon/.Makefile.swo
? cman/daemon/openais20060530
? cman/daemon/service_cman.lcrso
? cman/lib/libcman.so.DEVEL.1145480971
? cman/lib/libcman.so.DEVEL.1150406807
? cman/lib/libcman.so.DEVEL.1150442084
? cman/make/defines.mk
? cmirror/make/defines.mk
? dlm/make/defines.mk
? fence/make/defines.mk
? gfs/make/defines.mk
? gfs-kernel/make/defines.mk
? gfs2/make/defines.mk
? gnbd/make/defines.mk
? gnbd-kernel/make/defines.mk
? rgmanager/make/defines.mk
Index: cman/daemon/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/Makefile,v
retrieving revision 1.43
diff -r1.43 Makefile
14a15,16
> <<<<<<< Makefile
> =======
16a19
> >>>>>>> 1.43
20,22c23,24
< CFLAGS+= -fPIC -g -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
< 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib -DDEBUG \
< 	-I ${AISDIR}/${AISTAG}/exec -L ${AISDIR}/${AISTAG}/exec
---
> CFLAGS+= -fPIC -g -I../../ccs/lib -I${incdir} -I${top_srcdir}/config \
> 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib -DDEBUG -DOPENAIS_EXTERNAL_SERVICE
29c31
< all: ${AISDIR}/${AISTAG}/exec/aisexec ${TARGET}
---
> all: ${TARGET}
34,38c36,37
< service_cman.lcrso: ${CMAN_OBJS} ${AISDIR}/${AISTAG}/exec/aisexec
< 	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir} -lccs
< 	cp ${TARGET} ${AISDIR}/${AISTAG}/exec
< 	rm -f openais
< 	ln -sf ${AISDIR} openais
---
> service_cman.lcrso: ${CMAN_OBJS}
> 	$(CC) $(CFLAGS) -shared -Wl,-soname,service_cman.lcrso -o $@ ${CMAN_OBJS} -L../lib -L${ccslibdir}
65,77d63
< # Target to download openAIS
< ${AISDIR}/${AISDIR}.tar.gz:
< 	mkdir -p ${AISDIR}
< 	cd ${AISDIR} && wget http://people.redhat.com/pcaulfie/${AISDIR}.tar.gz
< 
< # Unpack the tarball
< ${AISDIR}/${AISTAG}: ${AISDIR}/${AISDIR}.tar.gz
< 	cd ${AISDIR} && tar -xzf ${AISDIR}.tar.gz
< 	touch ${AISDIR}/${AISTAG}
< 
< ${AISDIR}/${AISTAG}/exec/aisexec: ${AISDIR}/${AISTAG}
< 	cd ${AISDIR}/${AISTAG} && make BUILD_DYNAMIC=1 OPENAIS_BUILD=DEBUG
< 
81,83d66
< 	install ${AISDIR}/${AISTAG}/exec/aisexec ${libexecdir}/cman/
< 	install ${AISDIR}/${AISTAG}/exec/*.lcrso ${libexecdir}/cman/
< 	install ${AISDIR}/${AISTAG}/exec/keygen ${sbindir}/ais-keygen
Index: cman/daemon/ais.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/ais.c,v
retrieving revision 1.30
diff -r1.30 ais.c
28,36c28,35
< #include "totemip.h"
< #include "totemconfig.h"
< #include "commands.h"
< #include "totempg.h"
< #include "aispoll.h"
< #include "service.h"
< #include "config.h"
< #include "print.h"
< #include "../lcr/lcr_comp.h"
---
> /* openais headers */
> #include <openais/totem/totemip.h>
> #include <openais/totem/totempg.h>
> #include <openais/totem/aispoll.h>
> #include <openais/service/service.h>
> #include <openais/service/config.h>
> #include <openais/service/swab.h>
> #include <openais/lcr/lcr_comp.h>
38a38
> #include "commands.h"
40d39
< #include "swab.h"
448a448
> printf ("SETTING to cluster name\n");
Index: cman/daemon/ais.h
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/ais.h,v
retrieving revision 1.8
diff -r1.8 ais.h
15c15
< #include "totem.h"
---
> #include <openais/totem/totem.h>
Index: cman/daemon/barrier.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/barrier.c,v
retrieving revision 1.7
diff -r1.7 barrier.c
34,35c34,35
< #include "totemip.h"
< #include "aispoll.h"
---
> #include <openais/totem/aispoll.h>
> #include <openais/totem/totemip.h>
Index: cman/daemon/cmanccs.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/cmanccs.c,v
retrieving revision 1.15
diff -r1.15 cmanccs.c
29c29
< #include "totemip.h"
---
> #include <openais/totem/totemip.h>
Index: cman/daemon/cnxman-private.h
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/cnxman-private.h,v
retrieving revision 1.21
diff -r1.21 cnxman-private.h
17,22c17
< #include <totem.h>
< 
< // PJC: Remove this later
< #ifndef INTERFACE_MAX
< #define INTERFACE_MAX 2
< #endif
---
> #include <openais/totem/totem.h>
Index: cman/daemon/commands.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/commands.c,v
retrieving revision 1.43
diff -r1.43 commands.c
34,35c34,37
< #include "totemip.h"
< #include "totempg.h"
---
> #include <openais/totem/totemip.h>
> #include <openais/totem/totempg.h>
> #include <openais/totem/aispoll.h>
> #include <openais/service/swab.h>
44,45d45
< #include "aispoll.h"
< #include "swab.h"
Index: cman/daemon/config.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/config.c,v
retrieving revision 1.16
diff -r1.16 config.c
16a17
> #include <openais/service/objdb.h>
18d18
< #include "objdb.h"
Index: cman/daemon/daemon.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/daemon.c,v
retrieving revision 1.28
diff -r1.28 daemon.c
32c32,34
< #include "aispoll.h"
---
> #include <openais/totem/aispoll.h>
> #include <openais/totem/totemip.h>
> 
34d35
< #include "totemip.h"
Index: cman/daemon/logging.c
===================================================================
RCS file: /cvs/cluster/cluster/cman/daemon/logging.c,v
retrieving revision 1.11
diff -r1.11 logging.c
24,25c24,25
< #include "print.h"
< #include "totemip.h"
---
> /* openais header */
> #include <openais/service/print.h>
Index: group/daemon/cpg.c
===================================================================
RCS file: /cvs/cluster/cluster/group/daemon/cpg.c,v
retrieving revision 1.28
diff -r1.28 cpg.c
97c97
< 			node = new_node(saved_member[i].nodeId);
---
> 			node = new_node(saved_member[i].nodeid);
156c156
< 		if (saved_member[i].nodeId == our_nodeid &&
---
> 		if (saved_member[i].nodeid == our_nodeid &&
173,174c173,174
< 			add_recovery_set(saved_left[i].nodeId);
< 			groupd_down(saved_left[i].nodeId);
---
> 			add_recovery_set(saved_left[i].nodeid);
> 			groupd_down(saved_left[i].nodeid);
186c186
< 		data->members[i] = groupd_cpg_member[i].nodeId;
---
> 		data->members[i] = groupd_cpg_member[i].nodeid;
278c278
< 		process_node_join(g, saved_joined[i].nodeId);
---
> 		process_node_join(g, saved_joined[i].nodeid);
282c282
< 			  saved_left[i].nodeId, saved_left[i].reason);
---
> 			  saved_left[i].nodeid, saved_left[i].reason);
285c285
< 			process_node_leave(g, saved_left[i].nodeId);
---
> 			process_node_leave(g, saved_left[i].nodeid);
287c287
< 			process_node_down(g, saved_left[i].nodeId);
---
> 			process_node_down(g, saved_left[i].nodeid);

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]