Page MenuHomeClusterLabs Projects
Files F3152142

No OneTemporary
Actions

View Options

diff --git a/common_lib/error_conversion.c b/common_lib/error_conversion.c
index 66a84e0c..9e112d18 100644
--- a/common_lib/error_conversion.c
+++ b/common_lib/error_conversion.c
@@ -1,114 +1,131 @@
/*
* Copyright (c) 2008 Allied Telesis Labs.
* Copyright (c) 2012 Red Hat, Inc.
*
* All rights reserved.
*
* Author: Angus Salkeld (asalkeld@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.
*/
#include <corosync/corotypes.h>
cs_error_t qb_to_cs_error (int result)
{
int32_t res;
cs_error_t err = CS_ERR_LIBRARY;
if (result >= 0) {
return CS_OK;
}
res = -result;
switch (res) {
case EBADF:
err = CS_ERR_BAD_HANDLE;
break;
case ENOMEM:
err = CS_ERR_NO_MEMORY;
break;
case ETIMEDOUT:
case EAGAIN:
err = CS_ERR_TRY_AGAIN;
break;
case EBADE:
err = CS_ERR_FAILED_OPERATION;
break;
case ETIME:
err = CS_ERR_TIMEOUT;
break;
case EINVAL:
err = CS_ERR_INVALID_PARAM;
break;
case EBUSY:
err = CS_ERR_BUSY;
break;
case EACCES:
err = CS_ERR_ACCESS;
break;
case EOVERFLOW:
err = CS_ERR_NAME_TOO_LONG;
break;
case EEXIST:
err = CS_ERR_EXIST;
break;
case ENOBUFS:
err = CS_ERR_QUEUE_FULL;
break;
case ENOSPC:
err = CS_ERR_NO_SPACE;
break;
case EINTR:
err = CS_ERR_INTERRUPT;
break;
case ENOENT:
case ENODEV:
err = CS_ERR_NOT_EXIST;
break;
case ENOSYS:
case ENOTSUP:
err = CS_ERR_NOT_SUPPORTED;
break;
case EBADMSG:
err = CS_ERR_MESSAGE_ERROR;
break;
case EMSGSIZE:
case E2BIG:
err = CS_ERR_TOO_BIG;
break;
case ECONNREFUSED:
case ENOTCONN:
default:
err = CS_ERR_LIBRARY;
break;
}
return err;
}
+cs_error_t hdb_error_to_cs (int res)
+{
+ if (res == 0) {
+ return (CS_OK);
+ } else {
+ if (res == -EBADF) {
+ return (CS_ERR_BAD_HANDLE);
+ } else if (res == -ENOMEM) {
+ return (CS_ERR_NO_MEMORY);
+ } else if (res == -EMFILE) {
+ return (CS_ERR_NO_RESOURCES);
+ } else if (res == -EACCES) {
+ return (CS_ERR_ACCESS);
+ }
+ return (CS_ERR_LIBRARY);
+ }
+}
diff --git a/exec/util.h b/exec/util.h
index 78777eda..9f418bb3 100644
--- a/exec/util.h
+++ b/exec/util.h
@@ -1,108 +1,89 @@
/*
* Copyright (c) 2002-2004 MontaVista Software, Inc.
* Copyright (c) 2004 Open Source Development Lab
*
* All rights reserved.
*
* Author: Steven Dake (sdake@redhat.com), Mark Haverkamp (markh@osdl.org)
*
* 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 UTIL_H_DEFINED
#define UTIL_H_DEFINED
#include <sys/time.h>
#include <corosync/corotypes.h>
/**
* Get the time of day and convert to nanoseconds
*/
extern cs_time_t clust_time_now(void);
enum e_corosync_done {
COROSYNC_DONE_EXIT = 0,
COROSYNC_DONE_UID_DETERMINE = 1,
COROSYNC_DONE_GID_DETERMINE = 2,
COROSYNC_DONE_MEMPOOL_INIT = 3,
COROSYNC_DONE_FORK = 4,
COROSYNC_DONE_LIBCOROSYNC_SOCKET = 5,
COROSYNC_DONE_LIBCOROSYNC_BIND = 6,
COROSYNC_DONE_READKEY = 7,
COROSYNC_DONE_MAINCONFIGREAD = 8,
COROSYNC_DONE_LOGSETUP = 9,
COROSYNC_DONE_AMFCONFIGREAD = 10,
COROSYNC_DONE_DYNAMICLOAD = 11,
COROSYNC_DONE_OBJDB = 12,
COROSYNC_DONE_INIT_SERVICES = 13,
COROSYNC_DONE_OUT_OF_MEMORY = 14,
COROSYNC_DONE_FATAL_ERR = 15,
COROSYNC_DONE_DIR_NOT_PRESENT = 16,
COROSYNC_DONE_AQUIRE_LOCK = 17,
COROSYNC_DONE_ALREADY_RUNNING = 18,
COROSYNC_DONE_STD_TO_NULL_REDIR = 19,
COROSYNC_DONE_SERVICE_ENGINE_INIT = 20
};
-static inline cs_error_t hdb_error_to_cs (int res) \
-{ \
- if (res == 0) { \
- return (CS_OK); \
- } else { \
- if (res == -EBADF) { \
- return (CS_ERR_BAD_HANDLE); \
- } else \
- if (res == -ENOMEM) { \
- return (CS_ERR_NO_MEMORY); \
- } else \
- if (res == -EMFILE) { \
- return (CS_ERR_NO_RESOURCES); \
- } else \
- if (res == -EACCES) { \
- return (CS_ERR_ACCESS); \
- } \
- return (CS_ERR_LIBRARY); \
- } \
-}
+cs_error_t hdb_error_to_cs (int res);
/**
* Compare two names. returns non-zero on match.
*/
extern int name_match(cs_name_t *name1, cs_name_t *name2);
#define corosync_exit_error(err) _corosync_exit_error ((err), __FILE__, __LINE__)
extern void _corosync_exit_error (enum e_corosync_done err, const char *file,
unsigned int line) __attribute__((noreturn));
void _corosync_out_of_memory_error (void) __attribute__((noreturn));
extern char *getcs_name_t (cs_name_t *name);
extern void setcs_name_t (cs_name_t *name, char *str);
extern int cs_name_tisEqual (cs_name_t *str1, char *str2);
/**
* Get the short name of a service from the service_id.
*/
const char * short_service_name_get(uint32_t service_id,
char *buf, size_t buf_size);
#endif /* UTIL_H_DEFINED */
diff --git a/lib/util.h b/lib/util.h
index 1d812fa5..fd8e4842 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -1,53 +1,53 @@
/*
* Copyright (c) 2002-2003 MontaVista Software, 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 COROSYNC_UTIL_H_DEFINED
#define COROSYNC_UTIL_H_DEFINED
#include <corosync/corotypes.h>
-#define hdb_error_to_cs(_result_) qb_to_cs_error(_result_)
+cs_error_t hdb_error_to_cs (int res);
#ifdef HAVE_SMALL_MEMORY_FOOTPRINT
#define IPC_REQUEST_SIZE 1024*64
#define IPC_RESPONSE_SIZE 1024*64
#define IPC_DISPATCH_SIZE 1024*64
#else
#define IPC_REQUEST_SIZE 8192*128
#define IPC_RESPONSE_SIZE 8192*128
#define IPC_DISPATCH_SIZE 8192*128
#endif /* HAVE_SMALL_MEMORY_FOOTPRINT */
#endif /* COROSYNC_UTIL_H_DEFINED */

File Metadata

Mime Type
text/x-diff
Expires
Mon, Feb 24, 4:37 PM (25 m, 8 s ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1464345
Default Alt Text
(10 KB)

Event Timeline