[Debian-ha-svn-commits] [SCM] openais Debian packaging branch, experimental, updated. debian/1.1.3-1
Guido Günther
agx at sigxcpu.org
Fri Aug 13 15:13:23 UTC 2010
The following commit has been merged in the experimental branch:
commit 04c21f437a87e12fdd4f83cbc90a0ff773bf1c51
Author: Guido Günther <agx at sigxcpu.org>
Date: Fri Aug 13 16:44:38 2010 +0200
New upstream version 1.1.3
diff --git a/CHANGELOG b/CHANGELOG
index e35685c..f1f0717 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,87 @@
------------------------------------------------------------------------
+r2141 | rohara | 2010-05-19 11:56:31 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2140
+r2140 | rohara | 2010-05-19 11:53:01 -0500 (Wed, 19 May 2010) | 3 lines
+
+bump trunk version to 1.1.3
+
+
+------------------------------------------------------------------------
+r2139 | rohara | 2010-05-19 11:39:58 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2138
+r2138 | rohara | 2010-05-19 11:38:07 -0500 (Wed, 19 May 2010) | 3 lines
+
+Change spec file macro _initddir to _initrddir.
+
+
+------------------------------------------------------------------------
+r2137 | rohara | 2010-05-19 11:33:56 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2126
+r2126 | rohara | 2010-04-26 11:32:40 -0500 (Mon, 26 Apr 2010) | 4 lines
+
+Only print section info in ckpt_dump_fn if DEBUG is enabled.
+
+
+------------------------------------------------------------------------
+r2136 | rohara | 2010-05-19 11:32:21 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2125
+r2125 | rohara | 2010-04-26 09:20:58 -0500 (Mon, 26 Apr 2010) | 4 lines
+
+Fix sleep time to be 10 msec.
+
+
+------------------------------------------------------------------------
+r2135 | rohara | 2010-05-19 11:30:58 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2124
+r2124 | asalkeld | 2010-03-24 17:19:23 -0500 (Wed, 24 Mar 2010) | 2 lines
+
+Fix saMsg so version bump (make install broke).
+
+
+------------------------------------------------------------------------
+r2134 | rohara | 2010-05-19 11:30:14 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2123
+r2123 | asalkeld | 2010-03-23 22:01:57 -0500 (Tue, 23 Mar 2010) | 2 lines
+
+bump the SaMsg library version to 4.0.0
+
+
+------------------------------------------------------------------------
+r2133 | rohara | 2010-05-19 11:28:29 -0500 (Wed, 19 May 2010) | 8 lines
+
+Merge trunk revision 2120
+r2120 | rohara | 2010-02-17 14:17:52 -0600 (Wed, 17 Feb 2010) | 6 lines
+
+Fix behavior of callback associated with saMsgQueueOpenAsync.
+- Return the queue_id as part of callback message.
+- Add queueInstance to list when callback is processed.
+
+
+------------------------------------------------------------------------
+r2132 | rohara | 2010-05-19 11:24:58 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2119
+r2119 | rohara | 2010-02-06 16:36:35 -0600 (Sat, 06 Feb 2010) | 2 lines
+
+Fix marshalling code for queue capacity threshold arrays.
+
+
+------------------------------------------------------------------------
+r2131 | rohara | 2010-05-19 11:21:53 -0500 (Wed, 19 May 2010) | 6 lines
+
+Merge trunk revision 2118
+r2118 | rohara | 2010-02-06 16:35:11 -0600 (Sat, 06 Feb 2010) | 2 lines
+
+Fix names of API calls for queue capacity thresholds set/get.
+
+
+------------------------------------------------------------------------
r2115 | rohara | 2010-01-26 11:41:45 -0600 (Tue, 26 Jan 2010) | 5 lines
Merge trunk revision 2093
diff --git a/Makefile.in b/Makefile.in
index a542214..20a4591 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -197,6 +197,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
diff --git a/configure b/configure
index 83fb924..8801c8d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for openais 1.1.2.
+# Generated by GNU Autoconf 2.63 for openais 1.1.3.
#
# Report bugs to <openais at lists.osdl.org>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='openais'
PACKAGE_TARNAME='openais'
-PACKAGE_VERSION='1.1.2'
-PACKAGE_STRING='openais 1.1.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='openais 1.1.3'
PACKAGE_BUGREPORT='openais at lists.osdl.org'
ac_unique_file="lib/clm.c"
@@ -651,6 +651,8 @@ BUILD_SOLARIS_TRUE
BUILD_DARWIN_FALSE
BUILD_DARWIN_TRUE
OS_DYFLAGS
+MSG_SOMAJOR
+MSG_SONAME
SONAME
SOMICRO
SOMINOR
@@ -1331,7 +1333,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures openais 1.1.2 to adapt to many kinds of systems.
+\`configure' configures openais 1.1.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1401,7 +1403,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of openais 1.1.2:";;
+ short | recursive ) echo "Configuration of openais 1.1.3:";;
esac
cat <<\_ACEOF
@@ -1506,7 +1508,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-openais configure 1.1.2
+openais configure 1.1.3
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1520,7 +1522,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by openais $as_me 1.1.2, which was
+It was created by openais $as_me 1.1.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2369,7 +2371,7 @@ fi
# Define the identity of the package.
PACKAGE='openais'
- VERSION='1.1.2'
+ VERSION='1.1.3'
cat >>confdefs.h <<_ACEOF
@@ -10446,6 +10448,9 @@ SOMAJOR="3"
SOMINOR="0"
SOMICRO="0"
SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"
+# Special for libSaMsg
+MSG_SOMAJOR="4"
+MSG_SONAME="${MSG_SOMAJOR}.${SOMINOR}.${SOMICRO}"
# local options
# Check whether --enable-fatal-warnings was given.
@@ -10653,6 +10658,8 @@ LDFLAGS="$ENV_LDFLAGS $COVERAGE_LDFLAGS $OS_LDFLAGS"
+
+
if test -n "${DARWIN_OPTS}"; then
BUILD_DARWIN_TRUE=
BUILD_DARWIN_FALSE='#'
@@ -11164,7 +11171,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by openais $as_me 1.1.2, which was
+This file was extended by openais $as_me 1.1.3, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11231,7 +11238,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-openais config.status 1.1.2
+openais config.status 1.1.3
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -12271,6 +12278,8 @@ $as_echo "" >&6; }
$as_echo "$PACKAGE build info:" >&6; }
{ $as_echo "$as_me:$LINENO: result: Library SONAME = ${SONAME}" >&5
$as_echo " Library SONAME = ${SONAME}" >&6; }
+{ $as_echo "$as_me:$LINENO: result: MSG Library SONAME = ${MSG_SONAME}" >&5
+$as_echo " MSG Library SONAME = ${MSG_SONAME}" >&6; }
{ $as_echo "$as_me:$LINENO: result: Default optimization = ${OPT_CFLAGS}" >&5
$as_echo " Default optimization = ${OPT_CFLAGS}" >&6; }
{ $as_echo "$as_me:$LINENO: result: Default debug options = ${GDB_CFLAGS}" >&5
diff --git a/configure.ac b/configure.ac
index 32cf293..8a9f361 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
# bootstrap / init
AC_PREREQ([2.61])
-AC_INIT([openais], [1.1.2], [openais at lists.osdl.org])
+AC_INIT([openais], [1.1.3], [openais at lists.osdl.org])
AM_INIT_AUTOMAKE([-Wno-portability])
AC_CONFIG_SRCDIR([lib/clm.c])
@@ -156,6 +156,9 @@ SOMAJOR="3"
SOMINOR="0"
SOMICRO="0"
SONAME="${SOMAJOR}.${SOMINOR}.${SOMICRO}"
+# Special for libSaMsg
+MSG_SOMAJOR="4"
+MSG_SONAME="${MSG_SOMAJOR}.${SOMINOR}.${SOMICRO}"
# local options
AC_ARG_ENABLE([fatal-warnings],
@@ -323,6 +326,8 @@ AC_SUBST([SOMAJOR])
AC_SUBST([SOMINOR])
AC_SUBST([SOMICRO])
AC_SUBST([SONAME])
+AC_SUBST([MSG_SONAME])
+AC_SUBST([MSG_SOMAJOR])
AC_SUBST([OS_DYFLAGS])
@@ -363,6 +368,7 @@ AC_MSG_RESULT([ Features = ${PACKAGE_FEATURES}])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE build info:])
AC_MSG_RESULT([ Library SONAME = ${SONAME}])
+AC_MSG_RESULT([ MSG Library SONAME = ${MSG_SONAME}])
AC_MSG_RESULT([ Default optimization = ${OPT_CFLAGS}])
AC_MSG_RESULT([ Default debug options = ${GDB_CFLAGS}])
AC_MSG_RESULT([ Extra compiler warnings = ${EXTRA_WARNING}])
diff --git a/include/Makefile.in b/include/Makefile.in
index 8395b18..6958660 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -132,6 +132,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
diff --git a/include/ipc_msg.h b/include/ipc_msg.h
index dbf4d02..049a1af 100644
--- a/include/ipc_msg.h
+++ b/include/ipc_msg.h
@@ -62,8 +62,8 @@ enum req_lib_msg_queue_types {
MESSAGE_REQ_MSG_MESSAGESENDRECEIVE = 18,
MESSAGE_REQ_MSG_MESSAGEREPLY = 19,
MESSAGE_REQ_MSG_MESSAGEREPLYASYNC = 20,
- MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDSET = 21,
- MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDGET = 22,
+ MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDSSET = 21,
+ MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDSGET = 22,
MESSAGE_REQ_MSG_METADATASIZEGET = 23,
MESSAGE_REQ_MSG_LIMITGET = 24
};
@@ -90,8 +90,8 @@ enum res_lib_msg_queue_types {
MESSAGE_RES_MSG_MESSAGESENDRECEIVE = 18,
MESSAGE_RES_MSG_MESSAGEREPLY = 19,
MESSAGE_RES_MSG_MESSAGEREPLYASYNC = 20,
- MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDSET = 21,
- MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDGET = 22,
+ MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDSSET = 21,
+ MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDSGET = 22,
MESSAGE_RES_MSG_METADATASIZEGET = 23,
MESSAGE_RES_MSG_LIMITGET = 24,
MESSAGE_RES_MSG_QUEUEOPEN_CALLBACK = 25,
@@ -141,7 +141,6 @@ struct req_lib_msg_queueopenasync {
struct res_lib_msg_queueopenasync {
coroipc_response_header_t header __attribute__((aligned(8)));
- mar_uint32_t queue_id __attribute__((aligned(8)));
} __attribute__((aligned(8)));
struct req_lib_msg_queueclose {
@@ -348,24 +347,24 @@ struct res_lib_msg_messagereplyasync {
coroipc_response_header_t header __attribute__((aligned(8)));
} __attribute__((aligned(8)));
-struct req_lib_msg_queuecapacitythresholdset {
+struct req_lib_msg_queuecapacitythresholdsset {
coroipc_request_header_t header __attribute__((aligned(8)));
mar_name_t queue_name __attribute__((aligned(8)));
mar_uint32_t queue_id __attribute__((aligned(8)));
mar_msg_queue_thresholds_t thresholds __attribute__((aligned(8)));
} __attribute__((aligned(8)));
-struct res_lib_msg_queuecapacitythresholdset {
+struct res_lib_msg_queuecapacitythresholdsset {
coroipc_response_header_t header __attribute__((aligned(8)));
} __attribute__((aligned(8)));
-struct req_lib_msg_queuecapacitythresholdget {
+struct req_lib_msg_queuecapacitythresholdsget {
coroipc_request_header_t header __attribute__((aligned(8)));
mar_name_t queue_name __attribute__((aligned(8)));
mar_uint32_t queue_id __attribute__((aligned(8)));
} __attribute__((aligned(8)));
-struct res_lib_msg_queuecapacitythresholdget {
+struct res_lib_msg_queuecapacitythresholdsget {
coroipc_response_header_t header __attribute__((aligned(8)));
mar_msg_queue_thresholds_t thresholds __attribute__((aligned(8)));
} __attribute__((aligned(8)));
@@ -392,6 +391,7 @@ struct res_lib_msg_queueopen_callback {
coroipc_response_header_t header __attribute__((aligned(8)));
mar_msg_queue_handle_t queue_handle __attribute__((aligned(8)));
mar_invocation_t invocation __attribute__((aligned(8)));
+ mar_uint32_t queue_id __attribute__((aligned(8)));
} __attribute__((aligned(8)));
struct res_lib_msg_queuegrouptrack_callback {
diff --git a/include/mar_msg.h b/include/mar_msg.h
index ebebcff..b06f366 100644
--- a/include/mar_msg.h
+++ b/include/mar_msg.h
@@ -368,7 +368,7 @@ static inline void swab_mar_msg_queue_thresholds_t (
{
int i;
- for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i < SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
+ for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i <= SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
swab_mar_size_t (&to_swab->capacity_reached[i]);
swab_mar_size_t (&to_swab->capacity_available[i]);
}
@@ -380,7 +380,7 @@ static inline void marshall_from_mar_msg_queue_thresholds_t (
{
int i;
- for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i < SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
+ for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i <= SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
dst->capacityReached[i] = src->capacity_reached[i];
dst->capacityAvailable[i] = src->capacity_available[i];
}
@@ -392,7 +392,7 @@ static inline void marshall_to_mar_msg_queue_thresholds_t (
{
int i;
- for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i < SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
+ for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i <= SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
dst->capacity_reached[i] = src->capacityReached[i];
dst->capacity_available[i] = src->capacityAvailable[i];
}
diff --git a/include/saMsg.h b/include/saMsg.h
index 2ab96aa..a3adea7 100644
--- a/include/saMsg.h
+++ b/include/saMsg.h
@@ -324,12 +324,12 @@ saMsgMessageReplyAsync (
SaMsgAckFlagsT ackFlags);
SaAisErrorT
-saMsgQueueCapacityThresholdSet (
+saMsgQueueCapacityThresholdsSet (
SaMsgQueueHandleT queueHandle,
const SaMsgQueueThresholdsT *thresholds);
SaAisErrorT
-saMsgQueueCapacityThresholdGet (
+saMsgQueueCapacityThresholdsGet (
SaMsgQueueHandleT queueHandle,
SaMsgQueueThresholdsT *thresholds);
diff --git a/init/Makefile.in b/init/Makefile.in
index c7a7566..06f5b54 100644
--- a/init/Makefile.in
+++ b/init/Makefile.in
@@ -121,6 +121,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 02dd8df..d13e865 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -40,9 +40,11 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
lib_LIBRARIES = libSaAmf.a libSaCkpt.a libSaClm.a libSaEvt.a \
libSaLck.a libSaMsg.a libSaTmr.a
-SHARED_LIBS = $(lib_LIBRARIES:%.a=%.so.$(SONAME))
+LIBS_BASE_GENERAL = $(filter-out libSaMsg,$(basename $(lib_LIBRARIES)))
+SHARED_LIBS = $(addsuffix .so.$(SONAME),$(LIBS_BASE_GENERAL)) \
+ $(addsuffix .so.$(MSG_SONAME),libSaMsg)
SHARED_LIBS_SO = $(lib_LIBRARIES:%.a=%.so)
-SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
+SHARED_LIBS_SO_TWO = $(addsuffix .so.$(SOMAJOR),$(LIBS_BASE_GENERAL)) libSaMsg.so.$(MSG_SOMAJOR)
libSaAmf_a_SOURCES = util.c amf.c
libSaCkpt_a_SOURCES = util.c ckpt.c
@@ -70,7 +72,7 @@ libSaEvt.so.$(SONAME): util.o evt.o
libSaLck.so.$(SONAME): util.o lck.o
$(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
libSaTmr.so.$(SONAME): util.o tmr.o
@@ -95,7 +97,7 @@ libSaEvt.so.$(SONAME): util.o evt.o
libSaLck.so.$(SONAME): util.o lck.o
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
libSaTmr.so.$(SONAME): util.o tmr.o
@@ -143,13 +145,13 @@ libSaLck.so.$(SONAME): util.o lck.o
ln -sf libSaLck.so.$(SONAME) libSaLck.so
ln -sf libSaLck.so.$(SONAME) libSaLck.so.$(SOMAJOR)
-libSaMsg.so.$(SONAME): util.o msg.o
+libSaMsg.so.$(MSG_SONAME): util.o msg.o
$(CC) -shared -o $@ \
- -Wl,-soname=libSaMsg.so.$(SOMAJOR) \
+ -Wl,-soname=libSaMsg.so.$(MSG_SOMAJOR) \
-Wl,-version-script=$(srcdir)/libSaMsg.versions \
$^ $(LDFLAGS) $(coroipcc_LIBS) $(AM_LDFLAGS)
- ln -sf libSaMsg.so.$(SONAME) libSaMsg.so
- ln -sf libSaMsg.so.$(SONAME) libSaMsg.so.$(SOMAJOR)
+ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so
+ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so.$(MSG_SOMAJOR)
libSaTmr.so.$(SONAME): util.o tmr.o
$(CC) $(LDFLAGS) -shared -o $@ \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index bf2315c..39f00a9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -192,6 +192,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
@@ -273,9 +275,12 @@ INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include
lib_LIBRARIES = libSaAmf.a libSaCkpt.a libSaClm.a libSaEvt.a \
libSaLck.a libSaMsg.a libSaTmr.a
-SHARED_LIBS = $(lib_LIBRARIES:%.a=%.so.$(SONAME))
+LIBS_BASE_GENERAL = $(filter-out libSaMsg,$(basename $(lib_LIBRARIES)))
+SHARED_LIBS = $(addsuffix .so.$(SONAME),$(LIBS_BASE_GENERAL)) \
+ $(addsuffix .so.$(MSG_SONAME),libSaMsg)
+
SHARED_LIBS_SO = $(lib_LIBRARIES:%.a=%.so)
-SHARED_LIBS_SO_TWO = $(lib_LIBRARIES:%.a=%.so.$(SOMAJOR))
+SHARED_LIBS_SO_TWO = $(addsuffix .so.$(SOMAJOR),$(LIBS_BASE_GENERAL)) libSaMsg.so.$(MSG_SOMAJOR)
libSaAmf_a_SOURCES = util.c amf.c
libSaCkpt_a_SOURCES = util.c ckpt.c
libSaClm_a_SOURCES = util.c clm.c
@@ -624,7 +629,7 @@ uninstall-am: uninstall-libLIBRARIES uninstall-local
@BUILD_DARWIN_TRUE at libSaLck.so.$(SONAME): util.o lck.o
@BUILD_DARWIN_TRUE@ $(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
- at BUILD_DARWIN_TRUE@libSaMsg.so.$(SONAME): util.o msg.o
+ at BUILD_DARWIN_TRUE@libSaMsg.so.$(MSG_SONAME): util.o msg.o
@BUILD_DARWIN_TRUE@ $(CC) $(DARWIN_OPTS) $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
@BUILD_DARWIN_TRUE at libSaTmr.so.$(SONAME): util.o tmr.o
@@ -645,7 +650,7 @@ uninstall-am: uninstall-libLIBRARIES uninstall-local
@BUILD_SOLARIS_TRUE at libSaLck.so.$(SONAME): util.o lck.o
@BUILD_SOLARIS_TRUE@ $(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
- at BUILD_SOLARIS_TRUE@libSaMsg.so.$(SONAME): util.o msg.o
+ at BUILD_SOLARIS_TRUE@libSaMsg.so.$(MSG_SONAME): util.o msg.o
@BUILD_SOLARIS_TRUE@ $(LD) $(LDFLAGS) $(SOLARIS_OPTS) -G $(coroipcc_LIBS) $^ -o $@ $(AM_LDFLAGS)
@BUILD_SOLARIS_TRUE at libSaTmr.so.$(SONAME): util.o tmr.o
@@ -691,13 +696,13 @@ uninstall-am: uninstall-libLIBRARIES uninstall-local
@BUILD_SOLARIS_FALSE@ ln -sf libSaLck.so.$(SONAME) libSaLck.so
@BUILD_SOLARIS_FALSE@ ln -sf libSaLck.so.$(SONAME) libSaLck.so.$(SOMAJOR)
- at BUILD_SOLARIS_FALSE@libSaMsg.so.$(SONAME): util.o msg.o
+ at BUILD_SOLARIS_FALSE@libSaMsg.so.$(MSG_SONAME): util.o msg.o
@BUILD_SOLARIS_FALSE@ $(CC) -shared -o $@ \
- at BUILD_SOLARIS_FALSE@ -Wl,-soname=libSaMsg.so.$(SOMAJOR) \
+ at BUILD_SOLARIS_FALSE@ -Wl,-soname=libSaMsg.so.$(MSG_SOMAJOR) \
@BUILD_SOLARIS_FALSE@ -Wl,-version-script=$(srcdir)/libSaMsg.versions \
@BUILD_SOLARIS_FALSE@ $^ $(LDFLAGS) $(coroipcc_LIBS) $(AM_LDFLAGS)
- at BUILD_SOLARIS_FALSE@ ln -sf libSaMsg.so.$(SONAME) libSaMsg.so
- at BUILD_SOLARIS_FALSE@ ln -sf libSaMsg.so.$(SONAME) libSaMsg.so.$(SOMAJOR)
+ at BUILD_SOLARIS_FALSE@ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so
+ at BUILD_SOLARIS_FALSE@ ln -sf libSaMsg.so.$(MSG_SONAME) libSaMsg.so.$(MSG_SOMAJOR)
@BUILD_SOLARIS_FALSE at libSaTmr.so.$(SONAME): util.o tmr.o
@BUILD_SOLARIS_FALSE@ $(CC) $(LDFLAGS) -shared -o $@ \
diff --git a/lib/msg.c b/lib/msg.c
index 480492c..137027a 100644
--- a/lib/msg.c
+++ b/lib/msg.c
@@ -312,6 +312,12 @@ saMsgDispatch (
break;
}
+ queueInstance->queue_id =
+ res_lib_msg_queueopen_callback->queue_id;
+
+ list_init (&queueInstance->list);
+ list_add_tail (&queueInstance->list, &msgInstance->queue_list);
+
hdb_handle_put (&queueHandleDatabase,
res_lib_msg_queueopen_callback->queue_handle);
@@ -710,11 +716,6 @@ saMsgQueueOpenAsync (
goto error_put_destroy;
}
- queueInstance->queue_id = res_lib_msg_queueopenasync.queue_id;
-
- list_init (&queueInstance->list);
- list_add_tail (&queueInstance->list, &msgInstance->queue_list);
-
hdb_handle_put (&queueHandleDatabase, queueHandle);
hdb_handle_put (&msgHandleDatabase, msgHandle);
@@ -1997,13 +1998,13 @@ error_exit:
}
SaAisErrorT
-saMsgQueueCapacityThresholdSet (
+saMsgQueueCapacityThresholdsSet (
SaMsgQueueHandleT queueHandle,
const SaMsgQueueThresholdsT *thresholds)
{
struct queueInstance *queueInstance;
- struct req_lib_msg_queuecapacitythresholdset req_lib_msg_queuecapacitythresholdset;
- struct res_lib_msg_queuecapacitythresholdset res_lib_msg_queuecapacitythresholdset;
+ struct req_lib_msg_queuecapacitythresholdsset req_lib_msg_queuecapacitythresholdsset;
+ struct res_lib_msg_queuecapacitythresholdsset res_lib_msg_queuecapacitythresholdsset;
struct iovec iov;
SaAisErrorT error = SA_AIS_OK;
@@ -2019,37 +2020,37 @@ saMsgQueueCapacityThresholdSet (
goto error_exit;
}
- req_lib_msg_queuecapacitythresholdset.header.size =
- sizeof (struct req_lib_msg_queuecapacitythresholdset);
- req_lib_msg_queuecapacitythresholdset.header.id =
- MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDSET;
+ req_lib_msg_queuecapacitythresholdsset.header.size =
+ sizeof (struct req_lib_msg_queuecapacitythresholdsset);
+ req_lib_msg_queuecapacitythresholdsset.header.id =
+ MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDSSET;
- req_lib_msg_queuecapacitythresholdset.queue_id = queueInstance->queue_id;
+ req_lib_msg_queuecapacitythresholdsset.queue_id = queueInstance->queue_id;
marshall_SaNameT_to_mar_name_t (
- &req_lib_msg_queuecapacitythresholdset.queue_name,
+ &req_lib_msg_queuecapacitythresholdsset.queue_name,
(SaNameT *)(&queueInstance->queue_name));
marshall_to_mar_msg_queue_thresholds_t (
- &req_lib_msg_queuecapacitythresholdset.thresholds,
+ &req_lib_msg_queuecapacitythresholdsset.thresholds,
(SaMsgQueueThresholdsT *)(thresholds));
- iov.iov_base = (void *)&req_lib_msg_queuecapacitythresholdset;
- iov.iov_len = sizeof (struct req_lib_msg_queuecapacitythresholdset);
+ iov.iov_base = (void *)&req_lib_msg_queuecapacitythresholdsset;
+ iov.iov_len = sizeof (struct req_lib_msg_queuecapacitythresholdsset);
error = coroipcc_msg_send_reply_receive (
queueInstance->ipc_handle,
&iov,
1,
- &res_lib_msg_queuecapacitythresholdset,
- sizeof (struct res_lib_msg_queuecapacitythresholdset));
+ &res_lib_msg_queuecapacitythresholdsset,
+ sizeof (struct res_lib_msg_queuecapacitythresholdsset));
if (error != SA_AIS_OK) {
goto error_put;
}
- if (res_lib_msg_queuecapacitythresholdset.header.error != SA_AIS_OK) {
- error = res_lib_msg_queuecapacitythresholdset.header.error;
+ if (res_lib_msg_queuecapacitythresholdsset.header.error != SA_AIS_OK) {
+ error = res_lib_msg_queuecapacitythresholdsset.header.error;
goto error_put;
}
@@ -2060,13 +2061,13 @@ error_exit:
}
SaAisErrorT
-saMsgQueueCapacityThresholdGet (
+saMsgQueueCapacityThresholdsGet (
SaMsgQueueHandleT queueHandle,
SaMsgQueueThresholdsT *thresholds)
{
struct queueInstance *queueInstance;
- struct req_lib_msg_queuecapacitythresholdget req_lib_msg_queuecapacitythresholdget;
- struct res_lib_msg_queuecapacitythresholdget res_lib_msg_queuecapacitythresholdget;
+ struct req_lib_msg_queuecapacitythresholdsget req_lib_msg_queuecapacitythresholdsget;
+ struct res_lib_msg_queuecapacitythresholdsget res_lib_msg_queuecapacitythresholdsget;
struct iovec iov;
SaAisErrorT error = SA_AIS_OK;
@@ -2082,38 +2083,38 @@ saMsgQueueCapacityThresholdGet (
goto error_exit;
}
- req_lib_msg_queuecapacitythresholdget.header.size =
- sizeof (struct req_lib_msg_queuecapacitythresholdget);
- req_lib_msg_queuecapacitythresholdget.header.id =
- MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDGET;
+ req_lib_msg_queuecapacitythresholdsget.header.size =
+ sizeof (struct req_lib_msg_queuecapacitythresholdsget);
+ req_lib_msg_queuecapacitythresholdsget.header.id =
+ MESSAGE_REQ_MSG_QUEUECAPACITYTHRESHOLDSGET;
- req_lib_msg_queuecapacitythresholdget.queue_id = queueInstance->queue_id;
+ req_lib_msg_queuecapacitythresholdsget.queue_id = queueInstance->queue_id;
marshall_SaNameT_to_mar_name_t (
- &req_lib_msg_queuecapacitythresholdget.queue_name,
+ &req_lib_msg_queuecapacitythresholdsget.queue_name,
(SaNameT *)(&queueInstance->queue_name));
- iov.iov_base = (void *)&req_lib_msg_queuecapacitythresholdget;
- iov.iov_len = sizeof (struct req_lib_msg_queuecapacitythresholdget);
+ iov.iov_base = (void *)&req_lib_msg_queuecapacitythresholdsget;
+ iov.iov_len = sizeof (struct req_lib_msg_queuecapacitythresholdsget);
error = coroipcc_msg_send_reply_receive (
queueInstance->ipc_handle,
&iov,
1,
- &res_lib_msg_queuecapacitythresholdget,
- sizeof (struct res_lib_msg_queuecapacitythresholdget));
+ &res_lib_msg_queuecapacitythresholdsget,
+ sizeof (struct res_lib_msg_queuecapacitythresholdsget));
if (error != SA_AIS_OK) {
goto error_put;
}
- if (res_lib_msg_queuecapacitythresholdget.header.error != SA_AIS_OK) {
- error = res_lib_msg_queuecapacitythresholdget.header.error;
+ if (res_lib_msg_queuecapacitythresholdsget.header.error != SA_AIS_OK) {
+ error = res_lib_msg_queuecapacitythresholdsget.header.error;
goto error_put;
}
marshall_from_mar_msg_queue_thresholds_t (thresholds,
- &res_lib_msg_queuecapacitythresholdget.thresholds);
+ &res_lib_msg_queuecapacitythresholdsget.thresholds);
error_put:
hdb_handle_put (&queueHandleDatabase, queueHandle);
diff --git a/man/Makefile.in b/man/Makefile.in
index c740dde..e312e3f 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -147,6 +147,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
diff --git a/openais.spec.in b/openais.spec.in
index bdfc38c..373a545 100644
--- a/openais.spec.in
+++ b/openais.spec.in
@@ -36,7 +36,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%endif
%{configure} \
- --with-initddir=%{_initddir}
+ --with-initddir=%{_initrddir}
%build
make %{_smp_mflags}
diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in
index 388d25b..ff16cca 100644
--- a/pkgconfig/Makefile.in
+++ b/pkgconfig/Makefile.in
@@ -117,6 +117,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
diff --git a/services/Makefile.in b/services/Makefile.in
index 16ad9fc..ee74934 100644
--- a/services/Makefile.in
+++ b/services/Makefile.in
@@ -159,6 +159,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
diff --git a/services/ckpt.c b/services/ckpt.c
index 1f350ef..c124da0 100644
--- a/services/ckpt.c
+++ b/services/ckpt.c
@@ -4081,14 +4081,14 @@ static void ckpt_dump_fn (void)
section = list_entry (checkpoint_section_list,
struct checkpoint_section, list);
- log_printf (LOGSYS_LEVEL_NOTICE, " Section %s (%d)",
+ log_printf (LOGSYS_LEVEL_DEBUG, " Section %s (%d)",
section->section_descriptor.section_id.id,
section->section_descriptor.section_id.id_len);
- log_printf (LOGSYS_LEVEL_NOTICE, " size: %"PRIu64,
+ log_printf (LOGSYS_LEVEL_DEBUG, " size: %"PRIu64,
section->section_descriptor.section_size);
- log_printf (LOGSYS_LEVEL_NOTICE, " state: %u",
+ log_printf (LOGSYS_LEVEL_DEBUG, " state: %u",
section->section_descriptor.section_state);
- log_printf (LOGSYS_LEVEL_NOTICE, " exp time: %"PRIu64,
+ log_printf (LOGSYS_LEVEL_DEBUG, " exp time: %"PRIu64,
section->section_descriptor.expiration_time);
}
}
diff --git a/services/msg.c b/services/msg.c
index 71416c6..fd15afc 100644
--- a/services/msg.c
+++ b/services/msg.c
@@ -92,8 +92,8 @@ enum msg_exec_message_req_types {
MESSAGE_REQ_EXEC_MSG_MESSAGESENDRECEIVE = 18,
MESSAGE_REQ_EXEC_MSG_MESSAGEREPLY = 19,
MESSAGE_REQ_EXEC_MSG_MESSAGEREPLYASYNC = 20,
- MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDSET = 21,
- MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDGET = 22,
+ MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDSSET = 21,
+ MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDSGET = 22,
MESSAGE_REQ_EXEC_MSG_METADATASIZEGET = 23,
MESSAGE_REQ_EXEC_MSG_LIMITGET = 24,
MESSAGE_REQ_EXEC_MSG_SYNC_QUEUE = 25,
@@ -319,11 +319,11 @@ static void message_handler_req_exec_msg_messagereplyasync (
const void *msg,
unsigned int nodeid);
-static void message_handler_req_exec_msg_queuecapacitythresholdset (
+static void message_handler_req_exec_msg_queuecapacitythresholdsset (
const void *msg,
unsigned int nodeid);
-static void message_handler_req_exec_msg_queuecapacitythresholdget (
+static void message_handler_req_exec_msg_queuecapacitythresholdsget (
const void *msg,
unsigned int nodeid);
@@ -455,11 +455,11 @@ static void message_handler_req_lib_msg_messagereplyasync (
void *conn,
const void *msg);
-static void message_handler_req_lib_msg_queuecapacitythresholdset (
+static void message_handler_req_lib_msg_queuecapacitythresholdsset (
void *conn,
const void *msg);
-static void message_handler_req_lib_msg_queuecapacitythresholdget (
+static void message_handler_req_lib_msg_queuecapacitythresholdsget (
void *conn,
const void *msg);
@@ -492,8 +492,8 @@ static void exec_msg_messagecancel_endian_convert (void *msg);
static void exec_msg_messagesendreceive_endian_convert (void *msg);
static void exec_msg_messagereply_endian_convert (void *msg);
static void exec_msg_messagereplyasync_endian_convert (void *msg);
-static void exec_msg_queuecapacitythresholdset_endian_convert (void *msg);
-static void exec_msg_queuecapacitythresholdget_endian_convert (void *msg);
+static void exec_msg_queuecapacitythresholdsset_endian_convert (void *msg);
+static void exec_msg_queuecapacitythresholdsget_endian_convert (void *msg);
static void exec_msg_metadatasizeget_endian_convert (void *msg);
static void exec_msg_limitget_endian_convert (void *msg);
static void exec_msg_sync_queue_endian_convert (void *msg);
@@ -646,11 +646,11 @@ struct corosync_lib_handler msg_lib_engine[] =
.flow_control = COROSYNC_LIB_FLOW_CONTROL_REQUIRED
},
{
- .lib_handler_fn = message_handler_req_lib_msg_queuecapacitythresholdset,
+ .lib_handler_fn = message_handler_req_lib_msg_queuecapacitythresholdsset,
.flow_control = COROSYNC_LIB_FLOW_CONTROL_REQUIRED
},
{
- .lib_handler_fn = message_handler_req_lib_msg_queuecapacitythresholdget,
+ .lib_handler_fn = message_handler_req_lib_msg_queuecapacitythresholdsget,
.flow_control = COROSYNC_LIB_FLOW_CONTROL_REQUIRED
},
{
@@ -750,12 +750,12 @@ static struct corosync_exec_handler msg_exec_engine[] =
.exec_endian_convert_fn = exec_msg_messagereplyasync_endian_convert
},
{
- .exec_handler_fn = message_handler_req_exec_msg_queuecapacitythresholdset,
- .exec_endian_convert_fn = exec_msg_queuecapacitythresholdset_endian_convert
+ .exec_handler_fn = message_handler_req_exec_msg_queuecapacitythresholdsset,
+ .exec_endian_convert_fn = exec_msg_queuecapacitythresholdsset_endian_convert
},
{
- .exec_handler_fn = message_handler_req_exec_msg_queuecapacitythresholdget,
- .exec_endian_convert_fn = exec_msg_queuecapacitythresholdget_endian_convert
+ .exec_handler_fn = message_handler_req_exec_msg_queuecapacitythresholdsget,
+ .exec_endian_convert_fn = exec_msg_queuecapacitythresholdsget_endian_convert
},
{
.exec_handler_fn = message_handler_req_exec_msg_metadatasizeget,
@@ -1024,7 +1024,7 @@ struct req_exec_msg_messagereplyasync {
mar_msg_ack_flags_t ack_flags __attribute__((aligned(8)));
};
-struct req_exec_msg_queuecapacitythresholdset {
+struct req_exec_msg_queuecapacitythresholdsset {
coroipc_request_header_t header __attribute__((aligned(8)));
mar_message_source_t source __attribute__((aligned(8)));
mar_name_t queue_name __attribute__((aligned(8)));
@@ -1032,7 +1032,7 @@ struct req_exec_msg_queuecapacitythresholdset {
mar_msg_queue_thresholds_t thresholds __attribute__((aligned(8)));
};
-struct req_exec_msg_queuecapacitythresholdget {
+struct req_exec_msg_queuecapacitythresholdsget {
coroipc_request_header_t header __attribute__((aligned(8)));
mar_message_source_t source __attribute__((aligned(8)));
mar_name_t queue_name __attribute__((aligned(8)));
@@ -1407,10 +1407,10 @@ static void exec_msg_messagereplyasync_endian_convert (void *msg)
return;
}
-static void exec_msg_queuecapacitythresholdset_endian_convert (void *msg)
+static void exec_msg_queuecapacitythresholdsset_endian_convert (void *msg)
{
- struct req_exec_msg_queuecapacitythresholdset *to_swab =
- (struct req_exec_msg_queuecapacitythresholdset *)msg;
+ struct req_exec_msg_queuecapacitythresholdsset *to_swab =
+ (struct req_exec_msg_queuecapacitythresholdsset *)msg;
swab_coroipc_request_header_t (&to_swab->header);
swab_mar_message_source_t (&to_swab->source);
@@ -1421,10 +1421,10 @@ static void exec_msg_queuecapacitythresholdset_endian_convert (void *msg)
return;
}
-static void exec_msg_queuecapacitythresholdget_endian_convert (void *msg)
+static void exec_msg_queuecapacitythresholdsget_endian_convert (void *msg)
{
- struct req_exec_msg_queuecapacitythresholdget *to_swab =
- (struct req_exec_msg_queuecapacitythresholdget *)msg;
+ struct req_exec_msg_queuecapacitythresholdsget *to_swab =
+ (struct req_exec_msg_queuecapacitythresholdsget *)msg;
swab_coroipc_request_header_t (&to_swab->header);
swab_mar_message_source_t (&to_swab->source);
@@ -3495,10 +3495,6 @@ error_exit:
MESSAGE_RES_MSG_QUEUEOPENASYNC;
res_lib_msg_queueopenasync.header.error = error;
- if (queue != NULL) {
- res_lib_msg_queueopenasync.queue_id = queue->queue_id;
- }
-
if (error == SA_AIS_OK) {
msg_pd = api->ipc_private_data_get (
req_exec_msg_queueopenasync->source.conn);
@@ -3528,6 +3524,10 @@ error_exit:
MESSAGE_RES_MSG_QUEUEOPEN_CALLBACK;
res_lib_msg_queueopen_callback.header.error = error;
+ if (queue != NULL) {
+ res_lib_msg_queueopen_callback.queue_id = queue->queue_id;
+ }
+
res_lib_msg_queueopen_callback.queue_handle =
req_exec_msg_queueopenasync->queue_handle;
res_lib_msg_queueopen_callback.invocation =
@@ -5118,26 +5118,26 @@ error_exit:
}
}
-static void message_handler_req_exec_msg_queuecapacitythresholdset (
+static void message_handler_req_exec_msg_queuecapacitythresholdsset (
const void *msg,
unsigned int nodeid)
{
- const struct req_exec_msg_queuecapacitythresholdset
- *req_exec_msg_queuecapacitythresholdset = msg;
- struct res_lib_msg_queuecapacitythresholdset res_lib_msg_queuecapacitythresholdset;
+ const struct req_exec_msg_queuecapacitythresholdsset
+ *req_exec_msg_queuecapacitythresholdsset = msg;
+ struct res_lib_msg_queuecapacitythresholdsset res_lib_msg_queuecapacitythresholdsset;
SaAisErrorT error = SA_AIS_OK;
struct queue_entry *queue = NULL;
int i;
/* DEBUG */
- log_printf (LOGSYS_LEVEL_DEBUG, "EXEC request: saMsgQueueCapacityThresholdSet\n");
+ log_printf (LOGSYS_LEVEL_DEBUG, "EXEC request: saMsgQueueCapacityThresholdsSet\n");
log_printf (LOGSYS_LEVEL_DEBUG, "\t queue=%s\n",
- (char *)(req_exec_msg_queuecapacitythresholdset->queue_name.value));
+ (char *)(req_exec_msg_queuecapacitythresholdsset->queue_name.value));
queue = msg_queue_find_id (&queue_list_head,
- &req_exec_msg_queuecapacitythresholdset->queue_name,
- req_exec_msg_queuecapacitythresholdset->queue_id);
+ &req_exec_msg_queuecapacitythresholdsset->queue_name,
+ req_exec_msg_queuecapacitythresholdsset->queue_id);
if (queue == NULL) {
error = SA_AIS_ERR_NOT_EXIST;
goto error_exit;
@@ -5145,72 +5145,72 @@ static void message_handler_req_exec_msg_queuecapacitythresholdset (
for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i <= SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
queue->priority[i].capacity_reached =
- req_exec_msg_queuecapacitythresholdset->thresholds.capacity_reached[i];
+ req_exec_msg_queuecapacitythresholdsset->thresholds.capacity_reached[i];
queue->priority[i].capacity_available =
- req_exec_msg_queuecapacitythresholdset->thresholds.capacity_available[i];
+ req_exec_msg_queuecapacitythresholdsset->thresholds.capacity_available[i];
}
error_exit:
- if (api->ipc_source_is_local (&req_exec_msg_queuecapacitythresholdset->source))
+ if (api->ipc_source_is_local (&req_exec_msg_queuecapacitythresholdsset->source))
{
- res_lib_msg_queuecapacitythresholdset.header.size =
- sizeof (struct res_lib_msg_queuecapacitythresholdset);
- res_lib_msg_queuecapacitythresholdset.header.id =
- MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDSET;
- res_lib_msg_queuecapacitythresholdset.header.error = error;
+ res_lib_msg_queuecapacitythresholdsset.header.size =
+ sizeof (struct res_lib_msg_queuecapacitythresholdsset);
+ res_lib_msg_queuecapacitythresholdsset.header.id =
+ MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDSSET;
+ res_lib_msg_queuecapacitythresholdsset.header.error = error;
api->ipc_response_send (
- req_exec_msg_queuecapacitythresholdset->source.conn,
- &res_lib_msg_queuecapacitythresholdset,
- sizeof (struct res_lib_msg_queuecapacitythresholdset));
+ req_exec_msg_queuecapacitythresholdsset->source.conn,
+ &res_lib_msg_queuecapacitythresholdsset,
+ sizeof (struct res_lib_msg_queuecapacitythresholdsset));
}
}
-static void message_handler_req_exec_msg_queuecapacitythresholdget (
+static void message_handler_req_exec_msg_queuecapacitythresholdsget (
const void *msg,
unsigned int nodeid)
{
- const struct req_exec_msg_queuecapacitythresholdget
- *req_exec_msg_queuecapacitythresholdget = msg;
- struct res_lib_msg_queuecapacitythresholdget res_lib_msg_queuecapacitythresholdget;
+ const struct req_exec_msg_queuecapacitythresholdsget
+ *req_exec_msg_queuecapacitythresholdsget = msg;
+ struct res_lib_msg_queuecapacitythresholdsget res_lib_msg_queuecapacitythresholdsget;
SaAisErrorT error = SA_AIS_OK;
struct queue_entry *queue = NULL;
int i;
/* DEBUG */
- log_printf (LOGSYS_LEVEL_DEBUG, "EXEC request: saMsgQueueCapacityThresholdGet\n");
+ log_printf (LOGSYS_LEVEL_DEBUG, "EXEC request: saMsgQueueCapacityThresholdsGet\n");
log_printf (LOGSYS_LEVEL_DEBUG, "\t queue=%s\n",
- (char *)(req_exec_msg_queuecapacitythresholdget->queue_name.value));
+ (char *)(req_exec_msg_queuecapacitythresholdsget->queue_name.value));
queue = msg_queue_find_id (&queue_list_head,
- &req_exec_msg_queuecapacitythresholdget->queue_name,
- req_exec_msg_queuecapacitythresholdget->queue_id);
+ &req_exec_msg_queuecapacitythresholdsget->queue_name,
+ req_exec_msg_queuecapacitythresholdsget->queue_id);
if (queue == NULL) {
error = SA_AIS_ERR_NOT_EXIST;
goto error_exit;
}
for (i = SA_MSG_MESSAGE_HIGHEST_PRIORITY; i <= SA_MSG_MESSAGE_LOWEST_PRIORITY; i++) {
- res_lib_msg_queuecapacitythresholdget.thresholds.capacity_reached[i] =
+ res_lib_msg_queuecapacitythresholdsget.thresholds.capacity_reached[i] =
queue->priority[i].capacity_reached;
- res_lib_msg_queuecapacitythresholdget.thresholds.capacity_available[i] =
+ res_lib_msg_queuecapacitythresholdsget.thresholds.capacity_available[i] =
queue->priority[i].capacity_available;
}
error_exit:
- if (api->ipc_source_is_local (&req_exec_msg_queuecapacitythresholdget->source))
+ if (api->ipc_source_is_local (&req_exec_msg_queuecapacitythresholdsget->source))
{
- res_lib_msg_queuecapacitythresholdget.header.size =
- sizeof (struct res_lib_msg_queuecapacitythresholdget);
- res_lib_msg_queuecapacitythresholdget.header.id =
- MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDGET;
- res_lib_msg_queuecapacitythresholdget.header.error = error;
+ res_lib_msg_queuecapacitythresholdsget.header.size =
+ sizeof (struct res_lib_msg_queuecapacitythresholdsget);
+ res_lib_msg_queuecapacitythresholdsget.header.id =
+ MESSAGE_RES_MSG_QUEUECAPACITYTHRESHOLDSGET;
+ res_lib_msg_queuecapacitythresholdsget.header.error = error;
api->ipc_response_send (
- req_exec_msg_queuecapacitythresholdget->source.conn,
- &res_lib_msg_queuecapacitythresholdget,
- sizeof (struct res_lib_msg_queuecapacitythresholdget));
+ req_exec_msg_queuecapacitythresholdsget->source.conn,
+ &res_lib_msg_queuecapacitythresholdsget,
+ sizeof (struct res_lib_msg_queuecapacitythresholdsget));
}
}
@@ -6543,58 +6543,58 @@ static void message_handler_req_lib_msg_messagereplyasync (
assert (api->totem_mcast (iovec, 2, TOTEM_AGREED) == 0);
}
-static void message_handler_req_lib_msg_queuecapacitythresholdset (
+static void message_handler_req_lib_msg_queuecapacitythresholdsset (
void *conn,
const void *msg)
{
- const struct req_lib_msg_queuecapacitythresholdset *req_lib_msg_queuecapacitythresholdset = msg;
- struct req_exec_msg_queuecapacitythresholdset req_exec_msg_queuecapacitythresholdset;
+ const struct req_lib_msg_queuecapacitythresholdsset *req_lib_msg_queuecapacitythresholdsset = msg;
+ struct req_exec_msg_queuecapacitythresholdsset req_exec_msg_queuecapacitythresholdsset;
struct iovec iovec;
/* DEBUG */
- log_printf (LOGSYS_LEVEL_DEBUG, "LIB request: saMsgQueueCapacityThresholdSet\n");
+ log_printf (LOGSYS_LEVEL_DEBUG, "LIB request: saMsgQueueCapacityThresholdsSet\n");
- req_exec_msg_queuecapacitythresholdset.header.size =
- sizeof (struct req_exec_msg_queuecapacitythresholdset);
- req_exec_msg_queuecapacitythresholdset.header.id =
- SERVICE_ID_MAKE (MSG_SERVICE, MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDSET);
+ req_exec_msg_queuecapacitythresholdsset.header.size =
+ sizeof (struct req_exec_msg_queuecapacitythresholdsset);
+ req_exec_msg_queuecapacitythresholdsset.header.id =
+ SERVICE_ID_MAKE (MSG_SERVICE, MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDSSET);
- api->ipc_source_set (&req_exec_msg_queuecapacitythresholdset.source, conn);
+ api->ipc_source_set (&req_exec_msg_queuecapacitythresholdsset.source, conn);
- memcpy (&req_exec_msg_queuecapacitythresholdset.queue_name,
- &req_lib_msg_queuecapacitythresholdset->queue_name,
+ memcpy (&req_exec_msg_queuecapacitythresholdsset.queue_name,
+ &req_lib_msg_queuecapacitythresholdsset->queue_name,
sizeof (mar_name_t));
- iovec.iov_base = (void *)&req_exec_msg_queuecapacitythresholdset;
- iovec.iov_len = sizeof (req_exec_msg_queuecapacitythresholdset);
+ iovec.iov_base = (void *)&req_exec_msg_queuecapacitythresholdsset;
+ iovec.iov_len = sizeof (req_exec_msg_queuecapacitythresholdsset);
assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0);
}
-static void message_handler_req_lib_msg_queuecapacitythresholdget (
+static void message_handler_req_lib_msg_queuecapacitythresholdsget (
void *conn,
const void *msg)
{
- const struct req_lib_msg_queuecapacitythresholdget *req_lib_msg_queuecapacitythresholdget = msg;
- struct req_exec_msg_queuecapacitythresholdget req_exec_msg_queuecapacitythresholdget;
+ const struct req_lib_msg_queuecapacitythresholdsget *req_lib_msg_queuecapacitythresholdsget = msg;
+ struct req_exec_msg_queuecapacitythresholdsget req_exec_msg_queuecapacitythresholdsget;
struct iovec iovec;
/* DEBUG */
- log_printf (LOGSYS_LEVEL_DEBUG, "LIB request: saMsgQueueCapacityThresholdGet\n");
+ log_printf (LOGSYS_LEVEL_DEBUG, "LIB request: saMsgQueueCapacityThresholdsGet\n");
- req_exec_msg_queuecapacitythresholdget.header.size =
- sizeof (struct req_exec_msg_queuecapacitythresholdget);
- req_exec_msg_queuecapacitythresholdget.header.id =
- SERVICE_ID_MAKE (MSG_SERVICE, MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDGET);
+ req_exec_msg_queuecapacitythresholdsget.header.size =
+ sizeof (struct req_exec_msg_queuecapacitythresholdsget);
+ req_exec_msg_queuecapacitythresholdsget.header.id =
+ SERVICE_ID_MAKE (MSG_SERVICE, MESSAGE_REQ_EXEC_MSG_QUEUECAPACITYTHRESHOLDSGET);
- api->ipc_source_set (&req_exec_msg_queuecapacitythresholdget.source, conn);
+ api->ipc_source_set (&req_exec_msg_queuecapacitythresholdsget.source, conn);
- memcpy (&req_exec_msg_queuecapacitythresholdget.queue_name,
- &req_lib_msg_queuecapacitythresholdget->queue_name,
+ memcpy (&req_exec_msg_queuecapacitythresholdsget.queue_name,
+ &req_lib_msg_queuecapacitythresholdsget->queue_name,
sizeof (mar_name_t));
- iovec.iov_base = (void *)&req_exec_msg_queuecapacitythresholdget;
- iovec.iov_len = sizeof (req_exec_msg_queuecapacitythresholdget);
+ iovec.iov_base = (void *)&req_exec_msg_queuecapacitythresholdsget;
+ iovec.iov_len = sizeof (req_exec_msg_queuecapacitythresholdsget);
assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0);
}
diff --git a/services/openais-instantiate.c b/services/openais-instantiate.c
index da7f1b2..ed606a4 100644
--- a/services/openais-instantiate.c
+++ b/services/openais-instantiate.c
@@ -43,7 +43,7 @@
struct timespec sleeptime = {
.tv_sec = 0,
- .tv_nsec = 10000 /* 10 msec */
+ .tv_nsec = 10000000 /* 10 msec */
};
#ifndef xprintf
diff --git a/test/Makefile.in b/test/Makefile.in
index 0c11721..cee86a7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -180,6 +180,8 @@ LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
MKDIR_P = @MKDIR_P@
+MSG_SOMAJOR = @MSG_SOMAJOR@
+MSG_SONAME = @MSG_SONAME@
OBJEXT = @OBJEXT@
OS_DYFLAGS = @OS_DYFLAGS@
PACKAGE = @PACKAGE@
--
openais Debian packaging
More information about the Debian-ha-svn-commits
mailing list