Просмотр исходного кода

Rev versions to 2.0 and update versions script for all services

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1112 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 19 лет назад
Родитель
Сommit
cd52f094b0

+ 23 - 23
lib/Makefile

@@ -35,11 +35,11 @@ include ../Makefile.inc
 CFLAGS += -I../include
 LDFLAGS += -L./
 
-all:libSaClm.a libSaClm.so.1.0.0 libSaAmf.a libSaAmf.so.1.0.0 libSaCkpt.a \
-	libSaCkpt.so.1.0.0 libSaEvt.a libSaEvt.so.1.0.0 libSaLck.a \
-	 libSaLck.so.1.0.0 libSaMsg.a libSaMsg.so.1.0.0 \
-	libcpg.a libcpg.so.1.0.0 \
-	libais.a libais.so.1.0.0 libevs.a libevs.so.1.0.0
+all:libSaClm.a libSaClm.so.2.0.0 libSaAmf.a libSaAmf.so.2.0.0 libSaCkpt.a \
+	libSaCkpt.so.2.0.0 libSaEvt.a libSaEvt.so.2.0.0 libSaLck.a \
+	 libSaLck.so.2.0.0 libSaMsg.a libSaMsg.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
 
 LIBAIS_SRC = util.c amf.c clm.c ckpt.c evt.c
 
@@ -50,60 +50,60 @@ libSaClm.a: util.o clm.o
 
 ifeq (${OPENAIS_COMPAT}, DARWIN)
 
-libSaClm.so.1.0.0: util.o clm.o
+libSaClm.so.2.0.0: util.o clm.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o clm.o -o $@
 
-libSaAmf.so.1.0.0: util.o amf.o
+libSaAmf.so.2.0.0: util.o amf.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o amf.o -o $@
 
-libSaCkpt.so.1.0.0: util.o ckpt.o
+libSaCkpt.so.2.0.0: util.o ckpt.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o ckpt.o -o $@
 
-libSaEvt.so.1.0.0: util.o evt.o
+libSaEvt.so.2.0.0: util.o evt.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o evt.o -o $@
 
-libSaLck.so.1.0.0: util.o lck.o
+libSaLck.so.2.0.0: util.o lck.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o lck.o -o $@
 
-libSaMsg.so.1.0.0: util.o msg.o
+libSaMsg.so.2.0.0: util.o msg.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o msg.o -o $@
 
-libais.so.1.0.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
+libais.so.2.0.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o amf.o clm.o ckpt.o evt.o -o $@
 
-libevs.so.1.0.0: util.o evs.o
+libevs.so.2.0.0: util.o evs.o
 	$(CC) $(LDFLAGS) -bundle -bind_at_load util.o evs.o -o $@
 
-libcpg.so.1.0.0: util.o cpg.o
+libcpg.so.2.0.0: util.o cpg.o
 	$(CC) -bundle -bind_at_load util.o cpg.o -o $@
 
 else
 
-libSaClm.so.1.0.0: util.o clm.o
+libSaClm.so.2.0.0: util.o clm.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaClm.so.1,-version-script=libSaClm.versions util.o clm.o -o $@
 
-libSaAmf.so.1.0.0: util.o amf.o
+libSaAmf.so.2.0.0: util.o amf.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaAmf.so.1,-version-script=libSaAmf.versions util.o amf.o -o $@
 
-libSaCkpt.so.1.0.0: util.o ckpt.o
+libSaCkpt.so.2.0.0: util.o ckpt.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaCkpt.so.1,-version-script=libSaCkpt.versions util.o ckpt.o -o $@
 
-libSaEvt.so.1.0.0: util.o evt.o
+libSaEvt.so.2.0.0: util.o evt.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaEvt.so.1,-version-script=libSaEvt.versions util.o evt.o -o $@
 
-libSaLck.so.1.0.0: util.o lck.o
+libSaLck.so.2.0.0: util.o lck.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaLck.so.1,-version-script=libSaLck.versions util.o lck.o -o $@
 
-libSaMsg.so.1.0.0: util.o msg.o
+libSaMsg.so.2.0.0: util.o msg.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libSaMsg.so.1,-version-script=libSaMsg.versions util.o msg.o -o $@
 
-libais.so.1.0.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
+libais.so.2.0.0: util.o amf.o clm.o ckpt.o evt.o lck.o msg.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libais.so.1,-version-script=libSaAis.versions util.o amf.o clm.o ckpt.o evt.o -o $@
 
-libevs.so.1.0.0: util.o evs.o
+libevs.so.2.0.0: util.o evs.o
 	$(CC) $(LDFLAGS) -shared -Wl,-soname,libevs.so.1,-version-script=libevs.versions util.o evs.o -o $@
 
-libcpg.so.1.0.0: util.o cpg.o
+libcpg.so.2.0.0: util.o cpg.o
 	$(CC) -shared -Wl,-soname,libcpg.so.1,-version-script=libcpg.versions util.o cpg.o -o $@
 
 endif

+ 0 - 1
lib/libOpenaisCfg.versions

@@ -24,7 +24,6 @@ OPENAIS_CKPT_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 97 - 51
lib/libSaAis.versions

@@ -17,12 +17,6 @@ OPENAIS_CLM_B.01.01 {
 		saHandleInstanceGet;
 		saHandleInstancePut;
 		saPollRetry;
-		saQueueInit;
-		saQueueIsEmpty;
-		saQueueIsFull;
-		saQueueItemAdd;
-		saQueueItemGet;
-		saQueueItemRemove;
 		saRecvRetry;
 		saSelectRetry;
 		saSendMsgReceiveReply;
@@ -30,32 +24,32 @@ OPENAIS_CLM_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };
 
-# Version and symbol export for libSaClm.so
-
-OPENAIS_AMF_A.01.01 {
+# Version and symbol export for libSaAmf.so
+OPENAIS_AMF_B.01.01 {
 	global:
-		saAmfInitialize;
-		saAmfSelectionObjectGet;
-		saAmfDispatch;
-		saAmfFinalize;
-		saAmfComponentRegister;
-		saAmfComponentUnregister;
-		saAmfCompNameGet;
-		saAmfReadinessStateGet;
-		saAmfStoppingComplete;
-		saAmfHAStateGet;
-		saAmfProtectionGroupTrackStart;
-		saAmfProtectionGroupTrackStop;
-		saAmfErrorReport;
-		saAmfErrorCancelAll;
-		saAmfComponentCapabilityModelGet;
-		saAmfPendingOperationGet;
-		saAmfResponse;
+                saAmfInitialize;
+                saAmfSelectionObjectGet;
+                saAmfDispatch;
+                saAmfFinalize;
+                saAmfComponentRegister;
+                saAmfComponentUnregister;
+                saAmfComponentNameGet;
+                saAmfPmStart;
+                saAmfPmStop;
+                saAmfHealthcheckStart;
+                saAmfHealthcheckConfirm;
+                saAmfHealthcheckStop;
+                saAmfHAStateGet;
+                saAmfCSIQuiescingComplete;
+                saAmfProtectionGroupTrack;
+                saAmfProtectionGroupTrackStop;
+                saAmfComponentErrorReport;
+                saAmfComponentErrorClear;
+                saAmfResponse;
 
 	local:
 		saHandleCreate;
@@ -63,12 +57,6 @@ OPENAIS_AMF_A.01.01 {
 		saHandleInstanceGet;
 		saHandleInstancePut;
 		saPollRetry;
-		saQueueInit;
-		saQueueIsEmpty;
-		saQueueIsFull;
-		saQueueItemAdd;
-		saQueueItemGet;
-		saQueueItemRemove;
 		saRecvRetry;
 		saSelectRetry;
 		saSendMsgReceiveReply;
@@ -76,13 +64,11 @@ OPENAIS_AMF_A.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };
 
 # Version and symbol export for libSaCkpt.so
-
 OPENAIS_CKPT_B.01.01 {
 	global:
 		saCkptInitialize;
@@ -114,12 +100,6 @@ OPENAIS_CKPT_B.01.01 {
 		saHandleInstanceGet;
 		saHandleInstancePut;
 		saPollRetry;
-		saQueueInit;
-		saQueueIsEmpty;
-		saQueueIsFull;
-		saQueueItemAdd;
-		saQueueItemGet;
-		saQueueItemRemove;
 		saRecvRetry;
 		saSelectRetry;
 		saSendMsgReceiveReply;
@@ -127,13 +107,11 @@ OPENAIS_CKPT_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };
 
-# Version and symbol export for libSaClm.so
-
+# Version and symbol export for libSaEvt.so
 OPENAIS_EVT_B.01.01 {
 	global:
 		
@@ -161,12 +139,6 @@ OPENAIS_EVT_B.01.01 {
 		saHandleInstanceGet;
 		saHandleInstancePut;
 		saPollRetry;
-		saQueueInit;
-		saQueueIsEmpty;
-		saQueueIsFull;
-		saQueueItemAdd;
-		saQueueItemGet;
-		saQueueItemRemove;
 		saRecvRetry;
 		saSelectRetry;
 		saSendMsgReceiveReply;
@@ -174,7 +146,81 @@ OPENAIS_EVT_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
+		saVersionVerify;
+		clustTimeNow;
+};
+
+# Version and symbol export for libSaLck.so
+OPENAIS_LCK_B.01.01 {
+	global:
+		saLckInitialize;
+		saLckSelectionObjectGet;
+		saLckDispatch;
+		saLckinalize;
+		saLckResourceOpen;
+		saLckResourceOpenAsync;
+		saLckResourcClose;
+		saLckResourcLock;
+		saLckResourceLockAsync;
+		saLckResourceUnlock;
+		saLckResourceUnlockAsync;
+		saLckResourceLockPurge;
+	
+
+	local:
+		saHandleCreate;
+		saHandleDestroy;
+		saHandleInstanceGet;
+		saHandleInstancePut;
+		saPollRetry;
+		saRecvRetry;
+		saSendMsgReceiveReply;
+		saSendMsgRetry;
+		saSendReceiveReply;
+		saSendRetry;
+		saServiceConnect;
+		saVersionVerify;
+		clustTimeNow;
+};
+
+# Version and symbol export for libSaMsg.so
+
+OPENAIS_MSG_B.01.01 {
+	global:
+		saMsgInitialize;
+		saMsgSelectionObjectGet;
+		saMsgDispatch;
+		saMsginalize;
+		saMsgQueueOpen;
+		saMsgQueueOpenAsync;
+		saMsgQueueClose;
+		saMsgQueueStatusGet;
+		saMsgQueueUnlink;
+		saMsgQueueGroupCreate;
+		saMsgQueueGroupInsert;
+		saMsgQueueGroupRemove;
+		saMsgQueueGroupDelete;
+		saMsgQueueGroupTrack;
+		saMsgQueueGroupTrackStop;
+		saMsgMessageSend;
+		saMsgMessageSendAsync;
+		saMsgMessageSendAsync;
+		saMsgMessageGet;
+		saMsgMessageCancel;
+		saMsgMessageReply;
+		saMsgMessageReplyAsync;
+	local:
+		saHandleCreate;
+		saHandleDestroy;
+		saHandleInstanceGet;
+		saHandleInstancePut;
+		saPollRetry;
+		saRecvRetry;
+		saSendMsgReceiveReply;
+		saSendMsgRetry;
+		saSendReceiveReply;
+		saSendRetry;
+		saServiceConnect;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 11 - 10
lib/libSaAmf.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libSaClm.so
 
-OPENAIS_AMF_A.01.01 {
+OPENAIS_AMF_B.01.01 {
 	global:
 		saAmfInitialize;
 		saAmfSelectionObjectGet;
@@ -8,16 +8,18 @@ OPENAIS_AMF_A.01.01 {
 		saAmfFinalize;
 		saAmfComponentRegister;
 		saAmfComponentUnregister;
-		saAmfCompNameGet;
-		saAmfReadinessStateGet;
-		saAmfStoppingComplete;
+		saAmfComponentNameGet;
+		saAmfPmStart;
+		saAmfPmStop;
+		saAmfHealthcheckStart;
+		saAmfHealthcheckConfirm;
+		saAmfHealthcheckStop;
 		saAmfHAStateGet;
-		saAmfProtectionGroupTrackStart;
+		saAmfCSIQuiescingComplete;
+		saAmfProtectionGroupTrack;
 		saAmfProtectionGroupTrackStop;
-		saAmfErrorReport;
-		saAmfErrorCancelAll;
-		saAmfComponentCapabilityModelGet;
-		saAmfPendingOperationGet;
+		saAmfComponentErrorReport;
+		saAmfComponentErrorClear;
 		saAmfResponse;
 
 	local:
@@ -32,7 +34,6 @@ OPENAIS_AMF_A.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 0 - 1
lib/libSaCkpt.versions

@@ -37,7 +37,6 @@ OPENAIS_CKPT_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 0 - 1
lib/libSaClm.versions

@@ -23,7 +23,6 @@ OPENAIS_CLM_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 0 - 1
lib/libSaEvt.versions

@@ -33,7 +33,6 @@ OPENAIS_EVT_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 10 - 1
lib/libSaLck.versions

@@ -6,6 +6,16 @@ OPENAIS_LCK_B.01.01 {
 		saLckSelectionObjectGet;
 		saLckDispatch;
 		saLckinalize;
+		saLckinalize;
+		saLckResourceOpen;
+		saLckResourceOpenAsync;
+		saLckResourcClose;
+		saLckResourcLock;
+		saLckResourceLockAsync;
+		saLckResourceUnlock;
+		saLckResourceUnlockAsync;
+		saLckResourceLockPurge;
+
 	local:
 		saHandleCreate;
 		saHandleDestroy;
@@ -18,7 +28,6 @@ OPENAIS_LCK_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 24 - 7
lib/libSaMsg.versions

@@ -1,11 +1,29 @@
-# Version and symbol export for libSaLck.so
+# Version and symbol export for libSaMsg.so
 
-OPENAIS_LCK_B.01.01 {
+OPENAIS_MSG_B.01.01 {
 	global:
-		saLckInitialize;
-		saLckSelectionObjectGet;
-		saLckDispatch;
-		saLckinalize;
+		saMsgInitialize;
+		saMsgSelectionObjectGet;
+		saMsgDispatch;
+		saMsginalize;
+		saMsgQueueOpen;
+		saMsgQueueOpenAsync;
+		saMsgQueueClose;
+		saMsgQueueStatusGet;
+		saMsgQueueUnlink;
+		saMsgQueueGroupCreate;
+		saMsgQueueGroupInsert;
+		saMsgQueueGroupRemove;
+		saMsgQueueGroupDelete;
+		saMsgQueueGroupTrack;
+		saMsgQueueGroupTrackStop;
+		saMsgMessageSend;
+		saMsgMessageSendAsync;
+		saMsgMessageSendAsync;
+		saMsgMessageGet;
+		saMsgMessageCancel;
+		saMsgMessageReply;
+		saMsgMessageReplyAsync;
 	local:
 		saHandleCreate;
 		saHandleDestroy;
@@ -18,7 +36,6 @@ OPENAIS_LCK_B.01.01 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 0 - 1
lib/libcpg.versions

@@ -23,7 +23,6 @@ OPENAIS_CPG_1.0 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };

+ 1 - 2
lib/libevs.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libSaClm.so
 
-OPENAIS_EVS_1.0 {
+OPENAIS_EVS_2.0 {
 	global:
 		evs_initialize;
 		evs_finalize;
@@ -24,7 +24,6 @@ OPENAIS_EVS_1.0 {
 		saSendReceiveReply;
 		saSendRetry;
 		saServiceConnect;
-		saServiceConnectTwo;
 		saVersionVerify;
 		clustTimeNow;
 };