From e132bc580c9c44c27c997adb60047c074f71f868 Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sun, 9 Sep 2007 06:58:41 +0000 Subject: [PATCH] Expose utils to the user git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1442 fd59a12c-fef9-0310-b244-a6a79926bd2f --- Makefile | 5 +++-- exec/ipc.c | 4 +++- lib/Makefile | 24 +++++++++++++++++------- lib/amf.c | 2 +- lib/cfg.c | 2 +- lib/ckpt.c | 2 +- lib/clm.c | 2 +- lib/cpg.c | 2 +- lib/evs.c | 2 +- lib/evt.c | 2 +- lib/lck.c | 2 +- lib/msg.c | 2 +- lib/util.c | 2 +- 13 files changed, 33 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index efa53567..e992bf28 100644 --- a/Makefile +++ b/Makefile @@ -71,10 +71,11 @@ clean: rm -rf doc/api AIS_LIBS = ais SaAmf SaClm SaCkpt SaEvt SaLck SaMsg evs cpg \ - cfg + cfg aisutil AIS_HEADERS = saAis.h saAmf.h saClm.h saCkpt.h saEvt.h saEvt.h saLck.h \ - saMsg.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h + saMsg.h cpg.h cfg.h evs.h ipc_gen.h mar_gen.h swab.h \ + ais_util.h install: all mkdir -p $(DESTDIR)$(SBINDIR) diff --git a/exec/ipc.c b/exec/ipc.c index 8a712b98..aabb71f0 100644 --- a/exec/ipc.c +++ b/exec/ipc.c @@ -383,7 +383,9 @@ static void conn_info_destroy (struct conn_info *conn_info) free (conn_info); } -static int libais_connection_active (struct conn_info *conn_info) +int libais_connection_active (struct conn_info *conn_info); + +int libais_connection_active (struct conn_info *conn_info) { return (conn_info->state == CONN_STATE_ACTIVE); } diff --git a/lib/Makefile b/lib/Makefile index fca9853c..6d24f939 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -44,7 +44,8 @@ all:libSaClm.a libSaClm.so.2.0.0 \ libcpg.a libcpg.so.2.0.0 \ libais.a libais.so.2.0.0 \ libevs.a libevs.so.2.0.0 \ - libcfg.a libcfg.so.2.0.0 + libcfg.a libcfg.so.2.0.0 \ + libaisutil.a libaisutil.so.2.0.0 LIBAIS_SRC = util.c amf.c clm.c ckpt.c evt.c @@ -53,8 +54,14 @@ LIBEVS_SRC = util.c evs.c libSaClm.a: util.o clm.o $(AR) -rc libSaClm.a util.o clm.o +libaisutil.a: util.o + $(AR) -rc libaisutil.a util.o + ifeq (${OPENAIS_COMPAT}, DARWIN) +libaisutil.so.2.0.0: util.o + $(CC) $(LDFLAGS) -bundle -bind_at_load util.o -o $@ + libSaClm.so.2.0.0: util.o clm.o $(CC) $(LDFLAGS) -bundle -bind_at_load util.o clm.o -o $@ @@ -87,6 +94,9 @@ libcfg.so.2.0.0: util.o cfg.o else +libaisutil.so.2.0.0: util.o + $(CC) $(LDFLAGS) -shared -Wl,-soname,libaisutil.so.2,-version-script=libaisutil.versions util.o -o $@ + libSaClm.so.2.0.0: util.o clm.o $(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.2,-version-script=libSaClm.versions util.o clm.o -o $@ @@ -160,19 +170,19 @@ depend: makedepend -Y -- $(CFLAGS) $(CPPFLAGS) $(LIBAIS_SRC) > /dev/null 2>&1 # DO NOT DELETE -util.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h util.h +util.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h ../include/ais_util.h amf.o: ../include/saAis.h ../include/saAmf.h ../include/saAis.h amf.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_amf.h -amf.o: ../include/ipc_gen.h ../include/saAmf.h util.h +amf.o: ../include/ipc_gen.h ../include/saAmf.h ../include/ais_util.h clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h clm.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_clm.h -clm.o: ../include/saClm.h ../include/ipc_gen.h util.h +clm.o: ../include/saClm.h ../include/ipc_gen.h ../include/ais_util.h ckpt.o: ../include/saAis.h ../include/list.h ../include/saCkpt.h ckpt.o: ../include/ipc_gen.h ../exec/totemip.h ../include/ipc_ckpt.h -ckpt.o: ../include/saAis.h ../include/saCkpt.h ../include/ipc_gen.h util.h +ckpt.o: ../include/saAis.h ../include/saCkpt.h ../include/ipc_gen.h ../include/ais_util.h evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h -evt.o: ../include/saClm.h ../include/ipc_gen.h util.h ../include/ipc_gen.h +evt.o: ../include/saClm.h ../include/ipc_gen.h ../include/ais_util.h ../include/ipc_gen.h evt.o: ../exec/totemip.h ../exec/totem.h ../exec/totemip.h ../include/list.h cpg.o: ../include/saAis.h ../include/ipc_gen.h ../exec/totemip.h cpg.o: ../include/ipc_cpg.h ../include/saAis.h ../include/saClm.h -cpg.o: ../include/ipc_gen.h util.h +cpg.o: ../include/ipc_gen.h ../include/ais_util.h diff --git a/lib/amf.c b/lib/amf.c index 183f12fe..35e20c85 100644 --- a/lib/amf.c +++ b/lib/amf.c @@ -49,7 +49,7 @@ #include #include #include -#include "util.h" +#include struct res_overlay { diff --git a/lib/cfg.c b/lib/cfg.c index 3a6b0f4f..3d8a9788 100644 --- a/lib/cfg.c +++ b/lib/cfg.c @@ -51,7 +51,7 @@ #include #include #include -#include "util.h" +#include struct res_overlay { mar_res_header_t header; diff --git a/lib/ckpt.c b/lib/ckpt.c index 6bb0a9f0..2b318579 100644 --- a/lib/ckpt.c +++ b/lib/ckpt.c @@ -54,7 +54,7 @@ #include #include -#include "util.h" +#include struct message_overlay { mar_res_header_t header __attribute__((aligned(8))); diff --git a/lib/clm.c b/lib/clm.c index 92f63015..70c69719 100644 --- a/lib/clm.c +++ b/lib/clm.c @@ -54,7 +54,7 @@ #include #include -#include "util.h" +#include struct res_overlay { mar_res_header_t header; diff --git a/lib/cpg.c b/lib/cpg.c index 6f065291..2f486945 100644 --- a/lib/cpg.c +++ b/lib/cpg.c @@ -49,7 +49,7 @@ #include #include #include -#include "util.h" +#include struct cpg_inst { int response_fd; diff --git a/lib/evs.c b/lib/evs.c index e8e1bc1b..4b23d210 100644 --- a/lib/evs.c +++ b/lib/evs.c @@ -51,7 +51,7 @@ #include #include #include -#include "util.h" +#include struct evs_inst { int response_fd; diff --git a/lib/evt.c b/lib/evt.c index 7361ef5a..9badd2fe 100644 --- a/lib/evt.c +++ b/lib/evt.c @@ -40,7 +40,7 @@ #include #include #include -#include "util.h" +#include #include "../exec/totem.h" #include diff --git a/lib/lck.c b/lib/lck.c index d62d1d96..0b822b79 100644 --- a/lib/lck.c +++ b/lib/lck.c @@ -51,7 +51,7 @@ #include #include -#include "util.h" +#include struct message_overlay { mar_res_header_t header __attribute__((aligned(8))); diff --git a/lib/msg.c b/lib/msg.c index 707b864c..24d6d9b7 100644 --- a/lib/msg.c +++ b/lib/msg.c @@ -51,7 +51,7 @@ #include #include -#include "util.h" +#include struct message_overlay { mar_res_header_t header __attribute__((aligned(8))); diff --git a/lib/util.c b/lib/util.c index 63e8dcb4..2af0fa75 100644 --- a/lib/util.c +++ b/lib/util.c @@ -55,7 +55,7 @@ #include #include -#include "util.h" +#include enum SA_HANDLE_STATE { SA_HANDLE_STATE_EMPTY,