You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2010/01/27 11:42:20 UTC
svn commit: r903599 - in /qpid/trunk/qpid/cpp: examples/messaging/
include/qpid/messaging/ src/qpid/client/amqp0_10/ src/qpid/messaging/
src/tests/
Author: gsim
Date: Wed Jan 27 10:42:19 2010
New Revision: 903599
URL: http://svn.apache.org/viewvc?rev=903599&view=rev
Log:
QPID-664: change cancel() to close() for consistency
Modified:
qpid/trunk/qpid/cpp/examples/messaging/drain.cpp
qpid/trunk/qpid/cpp/examples/messaging/map_receiver.cpp
qpid/trunk/qpid/cpp/examples/messaging/queue_receiver.cpp
qpid/trunk/qpid/cpp/examples/messaging/topic_receiver.cpp
qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
qpid/trunk/qpid/cpp/src/qpid/messaging/Sender.cpp
qpid/trunk/qpid/cpp/src/qpid/messaging/SenderImpl.h
qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
Modified: qpid/trunk/qpid/cpp/examples/messaging/drain.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/drain.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/drain.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/drain.cpp Wed Jan 27 10:42:19 2010
@@ -111,7 +111,7 @@
std::cout << "')" << std::endl;
session.acknowledge();
}
- receiver.cancel();
+ receiver.close();
session.close();
connection.close();
return 0;
Modified: qpid/trunk/qpid/cpp/examples/messaging/map_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/map_receiver.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/map_receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/map_receiver.cpp Wed Jan 27 10:42:19 2010
@@ -46,7 +46,7 @@
MapView content(message);
std::cout << content << std::endl;
session.acknowledge();
- receiver.cancel();
+ receiver.close();
connection.close();
return 0;
} catch(const std::exception& error) {
Modified: qpid/trunk/qpid/cpp/examples/messaging/queue_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/queue_receiver.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/queue_receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/queue_receiver.cpp Wed Jan 27 10:42:19 2010
@@ -42,8 +42,8 @@
std::cout << "Message: " << message.getContent() << std::endl;
session.acknowledge();
if (message.getContent() == "That's all, folks!") {
- std::cout << "Cancelling receiver" << std::endl;
- receiver.cancel();
+ std::cout << "Closing receiver" << std::endl;
+ receiver.close();
break;
}
}
Modified: qpid/trunk/qpid/cpp/examples/messaging/topic_receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/messaging/topic_receiver.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/messaging/topic_receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/examples/messaging/topic_receiver.cpp Wed Jan 27 10:42:19 2010
@@ -42,8 +42,8 @@
Message message = receiver.fetch();
std::cout << "Message: " << message.getContent() << std::endl;
if (message.getContent() == "That's all, folks!") {
- std::cout << "Cancelling receiver" << std::endl;
- receiver.cancel();
+ std::cout << "Closing receiver" << std::endl;
+ receiver.close();
break;
}
}
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Receiver.h Wed Jan 27 10:42:19 2010
@@ -110,7 +110,7 @@
/**
* Cancels this receiver.
*/
- QPID_CLIENT_EXTERN void cancel();
+ QPID_CLIENT_EXTERN void close();
/**
* Returns the name of this receiver.
Modified: qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/messaging/Sender.h Wed Jan 27 10:42:19 2010
@@ -50,7 +50,7 @@
QPID_CLIENT_EXTERN Sender& operator=(const Sender&);
QPID_CLIENT_EXTERN void send(const Message& message);
- QPID_CLIENT_EXTERN void cancel();
+ QPID_CLIENT_EXTERN void close();
/**
* Sets the capacity for the sender. The capacity determines how
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.cpp Wed Jan 27 10:42:19 2010
@@ -68,9 +68,9 @@
return f.result;
}
-void ReceiverImpl::cancel()
+void ReceiverImpl::close()
{
- execute<Cancel>();
+ execute<Close>();
}
void ReceiverImpl::start()
@@ -167,7 +167,7 @@
}
}
-void ReceiverImpl::cancelImpl()
+void ReceiverImpl::closeImpl()
{
if (state != CANCELLED) {
state = CANCELLED;
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/ReceiverImpl.h Wed Jan 27 10:42:19 2010
@@ -54,7 +54,7 @@
qpid::messaging::Message get(qpid::sys::Duration timeout);
bool fetch(qpid::messaging::Message& message, qpid::sys::Duration timeout);
qpid::messaging::Message fetch(qpid::sys::Duration timeout);
- void cancel();
+ void close();
void start();
void stop();
const std::string& getName() const;
@@ -81,7 +81,7 @@
//implementation of public facing methods
bool fetchImpl(qpid::messaging::Message& message, qpid::sys::Duration timeout);
bool getImpl(qpid::messaging::Message& message, qpid::sys::Duration timeout);
- void cancelImpl();
+ void closeImpl();
void setCapacityImpl(uint32_t);
//functors for public facing methods (allows locking and retry
@@ -115,10 +115,10 @@
void operator()() { result = impl.fetchImpl(message, timeout); }
};
- struct Cancel : Command
+ struct Close : Command
{
- Cancel(ReceiverImpl& i) : Command(i) {}
- void operator()() { impl.cancelImpl(); }
+ Close(ReceiverImpl& i) : Command(i) {}
+ void operator()() { impl.closeImpl(); }
};
struct SetCapacity : Command
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.cpp Wed Jan 27 10:42:19 2010
@@ -40,9 +40,9 @@
while (f.repeat) parent.execute(f);
}
-void SenderImpl::cancel()
+void SenderImpl::close()
{
- execute<Cancel>();
+ execute<Close>();
}
void SenderImpl::setCapacity(uint32_t c)
@@ -124,7 +124,7 @@
return outgoing.size();
}
-void SenderImpl::cancelImpl()
+void SenderImpl::closeImpl()
{
state = CANCELLED;
sink->cancel(session, name);
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SenderImpl.h Wed Jan 27 10:42:19 2010
@@ -49,7 +49,7 @@
SenderImpl(SessionImpl& parent, const std::string& name,
const qpid::messaging::Address& address);
void send(const qpid::messaging::Message&);
- void cancel();
+ void close();
void setCapacity(uint32_t);
uint32_t getCapacity();
uint32_t pending();
@@ -80,7 +80,7 @@
//logic for application visible methods:
void sendImpl(const qpid::messaging::Message&);
- void cancelImpl();
+ void closeImpl();
//functors for application visible methods (allowing locking and
@@ -108,10 +108,10 @@
}
};
- struct Cancel : Command
+ struct Close : Command
{
- Cancel(SenderImpl& i) : Command(i) {}
- void operator()() { impl.cancelImpl(); }
+ Close(SenderImpl& i) : Command(i) {}
+ void operator()() { impl.closeImpl(); }
};
struct CheckPendingSends : Command
Modified: qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/amqp0_10/SessionImpl.cpp Wed Jan 27 10:42:19 2010
@@ -94,7 +94,7 @@
void SessionImpl::close()
{
- //cancel all the senders and receivers (get copy of names and then
+ //close all the senders and receivers (get copy of names and then
//make the calls to avoid modifying maps while iterating over
//them):
std::vector<std::string> s;
@@ -104,8 +104,8 @@
for (Senders::const_iterator i = senders.begin(); i != senders.end(); ++i) s.push_back(i->first);
for (Receivers::const_iterator i = receivers.begin(); i != receivers.end(); ++i) r.push_back(i->first);
}
- for (std::vector<std::string>::const_iterator i = s.begin(); i != s.end(); ++i) getSender(*i).cancel();
- for (std::vector<std::string>::const_iterator i = r.begin(); i != r.end(); ++i) getReceiver(*i).cancel();
+ for (std::vector<std::string>::const_iterator i = s.begin(); i != s.end(); ++i) getSender(*i).close();
+ for (std::vector<std::string>::const_iterator i = r.begin(); i != r.end(); ++i) getReceiver(*i).close();
connection.closed(*this);
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Receiver.cpp Wed Jan 27 10:42:19 2010
@@ -47,7 +47,7 @@
uint32_t Receiver::getCapacity() { return impl->getCapacity(); }
uint32_t Receiver::available() { return impl->available(); }
uint32_t Receiver::pendingAck() { return impl->pendingAck(); }
-void Receiver::cancel() { impl->cancel(); }
+void Receiver::close() { impl->close(); }
const std::string& Receiver::getName() const { return impl->getName(); }
Session Receiver::getSession() const { return impl->getSession(); }
}} // namespace qpid::messaging
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/ReceiverImpl.h Wed Jan 27 10:42:19 2010
@@ -46,7 +46,7 @@
virtual uint32_t getCapacity() = 0;
virtual uint32_t available() = 0;
virtual uint32_t pendingAck() = 0;
- virtual void cancel() = 0;
+ virtual void close() = 0;
virtual const std::string& getName() const = 0;
virtual Session getSession() const = 0;
};
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/Sender.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/Sender.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/Sender.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/Sender.cpp Wed Jan 27 10:42:19 2010
@@ -40,7 +40,7 @@
Sender::~Sender() { PI::dtor(*this); }
Sender& Sender::operator=(const Sender& s) { return PI::assign(*this, s); }
void Sender::send(const Message& message) { impl->send(message); }
-void Sender::cancel() { impl->cancel(); }
+void Sender::close() { impl->close(); }
void Sender::setCapacity(uint32_t c) { impl->setCapacity(c); }
uint32_t Sender::getCapacity() { return impl->getCapacity(); }
uint32_t Sender::pending() { return impl->pending(); }
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/SenderImpl.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/SenderImpl.h?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/SenderImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/SenderImpl.h Wed Jan 27 10:42:19 2010
@@ -37,7 +37,7 @@
public:
virtual ~SenderImpl() {}
virtual void send(const Message& message) = 0;
- virtual void cancel() = 0;
+ virtual void close() = 0;
virtual void setCapacity(uint32_t) = 0;
virtual uint32_t getCapacity() = 0;
virtual uint32_t pending() = 0;
Modified: qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp?rev=903599&r1=903598&r2=903599&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/MessagingSessionTests.cpp Wed Jan 27 10:42:19 2010
@@ -123,8 +123,8 @@
Message in;
BOOST_CHECK(r.fetch(in, 5*qpid::sys::TIME_SEC));
BOOST_CHECK_EQUAL(out.getContent(), in.getContent());
- r.cancel();
- s.cancel();
+ r.close();
+ s.close();
}
~MessagingFixture()
@@ -284,7 +284,7 @@
msg.setContent("four");
sender.send(msg);
BOOST_CHECK_EQUAL(fetch(sub2, 2), boost::assign::list_of<std::string>("three")("four"));
- sub2.cancel();
+ sub2.close();
msg.setContent("five");
sender.send(msg);
@@ -501,7 +501,7 @@
QueueCreatePolicyFixture fix("#; {create:receiver, node-properties:{type:queue}}");
Receiver r = fix.session.createReceiver(fix.address);
fix.test();
- r.cancel();
+ r.close();
}
QPID_AUTO_TEST_CASE(testCreatePolicyQueueSender)
@@ -509,7 +509,7 @@
QueueCreatePolicyFixture fix("#; {create:sender, node-properties:{type:queue}}");
Sender s = fix.session.createSender(fix.address);
fix.test();
- s.cancel();
+ s.close();
}
struct ExchangeCreatePolicyFixture : public MessagingFixture
@@ -546,7 +546,7 @@
ExchangeCreatePolicyFixture fix("#/my-subject; {create:receiver, node-properties:{type:topic, x-properties:{type:fanout}}}", "fanout");
Receiver r = fix.session.createReceiver(fix.address);
fix.test();
- r.cancel();
+ r.close();
}
QPID_AUTO_TEST_CASE(testCreatePolicyTopicSenderDirect)
@@ -554,7 +554,7 @@
ExchangeCreatePolicyFixture fix("#/my-subject; {create:sender, node-properties:{type:topic, x-properties:{type:direct}}}", "direct");
Sender s = fix.session.createSender(fix.address);
fix.test();
- s.cancel();
+ s.close();
}
struct DeletePolicyFixture : public MessagingFixture
@@ -598,25 +598,25 @@
Receiver r = session.createReceiver(address);
switch (mode) {
case RECEIVER:
- s.cancel();
+ s.close();
BOOST_CHECK(exists(address));
- r.cancel();
+ r.close();
BOOST_CHECK(!exists(address));
break;
case SENDER:
- r.cancel();
+ r.close();
BOOST_CHECK(exists(address));
- s.cancel();
+ s.close();
BOOST_CHECK(!exists(address));
break;
case ALWAYS:
- s.cancel();
+ s.close();
BOOST_CHECK(!exists(address));
break;
case NEVER:
- r.cancel();
+ r.close();
BOOST_CHECK(exists(address));
- s.cancel();
+ s.close();
BOOST_CHECK(exists(address));
destroy(address);
}
@@ -676,19 +676,19 @@
MessagingFixture fix;
std::string a1 = "q; {create:always, assert:always, node-properties:{type:queue, durable:false, x-properties:{qpid.max-count:100}}}";
Sender s1 = fix.session.createSender(a1);
- s1.cancel();
+ s1.close();
Receiver r1 = fix.session.createReceiver(a1);
- r1.cancel();
+ r1.close();
std::string a2 = "q; {assert:receiver, node-properties:{durable:true, x-properties:{qpid.max-count:100}}}";
Sender s2 = fix.session.createSender(a2);
- s2.cancel();
+ s2.close();
BOOST_CHECK_THROW(fix.session.createReceiver(a2), qpid::messaging::InvalidAddress);
std::string a3 = "q; {assert:sender, node-properties:{x-properties:{qpid.max-count:99}}}";
BOOST_CHECK_THROW(fix.session.createSender(a3), qpid::messaging::InvalidAddress);
Receiver r3 = fix.session.createReceiver(a3);
- r3.cancel();
+ r3.close();
fix.admin.deleteQueue("q");
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org