Modified: incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp?rev=649915&r1=649914&r2=649915&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/perftest.cpp Sun Apr 20 05:10:37 2008 @@ -210,7 +210,8 @@ void queueInit(string name, bool durable=false, const framing::FieldTable& settings=framing::FieldTable()) { session.queueDeclare(arg::queue=name, arg::durable=durable, arg::arguments=settings); - session.queuePurge(arg::queue=name).sync(); + session.queuePurge(arg::queue=name); + session.sync(); } void run() { @@ -334,7 +335,7 @@ << endl; Message msg(data, queue); for (size_t i = 0; i < n; ++i) - session.messageTransfer(arg::content=msg); + session.messageTransfer(arg::content=msg, arg::acceptMode=1); } void run() { // Controller @@ -421,7 +422,6 @@ } void run() { // Publisher - Completion completion; try { string data; size_t offset(0); @@ -459,19 +459,19 @@ // any heap allocation. const_cast<std::string&>(msg.getData()).replace(offset, sizeof(uint32_t), reinterpret_cast<const char*>(&i), sizeof(uint32_t)); - completion = session.messageTransfer( + session.messageTransfer( arg::destination=destination, arg::content=msg, - arg::confirmMode=opts.confirm); - if (opts.intervalPub) ::usleep(opts.intervalPub*1000); + arg::acceptMode=1); + if (opts.intervalPub) ::usleep(opts.intervalPub*1000); } - if (opts.confirm) completion.sync(); + if (opts.confirm) session.sync(); AbsTime end=now(); double time=secs(start,end); // Send result to controller. Message report(lexical_cast<string>(opts.count/time), "pub_done"); - session.messageTransfer(arg::content=report); + session.messageTransfer(arg::content=report, arg::acceptMode=1); } session.close(); } @@ -496,9 +496,9 @@ arg::exclusive=true, arg::autoDelete=true, arg::durable=opts.durable); - session.queueBind(arg::queue=queue, - arg::exchange=ex, - arg::routingKey=key); + session.exchangeBind(arg::queue=queue, + arg::exchange=ex, + arg::bindingKey=key); } void verify(bool cond, const char* test, uint32_t expect, uint32_t actual) { @@ -506,7 +506,7 @@ Message error( QPID_MSG("Sequence error: expected n" << test << expect << " but got " << actual), "sub_done"); - session.messageTransfer(arg::content=error); + session.messageTransfer(arg::content=error, arg::acceptMode=1); throw Exception(error.getData()); } } @@ -515,12 +515,12 @@ try { SubscriptionManager subs(session); LocalQueue lq(AckPolicy(opts.ack)); - subs.setConfirmMode(opts.ack > 0); + subs.setAcceptMode(opts.ack > 0 ? 0 : 1); subs.setFlowControl(opts.subQuota, SubscriptionManager::UNLIMITED, false); subs.subscribe(lq, queue); // Notify controller we are ready. - session.messageTransfer(arg::content=Message("ready", "sub_ready")); + session.messageTransfer(arg::content=Message("ready", "sub_ready"), arg::acceptMode=1); for (size_t j = 0; j < opts.iterations; ++j) { @@ -556,7 +556,7 @@ // Report to publisher. Message result(lexical_cast<string>(opts.subQuota/secs(start,end)), "sub_done"); - session.messageTransfer(arg::content=result); + session.messageTransfer(arg::content=result, arg::acceptMode=1); } session.close(); }
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp?rev=649915&r1=649914&r2=649915&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp Sun Apr 20 05:10:37 2008 @@ -114,7 +114,7 @@ } else { session.queueDeclare(arg::queue=control, arg::exclusive=true, arg::autoDelete=true); } - session.queueBind(arg::exchange="amq.topic", arg::queue=control, arg::routingKey="topic_control"); + session.exchangeBind(arg::exchange="amq.topic", arg::queue=control, arg::bindingKey="topic_control"); //set up listener SubscriptionManager mgr(session); @@ -123,7 +123,7 @@ mgr.setAckPolicy(AckPolicy(args.ack ? args.ack : (args.prefetch / 2))); mgr.setFlowControl(args.prefetch, SubscriptionManager::UNLIMITED, true); } else { - mgr.setConfirmMode(false); + mgr.setAcceptMode(1/*-not-required*/); mgr.setFlowControl(SubscriptionManager::UNLIMITED, SubscriptionManager::UNLIMITED, false); } mgr.subscribe(listener, control); @@ -181,7 +181,7 @@ << time/TIME_MSEC << " ms."; Message msg(reportstr.str(), responseQueue); msg.getHeaders().setString("TYPE", "REPORT"); - session.messageTransfer(arg::content=msg); + session.messageTransfer(arg::content=msg, arg::acceptMode=1); if(transactional){ session.txCommit(); } Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp?rev=649915&r1=649914&r2=649915&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp Sun Apr 20 05:10:37 2008 @@ -164,12 +164,12 @@ AbsTime start = now(); for(int i = 0; i < msgs; i++){ - session.messageTransfer(arg::content=msg, arg::destination="amq.topic"); + session.messageTransfer(arg::content=msg, arg::destination="amq.topic", arg::acceptMode=1); } //send report request Message reportRequest("", controlTopic); reportRequest.getHeaders().setString("TYPE", "REPORT_REQUEST"); - session.messageTransfer(arg::content=reportRequest, arg::destination="amq.topic"); + session.messageTransfer(arg::content=reportRequest, arg::destination="amq.topic", arg::acceptMode=1); if(transactional){ session.txCommit(); } @@ -198,7 +198,7 @@ //send termination request Message terminationRequest("", controlTopic); terminationRequest.getHeaders().setString("TYPE", "TERMINATION_REQUEST"); - session.messageTransfer(arg::content=terminationRequest, arg::destination="amq.topic"); + session.messageTransfer(arg::content=terminationRequest, arg::destination="amq.topic", arg::acceptMode=1); if(transactional){ session.txCommit(); } Modified: incubator/qpid/trunk/qpid/cpp/src/tests/txtest.cpp URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/txtest.cpp?rev=649915&r1=649914&r2=649915&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/src/tests/txtest.cpp (original) +++ incubator/qpid/trunk/qpid/cpp/src/tests/txtest.cpp Sun Apr 20 05:10:37 2008 @@ -142,7 +142,7 @@ out.setData(in.getData()); out.getMessageProperties().setCorrelationId(in.getMessageProperties().getCorrelationId()); out.getDeliveryProperties().setDeliveryMode(in.getDeliveryProperties().getDeliveryMode()); - session.messageTransfer(arg::content=out); + session.messageTransfer(arg::content=out, arg::acceptMode=1); } in.acknowledge(); session.txCommit(); @@ -168,7 +168,8 @@ { //declare queues for (StringSet::iterator i = queues.begin(); i != queues.end(); i++) { - session.queueDeclare(arg::queue=*i, arg::durable=opts.durable).sync(); + session.queueDeclare(arg::queue=*i, arg::durable=opts.durable); + session.sync(); } Message msg(generateData(opts.size), *queues.begin()); @@ -179,7 +180,7 @@ //publish messages for (StringSet::iterator i = ids.begin(); i != ids.end(); i++) { msg.getMessageProperties().setCorrelationId(*i); - session.messageTransfer(arg::content=msg); + session.messageTransfer(arg::content=msg, arg::acceptMode=1); } } @@ -205,7 +206,7 @@ { SubscriptionManager subs(session); subs.setFlowControl(SubscriptionManager::UNLIMITED, SubscriptionManager::UNLIMITED, false); - subs.setConfirmMode(false); + subs.setAcceptMode(1/*not-required*/); StringSet drained; //drain each queue and verify the correct set of messages are available @@ -213,7 +214,8 @@ //subscribe, allocate credit and flush LocalQueue lq(AckPolicy(0));//manual acking subs.subscribe(lq, *i, *i); - session.messageFlush(arg::destination=*i).sync(); + session.messageFlush(arg::destination=*i); + session.sync(); uint count(0); while (!lq.empty()) { Modified: incubator/qpid/trunk/qpid/cpp/xml/extra.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/xml/extra.xml?rev=649915&r1=649914&r2=649915&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/cpp/xml/extra.xml (original) +++ incubator/qpid/trunk/qpid/cpp/xml/extra.xml Sun Apr 20 05:10:37 2008 @@ -623,7 +623,7 @@ <class name="message010" index="4"> <doc>blah, blah</doc> - <method name = "transfer" index="1"> + <method name = "transfer" content="1" index="1"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> <chassis name="client" implement="MUST" /> @@ -818,7 +818,7 @@ <method name = "declare" index="1"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="name" domain="shortstr"/> + <field name="exchange" domain="shortstr"/> <field name="type" domain="shortstr"/> <field name="alternate-exchange" domain="shortstr"/> <field name="passive" domain="bit"/> @@ -829,7 +829,7 @@ <method name = "delete" index="2"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="name" domain="shortstr"/> + <field name="exchange" domain="shortstr"/> <field name="if-unused" domain="bit"/> </method> <method name = "query" index="3"> @@ -863,8 +863,8 @@ <method name = "bound" index="6"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="queue" domain="shortstr"/> <field name="exchange" domain="shortstr"/> + <field name="queue" domain="shortstr"/> <field name="binding-key" domain="shortstr"/> <field name="arguments" domain="table"/> <result> @@ -884,7 +884,7 @@ <method name = "declare" index="1"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="name" domain="shortstr"/> + <field name="queue" domain="shortstr"/> <field name="alternate-exchange" domain="shortstr"/> <field name="passive" domain="bit"/> <field name="durable" domain="bit"/> @@ -895,25 +895,25 @@ <method name = "delete" index="2"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="name" domain="shortstr"/> + <field name="queue" domain="shortstr"/> <field name="if-unused" domain="bit"/> <field name="if-empty" domain="bit"/> </method> <method name = "purge" index="3"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="name" domain="shortstr"/> + <field name="queue" domain="shortstr"/> </method> <method name = "query" index="4"> <doc>blah, blah</doc> <chassis name="server" implement="MUST" /> - <field name="name" domain="shortstr"/> + <field name="queue" domain="shortstr"/> <result> <struct size="long" type="1"> <field name="name" domain="shortstr"/> <field name="alternate-exchange" domain="shortstr"/> - <field name="passive" domain="bit"/> <field name="durable" domain="bit"/> + <field name="exclusive" domain="bit"/> <field name="auto-delete" domain="bit"/> <field name="arguments" domain="table"/> <field name="message-count" domain="long"/>
