Send Linux-ha-cvs mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: crm by andrew from
([email protected])
2. Linux-HA CVS: cim by panjiam from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Dec 2005 03:46:40 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
incarnation.c
Log Message:
BEAM Fixes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/incarnation.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- incarnation.c 21 Dec 2005 06:44:11 -0000 1.66
+++ incarnation.c 21 Dec 2005 10:46:39 -0000 1.67
@@ -1,4 +1,4 @@
-/* $Id: incarnation.c,v 1.66 2005/12/21 06:44:11 andrew Exp $ */
+/* $Id: incarnation.c,v 1.67 2005/12/21 10:46:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -992,19 +992,33 @@
clone_expand_reallocate:
if(rsc_list != NULL) {
- crm_malloc0(*rsc_list, sizeof(char)*list_len);
- rsc_list_s = *rsc_list;
- rsc_len = 0;
+ crm_free(*rsc_list);
}
if(node_list != NULL) {
- crm_malloc0(*node_list, sizeof(char)*list_len);
- node_list_s = *node_list;
- node_len = 0;
+ crm_free(*node_list);
}
if(uuid_list != NULL) {
- crm_malloc0(*uuid_list, sizeof(char)*list_len);
- uuid_list_s = *uuid_list;
- uuid_len = 0;
+ crm_free(*uuid_list);
+ }
+
+ crm_malloc0(*rsc_list, sizeof(char)*list_len);
+ CRM_ASSERT(*rsc_list != NULL);
+ rsc_list_s = *rsc_list;
+ rsc_len = 0;
+
+ crm_malloc0(*node_list, sizeof(char)*list_len);
+ CRM_ASSERT(*node_list != NULL);
+ node_list_s = *node_list;
+ node_len = 0;
+
+ crm_malloc0(*uuid_list, sizeof(char)*list_len);
+ CRM_ASSERT(*uuid_list != NULL);
+ uuid_list_s = *uuid_list;
+ uuid_len = 0;
+
+ /* keep BEAM extra happy */
+ if(rsc_list_s == NULL || node_list_s == NULL || uuid_list_s == NULL) {
+ return;
}
slist_iter(entry, notify_entry_t, list, lpc,
@@ -1049,12 +1063,10 @@
goto clone_expand_reallocate;
}
sprintf(rsc_list_s, "%s ", rsc_id);
- if(rsc_list_s != NULL) {
- rsc_list_s += strlen(rsc_id);
- rsc_len += strlen(rsc_id);
- rsc_list_s++;
- rsc_len++;
- }
+ rsc_list_s += strlen(rsc_id);
+ rsc_len += strlen(rsc_id);
+ rsc_list_s++;
+ rsc_len++;
if(node_len + 1 + strlen(uname) >= list_len) {
crm_free(*rsc_list);
@@ -1064,12 +1076,10 @@
goto clone_expand_reallocate;
}
sprintf(node_list_s, "%s ", uname);
- if(node_list_s != NULL) {
- node_list_s += strlen(uname);
- node_len += strlen(uname);
- node_list_s++;
- node_len++;
- }
+ node_list_s += strlen(uname);
+ node_len += strlen(uname);
+ node_list_s++;
+ node_len++;
if(uuid_len + 1 + strlen(uuid) >= list_len) {
crm_free(*rsc_list);
@@ -1079,12 +1089,10 @@
goto clone_expand_reallocate;
}
sprintf(uuid_list_s, "%s ", uuid);
- if(uuid_list_s != NULL) {
- uuid_list_s += strlen(uuid);
- uuid_len += strlen(uuid);
- uuid_list_s++;
- uuid_len++;
- }
+ uuid_list_s += strlen(uuid);
+ uuid_len += strlen(uuid);
+ uuid_list_s++;
+ uuid_len++;
);
}
------------------------------
Message: 2
Date: Wed, 21 Dec 2005 03:51:29 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cim by panjiam from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : panjiam
Host :
Project : linux-ha
Module : cim
Dir : linux-ha/cim
Modified Files:
Makefile.am
Log Message:
updated for new providers
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cim/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Makefile.am 14 Dec 2005 06:08:14 -0000 1.12
+++ Makefile.am 21 Dec 2005 10:51:29 -0000 1.13
@@ -20,12 +20,14 @@
MAINTAINERCLEANFILES = Makefile.in
-## Subdirectories
+# Subdirectories
SUBDIRS = mof
+CMPIHEADERS = $(CMPI_HEADER_PATH)
INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
\
-I$(top_builddir)/linux-ha -I$(top_srcdir)/linux-ha
\
- -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
+ -I$(top_builddir)/libltdl -I$(top_srcdir)/libltdl
\
+ -I$(CMPI_HEADER_PATH)
COMMONLIBS = $(top_builddir)/lib/clplumbing/libplumb.la \
@@ -40,96 +42,97 @@
cimprovidersdir = $(CMPI_PROVIDER_DIR)
-noinst_HEADERS = cmpi_utils.h \
- cmpi_cluster.h \
- cmpi_rsc_group.h \
- cmpi_node.h \
- ha_resource.h \
- cmpi_ha_indication.h \
- linuxha_info.h \
- cmpi_resource.h \
- cmpi_sub_resource.h \
- cmpi_hosted_resource.h
+noinst_HEADERS = assoc_utils.h cluster_info.h cmpi_utils.h \
+ resource_common.h constraint_common.h
-cimproviders_LTLIBRARIES = liblinuxha_info.la
\
- libcmpiLinuxHA_ClusterProvider.la
\
- libcmpiLinuxHA_ClusterResourceProvider.la
\
- libcmpiLinuxHA_ClusterNodeProvider.la
\
- libcmpiLinuxHA_ParticipatingNodeProvider.la
\
- libcmpiLinuxHA_HostedResourceProvider.la
\
- libcmpiLinuxHA_SoftwareIdentityProvider.la
\
- libcmpiLinuxHA_InstalledSoftwareIdentityProvider.la
\
- libcmpiLinuxHA_ClusterResourceInstanceProvider.la
\
-
libcmpiLinuxHA_ClusterResourceInstanceAttrProvider.la\
- libcmpiLinuxHA_ClusterResourceGroupProvider.la
\
- libcmpiLinuxHA_SubResourceProvider.la
\
- libcmpiLinuxHA_IndicationProvider.la
+LRM_DIR = lrm
+MGMTLIBS = $(top_builddir)/mgmt/daemon/libmgmt.la \
+ $(top_builddir)/lib/mgmt/libmgmtcommon.la \
+ $(top_builddir)/lib/$(LRM_DIR)/liblrm.la
+cimproviders_LTLIBRARIES = libHAClusterInfo.la \
+ libHA_ClusterProvider.la \
+ libHA_ClusterNodeProvider.la \
+ libHA_SoftwareIdentityProvider.la \
+ libHA_PrimitiveResourceProvider.la \
+ libHA_ResourceCloneProvider.la \
+ libHA_MasterSlaveResourceProvider.la \
+ libHA_ResourceGroupProvider.la \
+ libHA_LocationConstraintProvider.la \
+ libHA_ColocationConstraintProvider.la \
+ libHA_OrderConstraintProvider.la \
+ libHA_HostedResourceProvider.la \
+ libHA_SubResourceProvider.la \
+ libHA_InstalledSoftwareIdentityProvider.la \
+ libHA_ParticipatingNodeProvider.la \
+ libHA_InstanceAttributesProvider.la \
+ libHA_OperationProvider.la \
+ libHA_ResourceInstanceProvider.la \
+ libHA_OperationOnProvider.la \
+ libHA_IndicationProvider.la
#--------------------------------------------------------------
-liblinuxha_info_la_SOURCES = linuxha_info.c
-liblinuxha_info_la_LIBADD = $(COMMONLIBS)
-
+libHAClusterInfo_la_SOURCES = cluster_info.c
+libHAClusterInfo_la_LIBADD = $(COMMONLIBS) $(MGMTLIBS)
#--------------------------------------------------------------
-libcmpiLinuxHA_ClusterProvider_la_SOURCES = cmpi_utils.c cmpi_cluster.c
cmpi_cluster_provider.c
-libcmpiLinuxHA_ClusterProvider_la_LIBADD = $(COMMONLIBS) liblinuxha_info.la
-
+libHA_ClusterProvider_la_SOURCES = cluster_provider.c
+libHA_ClusterProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_SoftwareIdentityProvider_la_SOURCES = cmpi_utils.c
cmpi_software_identity_provider.c
-libcmpiLinuxHA_SoftwareIdentityProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_SoftwareIdentityProvider_la_SOURCES = software_identity_provider.c
+libHA_SoftwareIdentityProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_ClusterResourceProvider_la_SOURCES = cmpi_utils.c
cmpi_resource.c ha_resource.c \
- cmpi_resource_provider.c
-libcmpiLinuxHA_ClusterResourceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_ClusterNodeProvider_la_SOURCES = cluster_node_provider.c
+libHA_ClusterNodeProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_ClusterNodeProvider_la_SOURCES = cmpi_utils.c cmpi_node.c
cmpi_node_provider.c
-libcmpiLinuxHA_ClusterNodeProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_PrimitiveResourceProvider_la_SOURCES = resource_common.c
primitive_resource_provider.c
+libHA_PrimitiveResourceProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_ParticipatingNodeProvider_la_SOURCES = cmpi_utils.c \
-
cmpi_participating_node_provider.c
-libcmpiLinuxHA_ParticipatingNodeProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
-
+libHA_ResourceCloneProvider_la_SOURCES = resource_common.c
resource_clone_provider.c
+libHA_ResourceCloneProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_HostedResourceProvider_la_SOURCES = cmpi_utils.c
\
- cmpi_hosted_resource.c
\
-
cmpi_hosted_resource_provider.c
-libcmpiLinuxHA_HostedResourceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_MasterSlaveResourceProvider_la_SOURCES= resource_common.c
masterslave_resource_provider.c
+libHA_MasterSlaveResourceProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_SOURCES = cmpi_utils.c \
-
cmpi_installed_software_provider.c
-libcmpiLinuxHA_InstalledSoftwareIdentityProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_ResourceGroupProvider_la_SOURCES = resource_common.c
resource_group_provider.c
+libHA_ResourceGroupProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-
-libcmpiLinuxHA_ClusterResourceInstanceProvider_la_SOURCES = cmpi_utils.c \
-
cmpi_rsc_instance_provider.c
-libcmpiLinuxHA_ClusterResourceInstanceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_ParticipatingNodeProvider_la_SOURCES = assoc_utils.c
participating_node_provider.c
+libHA_ParticipatingNodeProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-
-libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_SOURCES = cmpi_utils.c \
-
cmpi_rsc_attribute_provider.c
-libcmpiLinuxHA_ClusterResourceInstanceAttrProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_HostedResourceProvider_la_SOURCES = assoc_utils.c
hosted_resource_provider.c
+libHA_HostedResourceProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_ClusterResourceGroupProvider_la_SOURCES = cmpi_utils.c
ha_resource.c \
- cmpi_rsc_group.c
\
-
cmpi_rsc_group_provider.c
-libcmpiLinuxHA_ClusterResourceGroupProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
-
+libHA_InstalledSoftwareIdentityProvider_la_SOURCES = assoc_utils.c
installed_software_provider.c
+libHA_InstalledSoftwareIdentityProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_SubResourceProvider_la_SOURCES = cmpi_utils.c
ha_resource.c \
- cmpi_sub_resource.c
\
- cmpi_sub_resource_provider.c
-libcmpiLinuxHA_SubResourceProvider_la_LIBADD = $(COMMONLIBS)
liblinuxha_info.la
+libHA_ResourceInstanceProvider_la_SOURCES = assoc_utils.c
resource_instance_provider.c
+libHA_ResourceInstanceProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
-libcmpiLinuxHA_IndicationProvider_la_SOURCES = cmpi_utils.c
cmpi_ha_indication.c \
- cmpi_ha_indication_provider.c
-libcmpiLinuxHA_IndicationProvider_la_LIBADD = $(COMMONLIBS) liblinuxha_info.la
-
+libHA_InstanceAttributesProvider_la_SOURCES = inst_attribute_provider.c
+libHA_InstanceAttributesProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+libHA_SubResourceProvider_la_SOURCES = assoc_utils.c
sub_resource_provider.c
+libHA_SubResourceProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+libHA_OperationProvider_la_SOURCES = operation_provider.c
+libHA_OperationProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+libHA_LocationConstraintProvider_la_SOURCES = constraint_common.c
location_constraint_provider.c
+libHA_LocationConstraintProvider_la_LIBADD = libHAClusterInfo.la
#--------------------------------------------------------------
+libHA_ColocationConstraintProvider_la_SOURCES = constraint_common.c
colocation_constraint_provider.c
+libHA_ColocationConstraintProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+libHA_OrderConstraintProvider_la_SOURCES = constraint_common.c
order_constraint_provider.c
+libHA_OrderConstraintProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+libHA_IndicationProvider_la_SOURCES = cluster_indication_provider.c
+libHA_IndicationProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+libHA_OperationOnProvider_la_SOURCES = assoc_utils.c
operation_on_provider.c
+libHA_OperationOnProvider_la_LIBADD = libHAClusterInfo.la
+#--------------------------------------------------------------
+noinst_PROGRAMS = simpledemo
+simpledemo_SOURCES = simple_demo.c
+simpledemo_LDADD = libHAClusterInfo.la
+
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 56
********************************************
