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

Improve runtime loading of parser and move versions files to corosync.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1608 fd59a12c-fef9-0310-b244-a6a79926bd2f
Steven Dake 17 лет назад
Родитель
Сommit
273d4d6197
5 измененных файлов с 3 добавлено и 85 удалено
  1. 1 1
      corosync/exec/coroparse.c
  2. 2 2
      corosync/exec/main.c
  3. 0 13
      corosync/exec/util.c
  4. 0 28
      corosync/lib/libSaClm.versions
  5. 0 41
      corosync/lib/libSaMsg.versions

+ 1 - 1
corosync/exec/coroparse.c

@@ -191,7 +191,7 @@ struct config_iface_ver0 aisparser_iface_ver0 = {
 
 
 struct lcr_iface openais_aisparser_ver0[1] = {
 struct lcr_iface openais_aisparser_ver0[1] = {
 	{
 	{
-		.name				= "aisparser",
+		.name				= "corosync_parser",
 		.version			= 0,
 		.version			= 0,
 		.versions_replace		= 0,
 		.versions_replace		= 0,
 		.versions_replace_count		= 0,
 		.versions_replace_count		= 0,

+ 2 - 2
corosync/exec/main.c

@@ -575,9 +575,9 @@ int main (int argc, char **argv)
 	 * the openais default built in parser if the configuration parser
 	 * the openais default built in parser if the configuration parser
 	 * isn't overridden
 	 * isn't overridden
 	 */
 	 */
-	config_iface = getenv("OPENAIS_DEFAULT_CONFIG_IFACE");
+	config_iface = getenv("COROSYNC_DEFAULT_CONFIG_IFACE");
 	if (!config_iface) {
 	if (!config_iface) {
-		config_iface = "aisparser";
+		config_iface = "corosync_parser";
 	}
 	}
 
 
 	/* Make a copy so we can deface it with strtok */
 	/* Make a copy so we can deface it with strtok */

+ 0 - 13
corosync/exec/util.c

@@ -58,15 +58,6 @@ int name_match(SaNameT *name1, SaNameT *name2)
 	return 0;
 	return 0;
 }
 }
 
 
-int mar_name_match(mar_name_t *name1, mar_name_t *name2) 
-{
-	if (name1->length == name2->length) {
-		return ((strncmp ((char *)name1->value, (char *)name2->value,
-			name1->length)) == 0);
-	} 
-	return 0;
-}
-
 /*
 /*
  * Get the time of day and convert to nanoseconds
  * Get the time of day and convert to nanoseconds
  */
  */
@@ -113,10 +104,6 @@ char *getSaNameT (SaNameT *name)
 	return ((char *)name->value);
 	return ((char *)name->value);
 }
 }
 
 
-char *get_mar_name_t (mar_name_t *name) {
-	return ((char *)name->value);
-}
-
 char *strstr_rs (const char *haystack, const char *needle)
 char *strstr_rs (const char *haystack, const char *needle)
 {
 {
 	char *end_address;
 	char *end_address;

+ 0 - 28
corosync/lib/libSaClm.versions

@@ -1,28 +0,0 @@
-# Version and symbol export for libSaClm.so
-
-OPENAIS_CLM_B.01.01 {
-	global:
-		saClmInitialize;
-		saClmSelectionObjectGet;
-		saClmDispatch;
-		saClmFinalize;
-		saClmClusterTrack;
-		saClmClusterTrackStop;
-		saClmClusterNodeGet;
-		saClmClusterNodeGetAsync;
-
-	local:
-		saHandleCreate;
-		saHandleDestroy;
-		saHandleInstanceGet;
-		saHandleInstancePut;
-		saPollRetry;
-		saRecvRetry;
-		saSendMsgReceiveReply;
-		saSendMsgRetry;
-		saSendReceiveReply;
-		saSendRetry;
-		saServiceConnect;
-		saVersionVerify;
-		clustTimeNow;
-};

+ 0 - 41
corosync/lib/libSaMsg.versions

@@ -1,41 +0,0 @@
-# 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;
-};