Add corotype.h and delete saAis.h

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1690 fd59a12c-fef9-0310-b244-a6a79926bd2f

include/corosync/corotypes.h

@@ -0,0 +1,178 @@
+/*
+ * Copyright (c) 2008 Allied Telesis Labs.
+ *
+ * All rights reserved.
+ *
+ * Author: Angus Salkeld (ahsalkeld@gmail.com)
+ *
+ * This software licensed under BSD license, the text of which follows:
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - Neither the name of the MontaVista Software, Inc. nor the names of its
+ *   contributors may be used to endorse or promote products derived from this
+ *   software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef COROTYPES_H_DEFINED
+#define COROTYPES_H_DEFINED
+
+#ifndef COROSYNC_SOLARIS
+#include <stdint.h>
+#else
+#include <sys/types.h>
+#endif
+
+typedef int64_t cs_time_t;
+
+#define CS_FALSE 0
+#define CS_TRUE !CS_FALSE
+#define CS_MAX_NAME_LENGTH 256
+#define CS_TIME_END    ((cs_time_t)0x7FFFFFFFFFFFFFFFULL)
+
+typedef struct {
+   uint16_t length;
+   uint8_t value[CS_MAX_NAME_LENGTH];
+} cs_name_t;
+
+typedef struct {
+   char releaseCode;
+   unsigned char majorVersion;
+   unsigned char minorVersion;
+} cs_version_t;
+
+typedef enum {
+	CS_DISPATCH_ONE = 1,
+	CS_DISPATCH_ALL = 2,
+	CS_DISPATCH_BLOCKING = 3
+} cs_dispatch_flags_t;
+
+#define CS_TRACK_CURRENT 0x01
+#define CS_TRACK_CHANGES 0x02
+#define CS_TRACK_CHANGES_ONLY 0x04
+
+typedef enum {
+   CS_OK = 1,
+   CS_ERR_LIBRARY = 2,
+   CS_ERR_VERSION = 3,
+   CS_ERR_INIT = 4,
+   CS_ERR_TIMEOUT = 5,
+   CS_ERR_TRY_AGAIN = 6,
+   CS_ERR_INVALID_PARAM = 7,
+   CS_ERR_NO_MEMORY = 8,
+   CS_ERR_BAD_HANDLE = 9,
+   CS_ERR_BUSY = 10,
+   CS_ERR_ACCESS = 11,
+   CS_ERR_NOT_EXIST = 12,
+   CS_ERR_NAME_TOO_LONG = 13,
+   CS_ERR_EXIST = 14,
+   CS_ERR_NO_SPACE = 15,
+   CS_ERR_INTERRUPT = 16,
+   CS_ERR_NAME_NOT_FOUND = 17,
+   CS_ERR_NO_RESOURCES = 18,
+   CS_ERR_NOT_SUPPORTED = 19,
+   CS_ERR_BAD_OPERATION = 20,
+   CS_ERR_FAILED_OPERATION = 21,
+   CS_ERR_MESSAGE_ERROR = 22,
+   CS_ERR_QUEUE_FULL = 23,
+   CS_ERR_QUEUE_NOT_AVAILABLE = 24,
+   CS_ERR_BAD_FLAGS = 25,
+   CS_ERR_TOO_BIG = 26,
+   CS_ERR_NO_SECTIONS = 27,
+   CS_ERR_CONTEXT_NOT_FOUND = 28,
+   CS_ERR_TOO_MANY_GROUPS = 30
+} cs_error_t;
+
+
+/*
+ * DEPRECATED
+ */
+#define EVS_DISPATCH_ONE			CS_DISPATCH_ONE
+#define EVS_DISPATCH_ALL			CS_DISPATCH_ALL
+#define EVS_DISPATCH_BLOCKING		CS_DISPATCH_BLOCKING
+#define EVS_OK						CS_OK
+#define EVS_ERR_LIBRARY				CS_ERR_ERR_LIBRARY
+#define EVS_ERR_TIMEOUT				CS_ERR_TIMEOUT
+#define EVS_ERR_TRY_AGAIN			CS_ERR_TRY_AGAIN
+#define EVS_ERR_INVALID_PARAM		CS_ERR_INVALID_PARAM
+#define EVS_ERR_NO_MEMORY			CS_ERR_NO_MEMORY
+#define EVS_ERR_BAD_HANDLE			CS_ERR_BAD_HANDLE
+#define EVS_ERR_ACCESS				CS_ERR_ACCESS
+#define EVS_ERR_NOT_EXIST			CS_ERR_NOT_EXIST
+#define EVS_ERR_EXIST				CS_ERR_EXIST
+#define EVS_ERR_NOT_SUPPORTED		CS_ERR_NOT_SUPPORTED
+#define EVS_ERR_SECURITY			CS_ERR_SECURITY
+#define EVS_ERR_TOO_MANY_GROUPS		CS_ERR_TOO_MANY_GROUPS
+#define evs_error_t cs_error_t
+
+#define CPG_DISPATCH_ONE			CS_DISPATCH_ONE
+#define CPG_DISPATCH_ALL			CS_DISPATCH_ALL
+#define CPG_DISPATCH_BLOCKING		CS_DISPATCH_BLOCKING
+#define CPG_OK						CS_OK
+#define CPG_ERR_LIBRARY				CS_ERR_ERR_LIBRARY
+#define CPG_ERR_TIMEOUT				CS_ERR_TIMEOUT
+#define CPG_ERR_TRY_AGAIN			CS_ERR_TRY_AGAIN
+#define CPG_ERR_INVALID_PARAM		CS_ERR_INVALID_PARAM
+#define CPG_ERR_NO_MEMORY			CS_ERR_NO_MEMORY
+#define CPG_ERR_BAD_HANDLE			CS_ERR_BAD_HANDLE
+#define CPG_ERR_ACCESS				CS_ERR_ACCESS
+#define CPG_ERR_NOT_EXIST			CS_ERR_NOT_EXIST
+#define CPG_ERR_EXIST				CS_ERR_EXIST
+#define CPG_ERR_NOT_SUPPORTED		CS_ERR_NOT_SUPPORTED
+#define CPG_ERR_SECURITY			CS_ERR_SECURITY
+#define cpg_error_t cs_error_t
+
+#define CONFDB_DISPATCH_ONE			CS_DISPATCH_ONE
+#define CONFDB_DISPATCH_ALL			CS_DISPATCH_ALL
+#define CONFDB_DISPATCH_BLOCKING	CS_DISPATCH_BLOCKING
+#define CONFDB_OK					CS_OK
+#define CONFDB_ERR_LIBRARY			CS_ERR_ERR_LIBRARY
+#define CONFDB_ERR_TIMEOUT			CS_ERR_TIMEOUT
+#define CONFDB_ERR_TRY_AGAIN		CS_ERR_TRY_AGAIN
+#define CONFDB_ERR_INVALID_PARAM	CS_ERR_INVALID_PARAM
+#define CONFDB_ERR_NO_MEMORY		CS_ERR_NO_MEMORY
+#define CONFDB_ERR_BAD_HANDLE		CS_ERR_BAD_HANDLE
+#define CONFDB_ERR_ACCESS			CS_ERR_ACCESS
+#define CONFDB_ERR_NOT_EXIST		CS_ERR_NOT_EXIST
+#define CONFDB_ERR_EXIST			CS_ERR_EXIST
+#define CONFDB_ERR_NOT_SUPPORTED	CS_ERR_NOT_SUPPORTED
+#define CONFDB_ERR_SECURITY			CS_ERR_SECURITY
+#define confdb_error_t cs_error_t
+
+#define QUORUM_DISPATCH_ONE			CS_DISPATCH_ONE
+#define QUORUM_DISPATCH_ALL			CS_DISPATCH_ALL
+#define QUORUM_DISPATCH_BLOCKING	CS_DISPATCH_BLOCKING
+#define QUORUM_OK					CS_OK
+#define QUORUM_ERR_LIBRARY			CS_ERR_ERR_LIBRARY
+#define QUORUM_ERR_TIMEOUT			CS_ERR_TIMEOUT
+#define QUORUM_ERR_TRY_AGAIN		CS_ERR_TRY_AGAIN
+#define QUORUM_ERR_INVALID_PARAM	CS_ERR_INVALID_PARAM
+#define QUORUM_ERR_NO_MEMORY		CS_ERR_NO_MEMORY
+#define QUORUM_ERR_BAD_HANDLE		CS_ERR_BAD_HANDLE
+#define QUORUM_ERR_ACCESS			CS_ERR_ACCESS
+#define QUORUM_ERR_NOT_EXIST		CS_ERR_NOT_EXIST
+#define QUORUM_ERR_EXIST			CS_ERR_EXIST
+#define QUORUM_ERR_NOT_SUPPORTED	CS_ERR_NOT_SUPPORTED
+#define QUORUM_ERR_SECURITY			CS_ERR_SECURITY
+#define quorum_error_t cs_error_t
+
+#endif
+

include/corosync/saAis.h

@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2002-2003 MontaVista Software, Inc.
- * Copyright (c) 2006-2008 Red Hat, Inc.
- *
- * All rights reserved.
- *
- * Author: Steven Dake (sdake@redhat.com)
- *
- * This software licensed under BSD license, the text of which follows:
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * - Redistributions of source code must retain the above copyright notice,
- *   this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright notice,
- *   this list of conditions and the following disclaimer in the documentation
- *   and/or other materials provided with the distribution.
- * - Neither the name of the MontaVista Software, Inc. nor the names of its
- *   contributors may be used to endorse or promote products derived from this
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef AIS_TYPES_H_DEFINED
-#define AIS_TYPES_H_DEFINED
-
-/**
- * @defgroup saf Service Availability Forum Application Interface Specification
- */
-
-typedef enum {
-	SA_FALSE = 0,
-	SA_TRUE = 1
-} SaBoolT;
-
-#ifndef COROSYNC_SOLARIS
-#include <stdint.h>
-#else
-#include <sys/types.h>
-#endif
-
-typedef int8_t SaInt8T;
-typedef int16_t SaInt16T;
-typedef int32_t SaInt32T;
-typedef int64_t SaInt64T;
-
-typedef uint8_t SaUint8T;
-typedef uint16_t SaUint16T;
-typedef uint32_t SaUint32T;
-typedef uint64_t SaUint64T;
-
-typedef float SaFloatT;
-typedef double SaDoubleT;
-typedef char * SaStringT;
-typedef SaInt64T SaTimeT;
-
-#define SA_TIME_END    ((SaTimeT)0x7FFFFFFFFFFFFFFFULL)
-#define SA_TIME_BEGIN            0x0ULL
-#define SA_TIME_UNKNOWN          0x8000000000000000ULL
-
-#define SA_TIME_ONE_MICROSECOND 1000ULL
-#define SA_TIME_ONE_MILLISECOND 1000000ULL
-#define SA_TIME_ONE_SECOND      1000000000ULL
-#define SA_TIME_ONE_MINUTE      60000000000ULL
-#define SA_TIME_ONE_HOUR        3600000000000ULL
-#define SA_TIME_ONE_DAY         86400000000000ULL
-#define SA_TIME_MAX             SA_TIME_END
-
-#define SA_MAX_NAME_LENGTH 256
-
-typedef struct {
-	SaUint16T length;
-	SaUint8T value[SA_MAX_NAME_LENGTH];
-} SaNameT;
-
-typedef struct {
-	char releaseCode;
-	unsigned char majorVersion;
-	unsigned char minorVersion;
-} SaVersionT;
-
-typedef SaUint64T SaNtfIdentifierT;
-
-#define SA_TRACK_CURRENT 0x01
-#define SA_TRACK_CHANGES 0x02
-#define SA_TRACK_CHANGES_ONLY 0x04
-
-typedef enum {
-	SA_DISPATCH_ONE = 1,
-	SA_DISPATCH_ALL = 2,
-	SA_DISPATCH_BLOCKING = 3
-} SaDispatchFlagsT;
-
-typedef enum {
-	SA_AIS_OK = 1,
-	SA_AIS_ERR_LIBRARY = 2,
-	SA_AIS_ERR_VERSION = 3,
-	SA_AIS_ERR_INIT = 4,
-	SA_AIS_ERR_TIMEOUT = 5,
-	SA_AIS_ERR_TRY_AGAIN = 6,
-	SA_AIS_ERR_INVALID_PARAM = 7,
-	SA_AIS_ERR_NO_MEMORY = 8,
-	SA_AIS_ERR_BAD_HANDLE = 9,
-	SA_AIS_ERR_BUSY = 10,
-	SA_AIS_ERR_ACCESS = 11,
-	SA_AIS_ERR_NOT_EXIST = 12,
-	SA_AIS_ERR_NAME_TOO_LONG = 13,
-	SA_AIS_ERR_EXIST = 14,
-	SA_AIS_ERR_NO_SPACE = 15,
-	SA_AIS_ERR_INTERRUPT = 16,
-	SA_AIS_ERR_NAME_NOT_FOUND = 17,
-	SA_AIS_ERR_NO_RESOURCES = 18,
-	SA_AIS_ERR_NOT_SUPPORTED = 19,
-	SA_AIS_ERR_BAD_OPERATION = 20,
-	SA_AIS_ERR_FAILED_OPERATION = 21,
-	SA_AIS_ERR_MESSAGE_ERROR = 22,
-	SA_AIS_ERR_QUEUE_FULL = 23,
-	SA_AIS_ERR_QUEUE_NOT_AVAILABLE = 24,
-	SA_AIS_ERR_BAD_FLAGS = 25,
-	SA_AIS_ERR_TOO_BIG = 26,
-	SA_AIS_ERR_NO_SECTIONS = 27
-} SaAisErrorT;
-
-typedef union {
-	SaInt64T int64Value;
-	SaUint64T uint64Value;
-	SaTimeT timeValue;
-	SaFloatT floatValue;
-	SaDoubleT doubleValue;
-} SaLimitValueT;
-
-typedef SaUint64T SaSelectionObjectT;
-
-typedef SaUint64T SaInvocationT;
-
-typedef SaUint64T SaSizeT;
-
-#define SA_HANDLE_INVALID 0x0ULL
-
-#endif /* AIS_TYPES_H_DEFINED */