rpms/qpidc/devel qpidc_f12_new_cpg.diff, NONE, 1.1 qpidc.spec, 1.84, 1.85
Nuno Santos
nsantos at fedoraproject.org
Wed Jun 17 18:08:58 UTC 2009
Author: nsantos
Update of /cvs/extras/rpms/qpidc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29796
Modified Files:
qpidc.spec
Added Files:
qpidc_f12_new_cpg.diff
Log Message:
patches from Fabio Di Nitto to use new cpg
qpidc_f12_new_cpg.diff:
--- NEW FILE qpidc_f12_new_cpg.diff ---
diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cluster.cpp qpidc-0.5.752600/src/qpid/cluster/Cluster.cpp
--- qpidc-0.5.752600.old/src/qpid/cluster/Cluster.cpp 2009-03-09 18:03:40.000000000 +0100
+++ qpidc-0.5.752600/src/qpid/cluster/Cluster.cpp 2009-06-10 13:59:12.000000000 +0200
@@ -209,11 +209,11 @@
// Deliver CPG message.
void Cluster::deliver(
cpg_handle_t /*handle*/,
- cpg_name* /*group*/,
+ const cpg_name* /*group*/,
uint32_t nodeid,
uint32_t pid,
void* msg,
- int msg_len)
+ size_t msg_len)
{
MemberId from(nodeid, pid);
framing::Buffer buf(static_cast<char*>(msg), msg_len);
@@ -331,10 +331,10 @@
void Cluster::configChange (
cpg_handle_t /*handle*/,
- cpg_name */*group*/,
- cpg_address *current, int nCurrent,
- cpg_address *left, int nLeft,
- cpg_address */*joined*/, int /*nJoined*/)
+ const cpg_name */*group*/,
+ const cpg_address *current, size_t nCurrent,
+ const cpg_address *left, size_t nLeft,
+ const cpg_address */*joined*/, size_t /*nJoined*/)
{
Mutex::ScopedLock l(lock);
if (state == INIT) { // First config change.
@@ -345,7 +345,7 @@
QPID_LOG(debug, *this << " config change: " << AddrList(current, nCurrent)
<< AddrList(left, nLeft, "( ", ")"));
std::string addresses;
- for (cpg_address* p = current; p < current+nCurrent; ++p)
+ for (const cpg_address* p = current; p < current+nCurrent; ++p)
addresses.append(MemberId(*p).str());
deliverEvent(Event::control(ClusterConfigChangeBody(ProtocolVersion(), addresses), self));
}
diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cluster.h qpidc-0.5.752600/src/qpid/cluster/Cluster.h
--- qpidc-0.5.752600.old/src/qpid/cluster/Cluster.h 2009-03-09 18:03:40.000000000 +0100
+++ qpidc-0.5.752600/src/qpid/cluster/Cluster.h 2009-06-10 13:59:41.000000000 +0200
@@ -153,20 +153,20 @@
// == Called in CPG dispatch thread
void deliver( // CPG deliver callback.
cpg_handle_t /*handle*/,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t /*nodeid*/,
uint32_t /*pid*/,
void* /*msg*/,
- int /*msg_len*/);
+ size_t /*msg_len*/);
void deliverEvent(const Event&);
void configChange( // CPG config change callback.
cpg_handle_t /*handle*/,
- struct cpg_name */*group*/,
- struct cpg_address */*members*/, int /*nMembers*/,
- struct cpg_address */*left*/, int /*nLeft*/,
- struct cpg_address */*joined*/, int /*nJoined*/
+ const struct cpg_name */*group*/,
+ const struct cpg_address */*members*/, size_t /*nMembers*/,
+ const struct cpg_address */*left*/, size_t /*nLeft*/,
+ const struct cpg_address */*joined*/, size_t /*nJoined*/
);
// == Called in management threads.
diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cpg.cpp qpidc-0.5.752600/src/qpid/cluster/Cpg.cpp
--- qpidc-0.5.752600.old/src/qpid/cluster/Cpg.cpp 2009-03-11 21:03:45.000000000 +0100
+++ qpidc-0.5.752600/src/qpid/cluster/Cpg.cpp 2009-06-10 13:46:04.000000000 +0200
@@ -44,21 +44,21 @@
// Global callback functions.
void Cpg::globalDeliver (
cpg_handle_t handle,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t nodeid,
uint32_t pid,
void* msg,
- int msg_len)
+ size_t msg_len)
{
cpgFromHandle(handle)->handler.deliver(handle, group, nodeid, pid, msg, msg_len);
}
void Cpg::globalConfigChange(
cpg_handle_t handle,
- struct cpg_name *group,
- struct cpg_address *members, int nMembers,
- struct cpg_address *left, int nLeft,
- struct cpg_address *joined, int nJoined
+ const struct cpg_name *group,
+ const struct cpg_address *members, size_t nMembers,
+ const struct cpg_address *left, size_t nLeft,
+ const struct cpg_address *joined, size_t nJoined
)
{
cpgFromHandle(handle)->handler.configChange(handle, group, members, nMembers, left, nLeft, joined, nJoined);
diff -Naurd qpidc-0.5.752600.old/src/qpid/cluster/Cpg.h qpidc-0.5.752600/src/qpid/cluster/Cpg.h
--- qpidc-0.5.752600.old/src/qpid/cluster/Cpg.h 2009-02-26 18:21:40.000000000 +0100
+++ qpidc-0.5.752600/src/qpid/cluster/Cpg.h 2009-06-10 13:59:47.000000000 +0200
@@ -68,18 +68,18 @@
virtual ~Handler() {};
virtual void deliver(
cpg_handle_t /*handle*/,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t /*nodeid*/,
uint32_t /*pid*/,
void* /*msg*/,
- int /*msg_len*/) = 0;
+ size_t /*msg_len*/) = 0;
virtual void configChange(
cpg_handle_t /*handle*/,
- struct cpg_name */*group*/,
- struct cpg_address */*members*/, int /*nMembers*/,
- struct cpg_address */*left*/, int /*nLeft*/,
- struct cpg_address */*joined*/, int /*nJoined*/
+ const struct cpg_name */*group*/,
+ const struct cpg_address */*members*/, size_t /*nMembers*/,
+ const struct cpg_address */*left*/, size_t /*nLeft*/,
+ const struct cpg_address */*joined*/, size_t /*nJoined*/
) = 0;
};
@@ -128,18 +128,18 @@
static void globalDeliver(
cpg_handle_t handle,
- struct cpg_name *group,
+ const struct cpg_name *group,
uint32_t nodeid,
uint32_t pid,
void* msg,
- int msg_len);
+ size_t msg_len);
static void globalConfigChange(
cpg_handle_t handle,
- struct cpg_name *group,
- struct cpg_address *members, int nMembers,
- struct cpg_address *left, int nLeft,
- struct cpg_address *joined, int nJoined
+ const struct cpg_name *group,
+ const struct cpg_address *members, size_t nMembers,
+ const struct cpg_address *left, size_t nLeft,
+ const struct cpg_address *joined, size_t nJoined
);
cpg_handle_t handle;
Index: qpidc.spec
===================================================================
RCS file: /cvs/extras/rpms/qpidc/devel/qpidc.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- qpidc.spec 17 Jun 2009 15:44:21 -0000 1.84
+++ qpidc.spec 17 Jun 2009 18:08:28 -0000 1.85
@@ -14,7 +14,8 @@ License: ASL 2.0
URL: http://qpid.apache.org
Source0: %{name}-%{version}.tar.gz
Source1: qpidd.pp
-Patch: qpidc.patch
+Patch0: qpidc.patch
+Patch1: qpidc_f12_new_cpg.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: boost-devel
@@ -35,8 +36,8 @@ BuildRequires: nss-devel
BuildRequires: nspr-devel
BuildRequires: xqilla-devel
BuildRequires: xerces-c-devel
-BuildRequires: corosync-devel
-BuildRequires: cmanlib-devel
+BuildRequires: corosynclib-devel >= 0.97-1
+BuildRequires: clusterlib-devel
#BuildRequires: libicu
BuildRequires: swig
@@ -179,7 +180,6 @@ Group: System Environment/Daemons
Requires: qpidd = %version-%release
Requires: qpidc = %version-%release
Requires: corosync
-Requires: cmanlib
%description -n qpidd-cluster
A Qpid daemon plugin enabling broker clustering using openais
@@ -201,7 +201,8 @@ exit 0
%prep
%setup -q
-%patch
+%patch0
+%patch1 -p1
%define perftests "perftest topic_listener topic_publisher \
latencytest client_test txtest"
@@ -415,6 +416,16 @@ fi
%postun -n qmf -p /sbin/ldconfig
%changelog
+* Wed Jun 10 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.5.752600-8
+- update BuildRequires to use corosynclib-devel in correct version.
+- update BuildRequires to use clusterlib-devel instead of the obsoleted
+ cmanlib-devel.
+- drop Requires on cmanlib. This should come in automatically as part
+ of the rpm build process.
+- re-align package version to -8. -7 didn't have a changelog entry?
+- add patch to port Cluster/Cpg to newest Cpg code.
+- change patch tag to use patch0.
+
* Mon May 4 2009 Nuno Santos <nsantos at redhat.com> - 0.5.752600-6
- patch for SASL credentials refresh
More information about the fedora-extras-commits
mailing list