proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-27 08:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow CFLAGS and LDFLAGS to be overridden through the environment or command

Browse Source 
line.


git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1065 fd59a12c-fef9-0310-b244-a6a79926bd2f
This commit is contained in:
Steven Dake 2006-06-16 19:07:28 +00:00
parent 33d89ae7db
commit d193826724
3 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.inc
View File

@ -64,16 +64,16 @@ endif
# platform specific CFLAGS, LDFLAGS
#
ifeq (${OPENAIS_COMPAT}, LINUX)
CFLAGS += -DOPENAIS_LINUX
LDFLAGS += -ldl -lpthread
DYFLAGS += -rdynamic
override CFLAGS += -DOPENAIS_LINUX
override LDFLAGS += -ldl -lpthread
override DYFLAGS += -rdynamic
endif
ifeq (${OPENAIS_COMPAT}, BSD)
CFLAGS += -DOPENAIS_BSD
LDFLAGS += -pthread
DYFLAGS += -export-dynamic
override CFLAGS += -DOPENAIS_BSD
override LDFLAGS += -pthread
override DYFLAGS += -export-dynamic
endif
ifeq (${OPENAIS_COMPAT}, DARWIN)
CFLAGS += -DOPENAIS_DARWIN
LDFLAGS += -lpthread
override CFLAGS += -DOPENAIS_DARWIN
override LDFLAGS += -lpthread
endif

8
exec/Makefile
View File

@ -32,15 +32,15 @@
#
include ../Makefile.inc
CFLAGS += -I../include
override CFLAGS += -I../include
LDFLAGS += -L./
ifeq (${BUILD_DYNAMIC}, 1)
LDFLAGS += ${DYFLAGS}
override LDFLAGS += ${DYFLAGS}
endif
ifeq (${OPENAIS_COMPAT}, LINUX)
LDFLAGS += -ldl
override LDFLAGS += -ldl
endif
# Totem objects
@ -61,7 +61,7 @@ OTHER_OBJS = objdb.o
ifeq (${BUILD_DYNAMIC}, 1)
EXEC_OBJS = $(TOTEM_OBJS) $(MAIN_OBJS)
CFLAGS += -fPIC
override CFLAGS += -fPIC
all:libtotem_pg.a libtotem_pg.so.1.0.0 ../lcr/lcr_ifact.o \
aisexec \

34
exec/totemsrp.c
View File

@ -2589,11 +2589,7 @@ static int memb_lowest_in_config (struct totemsrp_instance *instance)
struct srp_addr token_memb[PROCESSOR_COUNT_MAX];
int token_memb_entries = 0;
int i;
unsigned int lowest_addr;
// struct totem_ip_address lowest_addr;
// memset(&lowest_addr, 0xff, sizeof(lowest_addr));
// lowest_addr.family = instance->mcast_address.family;
struct totem_ip_address *lowest_addr;
memb_set_subtract (token_memb, &token_memb_entries,
instance->my_proc_list, instance->my_proc_list_entries,
@ -2602,16 +2598,17 @@ static int memb_lowest_in_config (struct totemsrp_instance *instance)
/*
* find representative by searching for smallest identifier
*/
lowest_addr = token_memb[0].addr[0].nodeid;
lowest_addr = &token_memb[0].addr[0];
for (i = 1; i < token_memb_entries; i++) {
if (lowest_addr > token_memb[i].addr[0].nodeid) {
lowest_addr = token_memb[i].addr[0].nodeid;
if (totemip_compare(lowest_addr, &token_memb[i].addr[0]) > 0) {
totemip_copy (lowest_addr, &token_memb[i].addr[0]);
}
}
return (lowest_addr == instance->my_id.addr[0].nodeid);
return (totemip_compare (lowest_addr, &instance->my_id.addr[0]) == 0);
}
int srp_compare (const void *a, const void *b)
static int srp_addr_compare (const void *a, const void *b)
{
struct srp_addr *srp_a = (struct srp_addr *)a;
struct srp_addr *srp_b = (struct srp_addr *)b;
@ -2646,6 +2643,13 @@ static void memb_state_commit_token_create (
commit_token->ring_id.seq = instance->token_ring_id_seq + 4;
/*
* This qsort is necessary to ensure the commit token traverses
* the ring in the proper order
*/
qsort (token_memb, token_memb_entries, sizeof (struct srp_addr),
srp_addr_compare);
commit_token->memb_index = token_memb_entries - 1;
commit_token->addr_entries = token_memb_entries;
@ -3911,12 +3915,10 @@ static int message_handler_memb_commit_token (
log_printf (instance->totemsrp_log_level_notice,
"Sending initial ORF token\n");
// if (totemip_equal(&instance->my_id.addr[0], &instance->my_ring_id.rep)) {
// TODO convert instead of initiate
orf_token_send_initial (instance);
reset_token_timeout (instance); // REVIEWED
reset_token_retransmit_timeout (instance); // REVIEWED
// }
// TODO convert instead of initiate
orf_token_send_initial (instance);
reset_token_timeout (instance); // REVIEWED
reset_token_retransmit_timeout (instance); // REVIEWED
break;
}
return (0);