diff options
| author | Alan Conway <aconway@apache.org> | 2007-03-15 19:22:02 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2007-03-15 19:22:02 +0000 |
| commit | 6bc8ab8e4b209b841969544fc735361335040906 (patch) | |
| tree | 90b8a4b3f0ec4fdf2c3a0ac02b27768b953a3be1 | |
| parent | f92c42ffe7662d1d0e2863c6e143567b25ae2024 (diff) | |
| download | qpid-python-6bc8ab8e4b209b841969544fc735361335040906.tar.gz | |
Changed u_int<n>_t to uint<n>_t for posix compliance.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/qpid.0-9@518733 13f79535-47bb-0310-9956-ffa450edef68
92 files changed, 508 insertions, 508 deletions
diff --git a/cpp/lib/broker/AccumulatedAck.cpp b/cpp/lib/broker/AccumulatedAck.cpp index 34547224ec..ff471b0287 100644 --- a/cpp/lib/broker/AccumulatedAck.cpp +++ b/cpp/lib/broker/AccumulatedAck.cpp @@ -26,12 +26,12 @@ using std::less_equal; using std::bind2nd; using namespace qpid::broker; -void AccumulatedAck::update(u_int64_t firstTag, u_int64_t lastTag){ +void AccumulatedAck::update(uint64_t firstTag, uint64_t lastTag){ assert(firstTag<=lastTag); if (firstTag <= range + 1) { if (lastTag > range) range = lastTag; } else { - for (u_int64_t tag = firstTag; tag<=lastTag; tag++) + for (uint64_t tag = firstTag; tag<=lastTag; tag++) individual.push_back(tag); } } @@ -39,7 +39,7 @@ void AccumulatedAck::update(u_int64_t firstTag, u_int64_t lastTag){ void AccumulatedAck::consolidate(){ individual.sort(); //remove any individual tags that are covered by range - individual.remove_if(bind2nd(less_equal<u_int64_t>(), range)); + individual.remove_if(bind2nd(less_equal<uint64_t>(), range)); //update range if possible (using <= allows for duplicates from overlapping ranges) while (individual.front() <= range + 1) { range = individual.front(); @@ -52,6 +52,6 @@ void AccumulatedAck::clear(){ individual.clear(); } -bool AccumulatedAck::covers(u_int64_t tag) const{ +bool AccumulatedAck::covers(uint64_t tag) const{ return tag <= range || find(individual.begin(), individual.end(), tag) != individual.end(); } diff --git a/cpp/lib/broker/AccumulatedAck.h b/cpp/lib/broker/AccumulatedAck.h index eaae652a30..c4a6e3b79b 100644 --- a/cpp/lib/broker/AccumulatedAck.h +++ b/cpp/lib/broker/AccumulatedAck.h @@ -37,18 +37,18 @@ namespace qpid { * If not zero, then everything up to this value has been * acked. */ - u_int64_t range; + uint64_t range; /** * List of individually acked messages that are not * included in the range marked by 'range'. */ - std::list<u_int64_t> individual; + std::list<uint64_t> individual; - AccumulatedAck(u_int64_t r) : range(r) {} - void update(u_int64_t firstTag, u_int64_t lastTag); + AccumulatedAck(uint64_t r) : range(r) {} + void update(uint64_t firstTag, uint64_t lastTag); void consolidate(); void clear(); - bool covers(u_int64_t tag) const; + bool covers(uint64_t tag) const; }; } } diff --git a/cpp/lib/broker/AutoDelete.cpp b/cpp/lib/broker/AutoDelete.cpp index ae48d10505..2037a9c71c 100644 --- a/cpp/lib/broker/AutoDelete.cpp +++ b/cpp/lib/broker/AutoDelete.cpp @@ -24,7 +24,7 @@ using namespace qpid::broker; using namespace qpid::sys; -AutoDelete::AutoDelete(QueueRegistry* const _registry, u_int32_t _period) +AutoDelete::AutoDelete(QueueRegistry* const _registry, uint32_t _period) : registry(_registry), period(_period), stopped(true) { } void AutoDelete::add(Queue::shared_ptr const queue){ diff --git a/cpp/lib/broker/AutoDelete.h b/cpp/lib/broker/AutoDelete.h index 19a5938df1..9034de1730 100644 --- a/cpp/lib/broker/AutoDelete.h +++ b/cpp/lib/broker/AutoDelete.h @@ -34,7 +34,7 @@ namespace qpid { qpid::sys::Monitor monitor; std::queue<Queue::shared_ptr> queues; QueueRegistry* const registry; - u_int32_t period; + uint32_t period; volatile bool stopped; qpid::sys::Thread runner; @@ -43,7 +43,7 @@ namespace qpid { virtual void run(); public: - AutoDelete(QueueRegistry* const registry, u_int32_t period); + AutoDelete(QueueRegistry* const registry, uint32_t period); void add(Queue::shared_ptr const); void start(); void stop(); diff --git a/cpp/lib/broker/Broker.h b/cpp/lib/broker/Broker.h index e2ca88d4d0..7c21e90b18 100644 --- a/cpp/lib/broker/Broker.h +++ b/cpp/lib/broker/Broker.h @@ -80,8 +80,8 @@ class Broker : public sys::Runnable, MessageStore& getStore() { return *store; } QueueRegistry& getQueues() { return queues; } ExchangeRegistry& getExchanges() { return exchanges; } - u_int32_t getTimeout() { return timeout; } - u_int64_t getStagingThreshold() { return stagingThreshold; } + uint32_t getTimeout() { return timeout; } + uint64_t getStagingThreshold() { return stagingThreshold; } AutoDelete& getCleaner() { return cleaner; } private: @@ -93,8 +93,8 @@ class Broker : public sys::Runnable, std::auto_ptr<MessageStore> store; QueueRegistry queues; ExchangeRegistry exchanges; - u_int32_t timeout; - u_int64_t stagingThreshold; + uint32_t timeout; + uint64_t stagingThreshold; AutoDelete cleaner; ConnectionFactory factory; }; diff --git a/cpp/lib/broker/BrokerAdapter.cpp b/cpp/lib/broker/BrokerAdapter.cpp index 49f0f24407..981801c40e 100644 --- a/cpp/lib/broker/BrokerAdapter.cpp +++ b/cpp/lib/broker/BrokerAdapter.cpp @@ -63,8 +63,8 @@ void BrokerAdapter::ConnectionHandlerImpl::secureOk( const MethodContext&, const string& /*response*/){} void BrokerAdapter::ConnectionHandlerImpl::tuneOk( - const MethodContext&, u_int16_t /*channelmax*/, - u_int32_t framemax, u_int16_t heartbeat) + const MethodContext&, uint16_t /*channelmax*/, + uint32_t framemax, uint16_t heartbeat) { connection.setFrameMax(framemax); connection.setHeartbeat(heartbeat); @@ -80,8 +80,8 @@ void BrokerAdapter::ConnectionHandlerImpl::open( } void BrokerAdapter::ConnectionHandlerImpl::close( - const MethodContext& context, u_int16_t /*replyCode*/, const string& /*replyText*/, - u_int16_t /*classId*/, u_int16_t /*methodId*/) + const MethodContext& context, uint16_t /*replyCode*/, const string& /*replyText*/, + uint16_t /*classId*/, uint16_t /*methodId*/) { client.closeOk(context.getRequestId()); connection.getOutput().close(); @@ -103,9 +103,9 @@ void BrokerAdapter::ChannelHandlerImpl::flow(const MethodContext&, bool /*active void BrokerAdapter::ChannelHandlerImpl::flowOk(const MethodContext&, bool /*active*/){} void BrokerAdapter::ChannelHandlerImpl::close( - const MethodContext& context, u_int16_t /*replyCode*/, + const MethodContext& context, uint16_t /*replyCode*/, const string& /*replyText*/, - u_int16_t /*classId*/, u_int16_t /*methodId*/) + uint16_t /*classId*/, uint16_t /*methodId*/) { client.closeOk(context.getRequestId()); // FIXME aconway 2007-01-18: Following line will "delete this". Ugly. @@ -116,7 +116,7 @@ void BrokerAdapter::ChannelHandlerImpl::closeOk(const MethodContext&){} -void BrokerAdapter::ExchangeHandlerImpl::declare(const MethodContext& context, u_int16_t /*ticket*/, const string& exchange, const string& type, +void BrokerAdapter::ExchangeHandlerImpl::declare(const MethodContext& context, uint16_t /*ticket*/, const string& exchange, const string& type, bool passive, bool /*durable*/, bool /*autoDelete*/, bool /*internal*/, bool nowait, const FieldTable& /*arguments*/){ @@ -143,7 +143,7 @@ void BrokerAdapter::ExchangeHandlerImpl::declare(const MethodContext& context, u } } -void BrokerAdapter::ExchangeHandlerImpl::delete_(const MethodContext& context, u_int16_t /*ticket*/, +void BrokerAdapter::ExchangeHandlerImpl::delete_(const MethodContext& context, uint16_t /*ticket*/, const string& exchange, bool /*ifUnused*/, bool nowait){ //TODO: implement unused @@ -151,7 +151,7 @@ void BrokerAdapter::ExchangeHandlerImpl::delete_(const MethodContext& context, u if(!nowait) client.deleteOk(context.getRequestId()); } -void BrokerAdapter::QueueHandlerImpl::declare(const MethodContext& context, u_int16_t /*ticket*/, const string& name, +void BrokerAdapter::QueueHandlerImpl::declare(const MethodContext& context, uint16_t /*ticket*/, const string& name, bool passive, bool durable, bool exclusive, bool autoDelete, bool nowait, const qpid::framing::FieldTable& arguments){ Queue::shared_ptr queue; @@ -193,7 +193,7 @@ void BrokerAdapter::QueueHandlerImpl::declare(const MethodContext& context, u_in } } -void BrokerAdapter::QueueHandlerImpl::bind(const MethodContext& context, u_int16_t /*ticket*/, const string& queueName, +void BrokerAdapter::QueueHandlerImpl::bind(const MethodContext& context, uint16_t /*ticket*/, const string& queueName, const string& exchangeName, const string& routingKey, bool nowait, const FieldTable& arguments){ @@ -212,7 +212,7 @@ void BrokerAdapter::QueueHandlerImpl::bind(const MethodContext& context, u_int16 void BrokerAdapter::QueueHandlerImpl::unbind( const MethodContext& context, - u_int16_t /*ticket*/, + uint16_t /*ticket*/, const string& queueName, const string& exchangeName, const string& routingKey, @@ -229,14 +229,14 @@ BrokerAdapter::QueueHandlerImpl::unbind( client.unbindOk(context.getRequestId()); } -void BrokerAdapter::QueueHandlerImpl::purge(const MethodContext& context, u_int16_t /*ticket*/, const string& queueName, bool nowait){ +void BrokerAdapter::QueueHandlerImpl::purge(const MethodContext& context, uint16_t /*ticket*/, const string& queueName, bool nowait){ Queue::shared_ptr queue = connection.getQueue(queueName, channel.getId()); int count = queue->purge(); if(!nowait) client.purgeOk( count, context.getRequestId()); } -void BrokerAdapter::QueueHandlerImpl::delete_(const MethodContext& context, u_int16_t /*ticket*/, const string& queue, +void BrokerAdapter::QueueHandlerImpl::delete_(const MethodContext& context, uint16_t /*ticket*/, const string& queue, bool ifUnused, bool ifEmpty, bool nowait){ ChannelException error(0, ""); int count(0); @@ -263,7 +263,7 @@ void BrokerAdapter::QueueHandlerImpl::delete_(const MethodContext& context, u_in -void BrokerAdapter::BasicHandlerImpl::qos(const MethodContext& context, u_int32_t prefetchSize, u_int16_t prefetchCount, bool /*global*/){ +void BrokerAdapter::BasicHandlerImpl::qos(const MethodContext& context, uint32_t prefetchSize, uint16_t prefetchCount, bool /*global*/){ //TODO: handle global channel.setPrefetchSize(prefetchSize); channel.setPrefetchCount(prefetchCount); @@ -271,7 +271,7 @@ void BrokerAdapter::BasicHandlerImpl::qos(const MethodContext& context, u_int32_ } void BrokerAdapter::BasicHandlerImpl::consume( - const MethodContext& context, u_int16_t /*ticket*/, + const MethodContext& context, uint16_t /*ticket*/, const string& queueName, const string& consumerTag, bool noLocal, bool noAck, bool exclusive, bool nowait, const FieldTable& fields) @@ -299,7 +299,7 @@ void BrokerAdapter::BasicHandlerImpl::cancel(const MethodContext& context, const } void BrokerAdapter::BasicHandlerImpl::publish( - const MethodContext& context, u_int16_t /*ticket*/, + const MethodContext& context, uint16_t /*ticket*/, const string& exchangeName, const string& routingKey, bool mandatory, bool immediate) { @@ -316,7 +316,7 @@ void BrokerAdapter::BasicHandlerImpl::publish( } } -void BrokerAdapter::BasicHandlerImpl::get(const MethodContext& context, u_int16_t /*ticket*/, const string& queueName, bool noAck){ +void BrokerAdapter::BasicHandlerImpl::get(const MethodContext& context, uint16_t /*ticket*/, const string& queueName, bool noAck){ Queue::shared_ptr queue = connection.getQueue(queueName, channel.getId()); if(!connection.getChannel(channel.getId()).get(queue, "", !noAck)){ string clusterId;//not used, part of an imatix hack @@ -325,11 +325,11 @@ void BrokerAdapter::BasicHandlerImpl::get(const MethodContext& context, u_int16_ } } -void BrokerAdapter::BasicHandlerImpl::ack(const MethodContext&, u_int64_t deliveryTag, bool multiple){ +void BrokerAdapter::BasicHandlerImpl::ack(const MethodContext&, uint64_t deliveryTag, bool multiple){ channel.ack(deliveryTag, multiple); } -void BrokerAdapter::BasicHandlerImpl::reject(const MethodContext&, u_int64_t /*deliveryTag*/, bool /*requeue*/){} +void BrokerAdapter::BasicHandlerImpl::reject(const MethodContext&, uint64_t /*deliveryTag*/, bool /*requeue*/){} void BrokerAdapter::BasicHandlerImpl::recover(const MethodContext&, bool requeue){ channel.recover(requeue); diff --git a/cpp/lib/broker/BrokerAdapter.h b/cpp/lib/broker/BrokerAdapter.h index 166ec78ddd..2fafbcc180 100644 --- a/cpp/lib/broker/BrokerAdapter.h +++ b/cpp/lib/broker/BrokerAdapter.h @@ -94,14 +94,14 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations void secureOk(const framing::MethodContext& context, const std::string& response); void tuneOk(const framing::MethodContext& context, - u_int16_t channelMax, - u_int32_t frameMax, u_int16_t heartbeat); + uint16_t channelMax, + uint32_t frameMax, uint16_t heartbeat); void open(const framing::MethodContext& context, const std::string& virtualHost, const std::string& capabilities, bool insist); - void close(const framing::MethodContext& context, u_int16_t replyCode, + void close(const framing::MethodContext& context, uint16_t replyCode, const std::string& replyText, - u_int16_t classId, u_int16_t methodId); + uint16_t classId, uint16_t methodId); void closeOk(const framing::MethodContext& context); }; @@ -119,8 +119,8 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations void ping( const framing::MethodContext& context ); void pong( const framing::MethodContext& context ); void resume( const framing::MethodContext& context, const std::string& channelId ); - void close(const framing::MethodContext& context, u_int16_t replyCode, const - std::string& replyText, u_int16_t classId, u_int16_t methodId); + void close(const framing::MethodContext& context, uint16_t replyCode, const + std::string& replyText, uint16_t classId, uint16_t methodId); void closeOk(const framing::MethodContext& context); }; @@ -131,12 +131,12 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations public: ExchangeHandlerImpl(BrokerAdapter& parent) : HandlerImplType(parent) {} - void declare(const framing::MethodContext& context, u_int16_t ticket, + void declare(const framing::MethodContext& context, uint16_t ticket, const std::string& exchange, const std::string& type, bool passive, bool durable, bool autoDelete, bool internal, bool nowait, const qpid::framing::FieldTable& arguments); - void delete_(const framing::MethodContext& context, u_int16_t ticket, + void delete_(const framing::MethodContext& context, uint16_t ticket, const std::string& exchange, bool ifUnused, bool nowait); }; @@ -147,22 +147,22 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations public: QueueHandlerImpl(BrokerAdapter& parent) : HandlerImplType(parent) {} - void declare(const framing::MethodContext& context, u_int16_t ticket, const std::string& queue, + void declare(const framing::MethodContext& context, uint16_t ticket, const std::string& queue, bool passive, bool durable, bool exclusive, bool autoDelete, bool nowait, const qpid::framing::FieldTable& arguments); - void bind(const framing::MethodContext& context, u_int16_t ticket, const std::string& queue, + void bind(const framing::MethodContext& context, uint16_t ticket, const std::string& queue, const std::string& exchange, const std::string& routingKey, bool nowait, const qpid::framing::FieldTable& arguments); void unbind(const framing::MethodContext& context, - u_int16_t ticket, + uint16_t ticket, const std::string& queue, const std::string& exchange, const std::string& routingKey, const qpid::framing::FieldTable& arguments ); - void purge(const framing::MethodContext& context, u_int16_t ticket, const std::string& queue, + void purge(const framing::MethodContext& context, uint16_t ticket, const std::string& queue, bool nowait); - void delete_(const framing::MethodContext& context, u_int16_t ticket, const std::string& queue, + void delete_(const framing::MethodContext& context, uint16_t ticket, const std::string& queue, bool ifUnused, bool ifEmpty, bool nowait); }; @@ -174,22 +174,22 @@ class BrokerAdapter : public CoreRefs, public framing::AMQP_ServerOperations public: BasicHandlerImpl(BrokerAdapter& parent) : HandlerImplType(parent) {} - void qos(const framing::MethodContext& context, u_int32_t prefetchSize, - u_int16_t prefetchCount, bool global); + void qos(const framing::MethodContext& context, uint32_t prefetchSize, + uint16_t prefetchCount, bool global); void consume( - const framing::MethodContext& context, u_int16_t ticket, const std::string& queue, + const framing::MethodContext& context, uint16_t ticket, const std::string& queue, const std::string& consumerTag, bool noLocal, bool noAck, bool exclusive, bool nowait, const qpid::framing::FieldTable& fields); void cancel(const framing::MethodContext& context, const std::string& consumerTag, bool nowait); - void publish(const framing::MethodContext& context, u_int16_t ticket, + void publish(const framing::MethodContext& context, uint16_t ticket, const std::string& exchange, const std::string& routingKey, bool mandatory, bool immediate); - void get(const framing::MethodContext& context, u_int16_t ticket, const std::string& queue, + void get(const framing::MethodContext& context, uint16_t ticket, const std::string& queue, bool noAck); - void ack(const framing::MethodContext& context, u_int64_t deliveryTag, bool multiple); - void reject(const framing::MethodContext& context, u_int64_t deliveryTag, bool requeue); + void ack(const framing::MethodContext& context, uint64_t deliveryTag, bool multiple); + void reject(const framing::MethodContext& context, uint64_t deliveryTag, bool requeue); void recover(const framing::MethodContext& context, bool requeue); }; diff --git a/cpp/lib/broker/BrokerChannel.cpp b/cpp/lib/broker/BrokerChannel.cpp index 47f6686b9e..5673a2c42a 100644 --- a/cpp/lib/broker/BrokerChannel.cpp +++ b/cpp/lib/broker/BrokerChannel.cpp @@ -49,8 +49,8 @@ using namespace qpid::sys; Channel::Channel( Connection& con, ChannelId id, - u_int32_t _framesize, MessageStore* const _store, - u_int64_t _stagingThreshold + uint32_t _framesize, MessageStore* const _store, + uint64_t _stagingThreshold ) : ChannelAdapter(id, &con.getOutput(), con.getVersion()), connection(con), @@ -130,7 +130,7 @@ void Channel::deliver( Mutex::ScopedLock locker(deliveryLock); // Key the delivered messages to the id of the request in which they're sent - u_int64_t deliveryTag = getNextSendRequestId(); + uint64_t deliveryTag = getNextSendRequestId(); if(ackExpected){ unacked.push_back(DeliveryRecord(msg, queue, consumerTag, deliveryTag)); @@ -239,14 +239,14 @@ void Channel::ack(){ } // Used by Basic -void Channel::ack(u_int64_t deliveryTag, bool multiple){ +void Channel::ack(uint64_t deliveryTag, bool multiple){ if (multiple) ack(0, deliveryTag); else ack(deliveryTag, deliveryTag); } -void Channel::ack(u_int64_t firstTag, u_int64_t lastTag){ +void Channel::ack(uint64_t firstTag, uint64_t lastTag){ if(transactional){ accumulatedAck.update(firstTag, lastTag); @@ -300,7 +300,7 @@ bool Channel::get(Queue::shared_ptr queue, const string& destination, bool ackEx Message::shared_ptr msg = queue->dequeue(); if(msg){ Mutex::ScopedLock locker(deliveryLock); - u_int64_t myDeliveryTag = getNextSendRequestId(); + uint64_t myDeliveryTag = getNextSendRequestId(); msg->sendGetOk(MethodContext(this, msg->getRespondTo()), destination, queue->getMessageCount() + 1, myDeliveryTag, @@ -315,7 +315,7 @@ bool Channel::get(Queue::shared_ptr queue, const string& destination, bool ackEx } void Channel::deliver(Message::shared_ptr& msg, const string& consumerTag, - u_int64_t deliveryTag) + uint64_t deliveryTag) { msg->deliver(*this, consumerTag, deliveryTag, framesize); } diff --git a/cpp/lib/broker/BrokerChannel.h b/cpp/lib/broker/BrokerChannel.h index 18e833b85c..5085783685 100644 --- a/cpp/lib/broker/BrokerChannel.h +++ b/cpp/lib/broker/BrokerChannel.h @@ -78,14 +78,14 @@ class Channel : public framing::ChannelAdapter, typedef boost::ptr_map<string,ConsumerImpl> ConsumerImplMap; Connection& connection; - u_int64_t currentDeliveryTag; + uint64_t currentDeliveryTag; Queue::shared_ptr defaultQueue; bool transactional; ConsumerImplMap consumers; - u_int32_t prefetchSize; - u_int16_t prefetchCount; + uint32_t prefetchSize; + uint16_t prefetchCount; Prefetch outstanding; - u_int32_t framesize; + uint32_t framesize; NameGenerator tagGenerator; std::list<DeliveryRecord> unacked; sys::Mutex deliveryLock; @@ -106,9 +106,9 @@ class Channel : public framing::ChannelAdapter, public: Channel(Connection& parent, framing::ChannelId id, - u_int32_t framesize, + uint32_t framesize, MessageStore* const _store = 0, - u_int64_t stagingThreshold = 0); + uint64_t stagingThreshold = 0); ~Channel(); @@ -118,8 +118,8 @@ class Channel : public framing::ChannelAdapter, void open() { opened = true; } void setDefaultQueue(Queue::shared_ptr queue){ defaultQueue = queue; } Queue::shared_ptr getDefaultQueue() const { return defaultQueue; } - u_int32_t setPrefetchSize(u_int32_t size){ return prefetchSize = size; } - u_int16_t setPrefetchCount(u_int16_t n){ return prefetchCount = n; } + uint32_t setPrefetchSize(uint32_t size){ return prefetchSize = size; } + uint16_t setPrefetchCount(uint16_t n){ return prefetchCount = n; } bool exists(const string& consumerTag); @@ -136,10 +136,10 @@ class Channel : public framing::ChannelAdapter, void commit(); void rollback(); void ack(); - void ack(u_int64_t deliveryTag, bool multiple); - void ack(u_int64_t deliveryTag, u_int64_t endTag); + void ack(uint64_t deliveryTag, bool multiple); + void ack(uint64_t deliveryTag, uint64_t endTag); void recover(bool requeue); - void deliver(Message::shared_ptr& msg, const string& consumerTag, u_int64_t deliveryTag); + void deliver(Message::shared_ptr& msg, const string& consumerTag, uint64_t deliveryTag); void handlePublish(Message* msg); void handleHeader(boost::shared_ptr<framing::AMQHeaderBody>); void handleContent(boost::shared_ptr<framing::AMQContentBody>); diff --git a/cpp/lib/broker/BrokerMessage.cpp b/cpp/lib/broker/BrokerMessage.cpp index bff4492a49..91ba3dfec0 100644 --- a/cpp/lib/broker/BrokerMessage.cpp +++ b/cpp/lib/broker/BrokerMessage.cpp @@ -50,7 +50,7 @@ BasicMessage::BasicMessage( {} // FIXME aconway 2007-02-01: remove. -// BasicMessage::BasicMessage(Buffer& buffer, bool headersOnly, u_int32_t contentChunkSize) : +// BasicMessage::BasicMessage(Buffer& buffer, bool headersOnly, uint32_t contentChunkSize) : // publisher(0), size(0) // { @@ -80,8 +80,8 @@ bool BasicMessage::isComplete(){ } void BasicMessage::deliver(ChannelAdapter& channel, - const string& consumerTag, u_int64_t deliveryTag, - u_int32_t framesize) + const string& consumerTag, uint64_t deliveryTag, + uint32_t framesize) { // CCT -- TODO - Update code generator to take pointer/ not // instance to avoid extra contruction @@ -94,9 +94,9 @@ void BasicMessage::deliver(ChannelAdapter& channel, void BasicMessage::sendGetOk(const MethodContext& context, const std::string& /*destination*/, - u_int32_t messageCount, - u_int64_t deliveryTag, - u_int32_t framesize) + uint32_t messageCount, + uint64_t deliveryTag, + uint32_t framesize) { // CCT -- TODO - Update code generator to take pointer/ not // instance to avoid extra contruction @@ -110,7 +110,7 @@ void BasicMessage::sendGetOk(const MethodContext& context, } void BasicMessage::sendContent( - ChannelAdapter& channel, u_int32_t framesize) + ChannelAdapter& channel, uint32_t framesize) { channel.send(header); Mutex::ScopedLock locker(contentLock); @@ -134,7 +134,7 @@ bool BasicMessage::isPersistent() return props && props->getDeliveryMode() == PERSISTENT; } -void BasicMessage::decode(Buffer& buffer, bool headersOnly, u_int32_t contentChunkSize) +void BasicMessage::decode(Buffer& buffer, bool headersOnly, uint32_t contentChunkSize) { decodeHeader(buffer); if (!headersOnly) decodeContent(buffer, contentChunkSize); @@ -149,15 +149,15 @@ void BasicMessage::decodeHeader(Buffer& buffer) buffer.getShortString(routingKey); setRouting(exchange, routingKey); - u_int32_t headerSize = buffer.getLong(); + uint32_t headerSize = buffer.getLong(); AMQHeaderBody::shared_ptr headerBody(new AMQHeaderBody()); headerBody->decode(buffer, headerSize); setHeader(headerBody); } -void BasicMessage::decodeContent(Buffer& buffer, u_int32_t chunkSize) +void BasicMessage::decodeContent(Buffer& buffer, uint32_t chunkSize) { - u_int64_t expected = expectedContentSize(); + uint64_t expected = expectedContentSize(); if (expected != buffer.available()) { std::cout << "WARN: Expected " << expectedContentSize() << " bytes, got " << buffer.available() << std::endl; throw Exception("Cannot decode content, buffer not large enough."); @@ -167,9 +167,9 @@ void BasicMessage::decodeContent(Buffer& buffer, u_int32_t chunkSize) chunkSize = expected; } - u_int64_t total = 0; + uint64_t total = 0; while (total < expectedContentSize()) { - u_int64_t remaining = expected - total; + uint64_t remaining = expected - total; AMQContentBody::shared_ptr contentBody(new AMQContentBody()); contentBody->decode(buffer, remaining < chunkSize ? remaining : chunkSize); addContent(contentBody); @@ -197,25 +197,25 @@ void BasicMessage::encodeContent(Buffer& buffer) if (content.get()) content->encode(buffer); } -u_int32_t BasicMessage::encodedSize() +uint32_t BasicMessage::encodedSize() { return encodedHeaderSize() + encodedContentSize(); } -u_int32_t BasicMessage::encodedContentSize() +uint32_t BasicMessage::encodedContentSize() { Mutex::ScopedLock locker(contentLock); return content.get() ? content->size() : 0; } -u_int32_t BasicMessage::encodedHeaderSize() +uint32_t BasicMessage::encodedHeaderSize() { return getExchange().size() + 1 + getRoutingKey().size() + 1 + header->size() + 4;//4 extra bytes for size } -u_int64_t BasicMessage::expectedContentSize() +uint64_t BasicMessage::expectedContentSize() { return header.get() ? header->getContentSize() : 0; } diff --git a/cpp/lib/broker/BrokerMessage.h b/cpp/lib/broker/BrokerMessage.h index 871514e55f..fcb104edbb 100644 --- a/cpp/lib/broker/BrokerMessage.h +++ b/cpp/lib/broker/BrokerMessage.h @@ -54,9 +54,9 @@ class BasicMessage : public Message { boost::shared_ptr<framing::AMQHeaderBody> header; std::auto_ptr<Content> content; sys::Mutex contentLock; - u_int64_t size; + uint64_t size; - void sendContent(framing::ChannelAdapter&, u_int32_t framesize); + void sendContent(framing::ChannelAdapter&, uint32_t framesize); public: typedef boost::shared_ptr<BasicMessage> shared_ptr; @@ -73,24 +73,24 @@ class BasicMessage : public Message { void deliver(framing::ChannelAdapter&, const string& consumerTag, - u_int64_t deliveryTag, - u_int32_t framesize); + uint64_t deliveryTag, + uint32_t framesize); void sendGetOk(const framing::MethodContext&, const std::string& destination, - u_int32_t messageCount, - u_int64_t deliveryTag, - u_int32_t framesize); + uint32_t messageCount, + uint64_t deliveryTag, + uint32_t framesize); framing::BasicHeaderProperties* getHeaderProperties(); const framing::FieldTable& getApplicationHeaders(); bool isPersistent(); - u_int64_t contentSize() const { return size; } + uint64_t contentSize() const { return size; } void decode(framing::Buffer& buffer, bool headersOnly = false, - u_int32_t contentChunkSize = 0); + uint32_t contentChunkSize = 0); void decodeHeader(framing::Buffer& buffer); - void decodeContent(framing::Buffer& buffer, u_int32_t contentChunkSize = 0); + void decodeContent(framing::Buffer& buffer, uint32_t contentChunkSize = 0); void encode(framing::Buffer& buffer); void encodeHeader(framing::Buffer& buffer); @@ -99,18 +99,18 @@ class BasicMessage : public Message { * @returns the size of the buffer needed to encode this * message in its entirety */ - u_int32_t encodedSize(); + uint32_t encodedSize(); /** * @returns the size of the buffer needed to encode the * 'header' of this message (not just the header frame, * but other meta data e.g.routing key and exchange) */ - u_int32_t encodedHeaderSize(); + uint32_t encodedHeaderSize(); /** * @returns the size of the buffer needed to encode the * (possibly partial) content held by this message */ - u_int32_t encodedContentSize(); + uint32_t encodedContentSize(); /** * Releases the in-memory content data held by this * message. Must pass in a store from which the data can @@ -121,7 +121,7 @@ class BasicMessage : public Message { * If headers have been received, returns the expected * content size else returns 0. */ - u_int64_t expectedContentSize(); + uint64_t expectedContentSize(); /** * Sets the 'content' implementation of this message (the * message controls the lifecycle of the content instance diff --git a/cpp/lib/broker/BrokerMessageBase.h b/cpp/lib/broker/BrokerMessageBase.h index 3bba95a5f8..709369ae2f 100644 --- a/cpp/lib/broker/BrokerMessageBase.h +++ b/cpp/lib/broker/BrokerMessageBase.h @@ -82,13 +82,13 @@ class Message { // Accessors const std::string& getRoutingKey() const { return routingKey; } const std::string& getExchange() const { return exchange; } - u_int64_t getPersistenceId() const { return persistenceId; } + uint64_t getPersistenceId() const { return persistenceId; } bool getRedelivered() const { return redelivered; } AMQMethodBodyPtr getRespondTo() const { return respondTo; } void setRouting(const std::string& _exchange, const std::string& _routingKey) { exchange = _exchange; routingKey = _routingKey; } - void setPersistenceId(u_int64_t _persistenceId) { persistenceId = _persistenceId; } // XXXX: Only used in tests? + void setPersistenceId(uint64_t _persistenceId) { persistenceId = _persistenceId; } // XXXX: Only used in tests? void redeliver() { redelivered = true; } /** @@ -96,20 +96,20 @@ class Message { */ virtual void deliver(framing::ChannelAdapter& channel, const std::string& consumerTag, - u_int64_t deliveryTag, - u_int32_t framesize) = 0; + uint64_t deliveryTag, + uint32_t framesize) = 0; /** * Used to return a message in response to a get from a queue */ virtual void sendGetOk(const framing::MethodContext& context, const std::string& destination, - u_int32_t messageCount, - u_int64_t deliveryTag, - u_int32_t framesize) = 0; + uint32_t messageCount, + uint64_t deliveryTag, + uint32_t framesize) = 0; virtual bool isComplete() = 0; - virtual u_int64_t contentSize() const = 0; + virtual uint64_t contentSize() const = 0; // FIXME aconway 2007-02-06: Get rid of BasicHeaderProperties // at this level. Expose only generic properties available from both // message types (e.g. getApplicationHeaders below). @@ -130,7 +130,7 @@ class Message { * * XXXX: Only used in tests? */ - virtual u_int32_t encodedSize() = 0; + virtual uint32_t encodedSize() = 0; /** * @returns the size of the buffer needed to encode the * 'header' of this message (not just the header frame, @@ -138,17 +138,17 @@ class Message { * * XXXX: Only used in tests? */ - virtual u_int32_t encodedHeaderSize() = 0; + virtual uint32_t encodedHeaderSize() = 0; /** * @returns the size of the buffer needed to encode the * (possibly partial) content held by this message */ - virtual u_int32_t encodedContentSize() = 0; + virtual uint32_t encodedContentSize() = 0; /** * If headers have been received, returns the expected * content size else returns 0. */ - virtual u_int64_t expectedContentSize() = 0; + virtual uint64_t expectedContentSize() = 0; // TODO: AMS 29/1/2007 Don't think these are really part of base class @@ -173,7 +173,7 @@ class Message { std::string routingKey; const bool mandatory; const bool immediate; - u_int64_t persistenceId; + uint64_t persistenceId; bool redelivered; AMQMethodBodyPtr respondTo; }; diff --git a/cpp/lib/broker/BrokerMessageMessage.cpp b/cpp/lib/broker/BrokerMessageMessage.cpp index 72efe6ea40..3449078d70 100644 --- a/cpp/lib/broker/BrokerMessageMessage.cpp +++ b/cpp/lib/broker/BrokerMessageMessage.cpp @@ -65,7 +65,7 @@ MessageMessage::MessageMessage( void MessageMessage::transferMessage( framing::ChannelAdapter& channel, const std::string& consumerTag, - u_int32_t framesize) + uint32_t framesize) { const framing::Content& body = transfer->getBody(); @@ -77,11 +77,11 @@ void MessageMessage::transferMessage( for(Reference::Appends::const_iterator a = reference->getAppends().begin(); a != reference->getAppends().end(); ++a) { - u_int32_t sizeleft = (*a)->size(); + uint32_t sizeleft = (*a)->size(); const string& content = (*a)->getBytes(); // Calculate overhead bytes // Assume that the overhead is constant as the reference name doesn't change - u_int32_t overhead = sizeleft - content.size(); + uint32_t overhead = sizeleft - content.size(); string::size_type contentStart = 0; while (sizeleft) { string::size_type contentSize = sizeleft <= framesize ? sizeleft : framesize-overhead; @@ -167,8 +167,8 @@ void MessageMessage::transferMessage( void MessageMessage::deliver( framing::ChannelAdapter& channel, const std::string& consumerTag, - u_int64_t /*deliveryTag*/, - u_int32_t framesize) + uint64_t /*deliveryTag*/, + uint32_t framesize) { transferMessage(channel, consumerTag, framesize); } @@ -176,9 +176,9 @@ void MessageMessage::deliver( void MessageMessage::sendGetOk( const framing::MethodContext& context, const std::string& destination, - u_int32_t /*messageCount*/, - u_int64_t /*deliveryTag*/, - u_int32_t framesize) + uint32_t /*messageCount*/, + uint64_t /*deliveryTag*/, + uint32_t framesize) { framing::ChannelAdapter* channel = context.channel; transferMessage(*channel, destination, framesize); @@ -189,7 +189,7 @@ bool MessageMessage::isComplete() return true; } -u_int64_t MessageMessage::contentSize() const +uint64_t MessageMessage::contentSize() const { if (transfer->getBody().isInline()) return transfer->getBody().getValue().size(); @@ -211,25 +211,25 @@ bool MessageMessage::isPersistent() return transfer->getDeliveryMode() == PERSISTENT; } -u_int32_t MessageMessage::encodedSize() +uint32_t MessageMessage::encodedSize() { THROW_QPID_ERROR(INTERNAL_ERROR, "Unfinished"); return 0; // FIXME aconway 2007-02-05: } -u_int32_t MessageMessage::encodedHeaderSize() +uint32_t MessageMessage::encodedHeaderSize() { THROW_QPID_ERROR(INTERNAL_ERROR, "Unfinished"); return 0; // FIXME aconway 2007-02-05: } -u_int32_t MessageMessage::encodedContentSize() +uint32_t MessageMessage::encodedContentSize() { THROW_QPID_ERROR(INTERNAL_ERROR, "Unfinished"); return 0; // FIXME aconway 2007-02-05: } -u_int64_t MessageMessage::expectedContentSize() +uint64_t MessageMessage::expectedContentSize() { THROW_QPID_ERROR(INTERNAL_ERROR, "Unfinished"); return 0; // FIXME aconway 2007-02-05: diff --git a/cpp/lib/broker/BrokerMessageMessage.h b/cpp/lib/broker/BrokerMessageMessage.h index 1f2adb79f3..8a2ff3a063 100644 --- a/cpp/lib/broker/BrokerMessageMessage.h +++ b/cpp/lib/broker/BrokerMessageMessage.h @@ -54,31 +54,31 @@ class MessageMessage: public Message{ void deliver(framing::ChannelAdapter& channel, const std::string& consumerTag, - u_int64_t deliveryTag, - u_int32_t framesize); + uint64_t deliveryTag, + uint32_t framesize); void sendGetOk(const framing::MethodContext& context, const std::string& destination, - u_int32_t messageCount, - u_int64_t deliveryTag, - u_int32_t framesize); + uint32_t messageCount, + uint64_t deliveryTag, + uint32_t framesize); bool isComplete(); - u_int64_t contentSize() const; + uint64_t contentSize() const; framing::BasicHeaderProperties* getHeaderProperties(); const framing::FieldTable& getApplicationHeaders(); bool isPersistent(); - u_int32_t encodedSize(); - u_int32_t encodedHeaderSize(); - u_int32_t encodedContentSize(); - u_int64_t expectedContentSize(); + uint32_t encodedSize(); + uint32_t encodedHeaderSize(); + uint32_t encodedContentSize(); + uint64_t expectedContentSize(); private: void transferMessage(framing::ChannelAdapter& channel, const std::string& consumerTag, - u_int32_t framesize); + uint32_t framesize); framing::RequestId requestId; const TransferPtr transfer; diff --git a/cpp/lib/broker/BrokerQueue.cpp b/cpp/lib/broker/BrokerQueue.cpp index 789e652947..31309bd6c5 100644 --- a/cpp/lib/broker/BrokerQueue.cpp +++ b/cpp/lib/broker/BrokerQueue.cpp @@ -32,7 +32,7 @@ using namespace qpid::sys; using namespace qpid::framing; using boost::format; -Queue::Queue(const string& _name, u_int32_t _autodelete, +Queue::Queue(const string& _name, uint32_t _autodelete, MessageStore* const _store, const ConnectionToken* const _owner) : @@ -166,7 +166,7 @@ Message::shared_ptr Queue::dequeue(){ return msg; } -u_int32_t Queue::purge(){ +uint32_t Queue::purge(){ Mutex::ScopedLock locker(lock); int count = messages.size(); while(!messages.empty()) pop(); @@ -189,12 +189,12 @@ void Queue::push(Message::shared_ptr& msg){ } } -u_int32_t Queue::getMessageCount() const{ +uint32_t Queue::getMessageCount() const{ Mutex::ScopedLock locker(lock); return messages.size(); } -u_int32_t Queue::getConsumerCount() const{ +uint32_t Queue::getConsumerCount() const{ Mutex::ScopedLock locker(lock); return consumers.size(); } diff --git a/cpp/lib/broker/BrokerQueue.h b/cpp/lib/broker/BrokerQueue.h index 015b27fe76..12f5815027 100644 --- a/cpp/lib/broker/BrokerQueue.h +++ b/cpp/lib/broker/BrokerQueue.h @@ -58,7 +58,7 @@ namespace qpid { typedef std::queue<Message::shared_ptr> Messages; const string name; - const u_int32_t autodelete; + const uint32_t autodelete; MessageStore* const store; const ConnectionToken* const owner; Consumers consumers; @@ -70,7 +70,7 @@ namespace qpid { mutable qpid::sys::Mutex lock; int64_t lastUsed; Consumer* exclusive; - mutable u_int64_t persistenceId; + mutable uint64_t persistenceId; std::auto_ptr<QueuePolicy> policy; void pop(); @@ -85,7 +85,7 @@ namespace qpid { typedef std::vector<shared_ptr> vector; - Queue(const string& name, u_int32_t autodelete = 0, + Queue(const string& name, uint32_t autodelete = 0, MessageStore* const store = 0, const ConnectionToken* const owner = 0); ~Queue(); @@ -121,14 +121,14 @@ namespace qpid { void dispatch(); void consume(Consumer* c, bool exclusive = false); void cancel(Consumer* c); - u_int32_t purge(); - u_int32_t getMessageCount() const; - u_int32_t getConsumerCount() const; + uint32_t purge(); + uint32_t getMessageCount() const; + uint32_t getConsumerCount() const; inline const string& getName() const { return name; } inline const bool isExclusiveOwner(const ConnectionToken* const o) const { return o == owner; } inline bool hasExclusiveConsumer() const { return exclusive; } - inline u_int64_t getPersistenceId() const { return persistenceId; } - inline void setPersistenceId(u_int64_t _persistenceId) const { persistenceId = _persistenceId; } + inline uint64_t getPersistenceId() const { return persistenceId; } + inline void setPersistenceId(uint64_t _persistenceId) const { persistenceId = _persistenceId; } bool canAutoDelete() const; diff --git a/cpp/lib/broker/Connection.cpp b/cpp/lib/broker/Connection.cpp index 3d9e5cdaf8..ae0114cba9 100644 --- a/cpp/lib/broker/Connection.cpp +++ b/cpp/lib/broker/Connection.cpp @@ -45,7 +45,7 @@ Connection::Connection(ConnectionOutputHandler* out_, Broker& broker_) : {} -Queue::shared_ptr Connection::getQueue(const string& name, u_int16_t channel){ +Queue::shared_ptr Connection::getQueue(const string& name, uint16_t channel){ Queue::shared_ptr queue; if (name.empty()) { queue = getChannel(channel).getDefaultQueue(); @@ -105,7 +105,7 @@ void Connection::closed(){ } } -void Connection::closeChannel(u_int16_t id) { +void Connection::closeChannel(uint16_t id) { ChannelMap::iterator i = channels.find(id); if (i != channels.end()) i->close(); diff --git a/cpp/lib/broker/Connection.h b/cpp/lib/broker/Connection.h index 27faab4967..1314ccbd97 100644 --- a/cpp/lib/broker/Connection.h +++ b/cpp/lib/broker/Connection.h @@ -60,13 +60,13 @@ class Connection : public sys::ConnectionInputHandler, sys::ConnectionOutputHandler& getOutput() const { return *out; } framing::ProtocolVersion getVersion() const { return version; } - u_int32_t getFrameMax() const { return framemax; } - u_int16_t getHeartbeat() const { return heartbeat; } - u_int32_t getTimeout() const { return timeout; } - u_int64_t getStagingThreshold() const { return stagingThreshold; } + uint32_t getFrameMax() const { return framemax; } + uint16_t getHeartbeat() const { return heartbeat; } + uint32_t getTimeout() const { return timeout; } + uint64_t getStagingThreshold() const { return stagingThreshold; } - void setFrameMax(u_int32_t fm) { framemax = fm; } - void setHeartbeat(u_int16_t hb) { heartbeat = hb; } + void setFrameMax(uint32_t fm) { framemax = fm; } + void setHeartbeat(uint16_t hb) { heartbeat = hb; } /** * Get named queue, never returns 0. @@ -74,7 +74,7 @@ class Connection : public sys::ConnectionInputHandler, * @exception: ChannelException if no queue of that name is found. * @exception: ConnectionException if name="" and channel has no default. */ - Queue::shared_ptr getQueue(const string& name, u_int16_t channel); + Queue::shared_ptr getQueue(const string& name, uint16_t channel); Broker& broker; std::vector<Queue::shared_ptr> exclusiveQueues; @@ -95,11 +95,11 @@ class Connection : public sys::ConnectionInputHandler, framing::ProtocolVersion version; ChannelMap channels; sys::ConnectionOutputHandler* out; - u_int32_t framemax; - u_int16_t heartbeat; + uint32_t framemax; + uint16_t heartbeat; framing::AMQP_ClientProxy::Connection* client; - const u_int32_t timeout; //timeout for auto-deleted queues (in ms) - const u_int64_t stagingThreshold; + const uint32_t timeout; //timeout for auto-deleted queues (in ms) + const uint64_t stagingThreshold; }; diff --git a/cpp/lib/broker/Content.h b/cpp/lib/broker/Content.h index 08f205f9c4..b65a454778 100644 --- a/cpp/lib/broker/Content.h +++ b/cpp/lib/broker/Content.h @@ -45,14 +45,14 @@ class Content{ virtual void add(framing::AMQContentBody::shared_ptr data) = 0; /** Total size of content in bytes */ - virtual u_int32_t size() = 0; + virtual uint32_t size() = 0; /** * Iterate over the content calling SendFn for each block. * Subdivide blocks if necessary to ensure each block is * <= framesize bytes long. */ - virtual void send(framing::ChannelAdapter& channel, u_int32_t framesize) = 0; + virtual void send(framing::ChannelAdapter& channel, uint32_t framesize) = 0; //FIXME aconway 2007-02-07: This is inconsistently implemented //find out what is needed. diff --git a/cpp/lib/broker/DeliveryRecord.cpp b/cpp/lib/broker/DeliveryRecord.cpp index 19b01cc312..0d2e5325c5 100644 --- a/cpp/lib/broker/DeliveryRecord.cpp +++ b/cpp/lib/broker/DeliveryRecord.cpp @@ -27,7 +27,7 @@ using std::string; DeliveryRecord::DeliveryRecord(Message::shared_ptr _msg, Queue::shared_ptr _queue, const string _consumerTag, - const u_int64_t _deliveryTag) : msg(_msg), + const uint64_t _deliveryTag) : msg(_msg), queue(_queue), consumerTag(_consumerTag), deliveryTag(_deliveryTag), @@ -35,7 +35,7 @@ DeliveryRecord::DeliveryRecord(Message::shared_ptr _msg, DeliveryRecord::DeliveryRecord(Message::shared_ptr _msg, Queue::shared_ptr _queue, - const u_int64_t _deliveryTag) : msg(_msg), + const uint64_t _deliveryTag) : msg(_msg), queue(_queue), consumerTag(""), deliveryTag(_deliveryTag), @@ -50,7 +50,7 @@ void DeliveryRecord::discard() const{ discard(0, 0); } -bool DeliveryRecord::matches(u_int64_t tag) const{ +bool DeliveryRecord::matches(uint64_t tag) const{ return deliveryTag == tag; } diff --git a/cpp/lib/broker/DeliveryRecord.h b/cpp/lib/broker/DeliveryRecord.h index 01a4024b28..bda2c2ec90 100644 --- a/cpp/lib/broker/DeliveryRecord.h +++ b/cpp/lib/broker/DeliveryRecord.h @@ -39,16 +39,16 @@ namespace qpid { mutable Message::shared_ptr msg; mutable Queue::shared_ptr queue; std::string consumerTag; - u_int64_t deliveryTag; + uint64_t deliveryTag; bool pull; public: - DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue, const std::string consumerTag, const u_int64_t deliveryTag); - DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue, const u_int64_t deliveryTag); + DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue, const std::string consumerTag, const uint64_t deliveryTag); + DeliveryRecord(Message::shared_ptr msg, Queue::shared_ptr queue, const uint64_t deliveryTag); void discard() const; void discard(TransactionContext* ctxt, const std::string* const xid) const; - bool matches(u_int64_t tag) const; + bool matches(uint64_t tag) const; bool coveredBy(const AccumulatedAck* const range) const; void requeue() const; void redeliver(Channel* const) const; diff --git a/cpp/lib/broker/InMemoryContent.cpp b/cpp/lib/broker/InMemoryContent.cpp index a91fe4d66f..3e4ac29486 100644 --- a/cpp/lib/broker/InMemoryContent.cpp +++ b/cpp/lib/broker/InMemoryContent.cpp @@ -31,7 +31,7 @@ void InMemoryContent::add(AMQContentBody::shared_ptr data) content.push_back(data); } -u_int32_t InMemoryContent::size() +uint32_t InMemoryContent::size() { int sum(0); for (content_iterator i = content.begin(); i != content.end(); i++) { @@ -41,17 +41,17 @@ u_int32_t InMemoryContent::size() } // FIXME aconway 2007-02-01: Remove version parameter. -void InMemoryContent::send(ChannelAdapter& channel, u_int32_t framesize) +void InMemoryContent::send(ChannelAdapter& channel, uint32_t framesize) { for (content_iterator i = content.begin(); i != content.end(); i++) { if ((*i)->size() > framesize) { - u_int32_t offset = 0; + uint32_t offset = 0; for (int chunk = (*i)->size() / framesize; chunk > 0; chunk--) { string data = (*i)->getData().substr(offset, framesize); channel.send(new AMQContentBody(data)); offset += framesize; } - u_int32_t remainder = (*i)->size() % framesize; + uint32_t remainder = (*i)->size() % framesize; if (remainder) { string data = (*i)->getData().substr(offset, remainder); channel.send(new AMQContentBody(data)); diff --git a/cpp/lib/broker/InMemoryContent.h b/cpp/lib/broker/InMemoryContent.h index 8308ae4350..7a58ace3a7 100644 --- a/cpp/lib/broker/InMemoryContent.h +++ b/cpp/lib/broker/InMemoryContent.h @@ -34,8 +34,8 @@ namespace qpid { content_list content; public: void add(qpid::framing::AMQContentBody::shared_ptr data); - u_int32_t size(); - void send(framing::ChannelAdapter&, u_int32_t framesize); + uint32_t size(); + void send(framing::ChannelAdapter&, uint32_t framesize); void encode(qpid::framing::Buffer& buffer); }; } diff --git a/cpp/lib/broker/LazyLoadedContent.cpp b/cpp/lib/broker/LazyLoadedContent.cpp index e4ea1333e7..131943b448 100644 --- a/cpp/lib/broker/LazyLoadedContent.cpp +++ b/cpp/lib/broker/LazyLoadedContent.cpp @@ -30,7 +30,7 @@ LazyLoadedContent::~LazyLoadedContent() store->destroy(msg); } -LazyLoadedContent::LazyLoadedContent(MessageStore* const _store, Message* const _msg, u_int64_t _expectedSize) : +LazyLoadedContent::LazyLoadedContent(MessageStore* const _store, Message* const _msg, uint64_t _expectedSize) : store(_store), msg(_msg), expectedSize(_expectedSize) {} void LazyLoadedContent::add(AMQContentBody::shared_ptr data) @@ -38,17 +38,17 @@ void LazyLoadedContent::add(AMQContentBody::shared_ptr data) store->appendContent(msg, data->getData()); } -u_int32_t LazyLoadedContent::size() +uint32_t LazyLoadedContent::size() { return 0;//all content is written as soon as it is added } -void LazyLoadedContent::send(ChannelAdapter& channel, u_int32_t framesize) +void LazyLoadedContent::send(ChannelAdapter& channel, uint32_t framesize) { if (expectedSize > framesize) { - for (u_int64_t offset = 0; offset < expectedSize; offset += framesize) + for (uint64_t offset = 0; offset < expectedSize; offset += framesize) { - u_int64_t remaining = expectedSize - offset; + uint64_t remaining = expectedSize - offset; string data; store->loadContent(msg, data, offset, remaining > framesize ? framesize : remaining); diff --git a/cpp/lib/broker/LazyLoadedContent.h b/cpp/lib/broker/LazyLoadedContent.h index e5fd7c8957..e000a4ef69 100644 --- a/cpp/lib/broker/LazyLoadedContent.h +++ b/cpp/lib/broker/LazyLoadedContent.h @@ -29,17 +29,17 @@ namespace qpid { class LazyLoadedContent : public Content{ MessageStore* const store; Message* const msg; - const u_int64_t expectedSize; + const uint64_t expectedSize; public: LazyLoadedContent( MessageStore* const store, Message* const msg, - u_int64_t expectedSize); + uint64_t expectedSize); ~LazyLoadedContent(); void add(qpid::framing::AMQContentBody::shared_ptr data); - u_int32_t size(); + uint32_t size(); void send( framing::ChannelAdapter&, - u_int32_t framesize); + uint32_t framesize); void encode(qpid::framing::Buffer& buffer); }; } diff --git a/cpp/lib/broker/MessageBuilder.cpp b/cpp/lib/broker/MessageBuilder.cpp index 69e771c793..8bffaef50f 100644 --- a/cpp/lib/broker/MessageBuilder.cpp +++ b/cpp/lib/broker/MessageBuilder.cpp @@ -29,7 +29,7 @@ using std::auto_ptr; MessageBuilder::MessageBuilder(CompletionHandler* _handler, MessageStore* const _store, - u_int64_t _stagingThreshold + uint64_t _stagingThreshold ) : handler(_handler), store(_store), diff --git a/cpp/lib/broker/MessageBuilder.h b/cpp/lib/broker/MessageBuilder.h index f0b90a86cd..30834e1075 100644 --- a/cpp/lib/broker/MessageBuilder.h +++ b/cpp/lib/broker/MessageBuilder.h @@ -37,7 +37,7 @@ namespace qpid { public: MessageBuilder(CompletionHandler* _handler, MessageStore* const store = 0, - u_int64_t stagingThreshold = 0); + uint64_t stagingThreshold = 0); void initialise(Message::shared_ptr& msg); void setHeader(framing::AMQHeaderBody::shared_ptr& header); void addContent(framing::AMQContentBody::shared_ptr& content); @@ -46,7 +46,7 @@ namespace qpid { Message::shared_ptr message; CompletionHandler* handler; MessageStore* const store; - const u_int64_t stagingThreshold; + const uint64_t stagingThreshold; void route(); }; diff --git a/cpp/lib/broker/MessageHandlerImpl.cpp b/cpp/lib/broker/MessageHandlerImpl.cpp index 5d6d682e8b..fa7c10f26c 100644 --- a/cpp/lib/broker/MessageHandlerImpl.cpp +++ b/cpp/lib/broker/MessageHandlerImpl.cpp @@ -105,7 +105,7 @@ MessageHandlerImpl::resume(const MethodContext& context, void MessageHandlerImpl::offset(const MethodContext&, - u_int64_t /*value*/ ) + uint64_t /*value*/ ) { // Shouldn't ever receive this as it is reponse to resume // which is never sent @@ -115,7 +115,7 @@ MessageHandlerImpl::offset(const MethodContext&, void MessageHandlerImpl::consume(const MethodContext& context, - u_int16_t /*ticket*/, + uint16_t /*ticket*/, const string& queueName, const string& destination, bool noLocal, @@ -137,7 +137,7 @@ MessageHandlerImpl::consume(const MethodContext& context, void MessageHandlerImpl::get( const MethodContext& context, - u_int16_t /*ticket*/, + uint16_t /*ticket*/, const string& queueName, const string& destination, bool noAck ) @@ -168,8 +168,8 @@ MessageHandlerImpl::ok(const MethodContext& /*context*/) void MessageHandlerImpl::qos(const MethodContext& context, - u_int32_t prefetchSize, - u_int16_t prefetchCount, + uint32_t prefetchSize, + uint16_t prefetchCount, bool /*global*/ ) { //TODO: handle global @@ -188,7 +188,7 @@ MessageHandlerImpl::recover(const MethodContext& context, void MessageHandlerImpl::reject(const MethodContext& /*context*/, - u_int16_t /*code*/, + uint16_t /*code*/, const string& /*text*/ ) { channel.ack(); @@ -197,15 +197,15 @@ MessageHandlerImpl::reject(const MethodContext& /*context*/, void MessageHandlerImpl::transfer(const MethodContext& context, - u_int16_t /*ticket*/, + uint16_t /*ticket*/, const string& /* destination */, bool /*redelivered*/, bool /*immediate*/, - u_int64_t /*ttl*/, - u_int8_t /*priority*/, - u_int64_t /*timestamp*/, - u_int8_t /*deliveryMode*/, - u_int64_t /*expiration*/, + uint64_t /*ttl*/, + uint8_t /*priority*/, + uint64_t /*timestamp*/, + uint8_t /*deliveryMode*/, + uint64_t /*expiration*/, const string& /*exchangeName*/, const string& /*routingKey*/, const string& /*messageId*/, diff --git a/cpp/lib/broker/MessageHandlerImpl.h b/cpp/lib/broker/MessageHandlerImpl.h index cb7e7e3126..872d429d5c 100644 --- a/cpp/lib/broker/MessageHandlerImpl.h +++ b/cpp/lib/broker/MessageHandlerImpl.h @@ -55,7 +55,7 @@ class MessageHandlerImpl : const std::string& reference ); void consume(const framing::MethodContext&, - u_int16_t ticket, + uint16_t ticket, const std::string& queue, const std::string& destination, bool noLocal, @@ -66,13 +66,13 @@ class MessageHandlerImpl : void empty( const framing::MethodContext& ); void get(const framing::MethodContext&, - u_int16_t ticket, + uint16_t ticket, const std::string& queue, const std::string& destination, bool noAck ); void offset(const framing::MethodContext&, - u_int64_t value ); + uint64_t value ); void ok( const framing::MethodContext& ); @@ -80,15 +80,15 @@ class MessageHandlerImpl : const std::string& reference ); void qos(const framing::MethodContext&, - u_int32_t prefetchSize, - u_int16_t prefetchCount, + uint32_t prefetchSize, + uint16_t prefetchCount, bool global ); void recover(const framing::MethodContext&, bool requeue ); void reject(const framing::MethodContext&, - u_int16_t code, + uint16_t code, const std::string& text ); void resume(const framing::MethodContext&, @@ -96,15 +96,15 @@ class MessageHandlerImpl : const std::string& identifier ); void transfer(const framing::MethodContext&, - u_int16_t ticket, + uint16_t ticket, const std::string& destination, bool redelivered, bool immediate, - u_int64_t ttl, - u_int8_t priority, - u_int64_t timestamp, - u_int8_t deliveryMode, - u_int64_t expiration, + uint64_t ttl, + uint8_t priority, + uint64_t timestamp, + uint8_t deliveryMode, + uint64_t expiration, const std::string& exchange, const std::string& routingKey, const std::string& messageId, diff --git a/cpp/lib/broker/MessageStore.h b/cpp/lib/broker/MessageStore.h index 938f807a67..9e38408886 100644 --- a/cpp/lib/broker/MessageStore.h +++ b/cpp/lib/broker/MessageStore.h @@ -36,7 +36,7 @@ namespace qpid { * disk as it arrives) and will load their data lazily. On * recovery therefore, only the headers should be loaded. */ - u_int64_t stagingThreshold; + uint64_t stagingThreshold; }; /** * An abstraction of the persistent storage for messages. (In @@ -91,7 +91,7 @@ namespace qpid { * content should be loaded, not the headers or related * meta-data). */ - virtual void loadContent(Message* const msg, std::string& data, u_int64_t offset, u_int32_t length) = 0; + virtual void loadContent(Message* const msg, std::string& data, uint64_t offset, uint32_t length) = 0; /** * Enqueues a message, storing the message if it has not diff --git a/cpp/lib/broker/MessageStoreModule.cpp b/cpp/lib/broker/MessageStoreModule.cpp index ccc5501379..676e86f84a 100644 --- a/cpp/lib/broker/MessageStoreModule.cpp +++ b/cpp/lib/broker/MessageStoreModule.cpp @@ -58,7 +58,7 @@ void MessageStoreModule::appendContent(Message* const msg, const std::string& da store->appendContent(msg, data); } -void MessageStoreModule::loadContent(Message* const msg, string& data, u_int64_t offset, u_int32_t length) +void MessageStoreModule::loadContent(Message* const msg, string& data, uint64_t offset, uint32_t length) { store->loadContent(msg, data, offset, length); } diff --git a/cpp/lib/broker/MessageStoreModule.h b/cpp/lib/broker/MessageStoreModule.h index c49e06efa1..27fedbf635 100644 --- a/cpp/lib/broker/MessageStoreModule.h +++ b/cpp/lib/broker/MessageStoreModule.h @@ -42,7 +42,7 @@ namespace qpid { void stage(Message* const msg); void destroy(Message* const msg); void appendContent(Message* const msg, const std::string& data); - void loadContent(Message* const msg, std::string& data, u_int64_t offset, u_int32_t length); + void loadContent(Message* const msg, std::string& data, uint64_t offset, uint32_t length); void enqueue(TransactionContext* ctxt, Message* const msg, const Queue& queue, const string * const xid); void dequeue(TransactionContext* ctxt, Message* const msg, const Queue& queue, const string * const xid); void prepared(const std::string * const xid); diff --git a/cpp/lib/broker/NullMessageStore.cpp b/cpp/lib/broker/NullMessageStore.cpp index 571ca7566b..bcb15c2ae0 100644 --- a/cpp/lib/broker/NullMessageStore.cpp +++ b/cpp/lib/broker/NullMessageStore.cpp @@ -60,7 +60,7 @@ void NullMessageStore::appendContent(Message* const, const string&) if (warn) std::cout << "WARNING: Can't append content. Persistence not enabled." << std::endl; } -void NullMessageStore::loadContent(Message* const, string&, u_int64_t, u_int32_t) +void NullMessageStore::loadContent(Message* const, string&, uint64_t, uint32_t) { if (warn) std::cout << "WARNING: Can't load content. Persistence not enabled." << std::endl; } diff --git a/cpp/lib/broker/NullMessageStore.h b/cpp/lib/broker/NullMessageStore.h index a5dfce504e..705f18ab43 100644 --- a/cpp/lib/broker/NullMessageStore.h +++ b/cpp/lib/broker/NullMessageStore.h @@ -41,7 +41,7 @@ namespace qpid { virtual void stage(Message* const msg); virtual void destroy(Message* const msg); virtual void appendContent(Message* const msg, const std::string& data); - virtual void loadContent(Message* const msg, std::string& data, u_int64_t offset, u_int32_t length); + virtual void loadContent(Message* const msg, std::string& data, uint64_t offset, uint32_t length); virtual void enqueue(TransactionContext* ctxt, Message* const msg, const Queue& queue, const string * const xid); virtual void dequeue(TransactionContext* ctxt, Message* const msg, const Queue& queue, const string * const xid); virtual void prepared(const std::string * const xid); diff --git a/cpp/lib/broker/Prefetch.h b/cpp/lib/broker/Prefetch.h index a1adccaee7..b6d4026c3f 100644 --- a/cpp/lib/broker/Prefetch.h +++ b/cpp/lib/broker/Prefetch.h @@ -30,8 +30,8 @@ namespace qpid { * (i.e. pushed) messages that have acks outstanding. */ struct Prefetch{ - u_int32_t size; - u_int16_t count; + uint32_t size; + uint16_t count; void reset() { size = 0; count = 0; } }; diff --git a/cpp/lib/broker/QueuePolicy.cpp b/cpp/lib/broker/QueuePolicy.cpp index e13fd62fc6..94b86f2bbb 100644 --- a/cpp/lib/broker/QueuePolicy.cpp +++ b/cpp/lib/broker/QueuePolicy.cpp @@ -23,20 +23,20 @@ using namespace qpid::broker; using namespace qpid::framing; -QueuePolicy::QueuePolicy(u_int32_t _maxCount, u_int64_t _maxSize) : +QueuePolicy::QueuePolicy(uint32_t _maxCount, uint64_t _maxSize) : maxCount(_maxCount), maxSize(_maxSize), count(0), size(0) {} QueuePolicy::QueuePolicy(const FieldTable& settings) : maxCount(getInt(settings, maxCountKey, 0)), maxSize(getInt(settings, maxSizeKey, 0)), count(0), size(0) {} -void QueuePolicy::enqueued(u_int64_t _size) +void QueuePolicy::enqueued(uint64_t _size) { if (maxCount) count++; if (maxSize) size += _size; } -void QueuePolicy::dequeued(u_int64_t _size) +void QueuePolicy::dequeued(uint64_t _size) { if (maxCount) count--; if (maxSize) size -= _size; diff --git a/cpp/lib/broker/QueuePolicy.h b/cpp/lib/broker/QueuePolicy.h index 597cfe7ce8..e7688f3e67 100644 --- a/cpp/lib/broker/QueuePolicy.h +++ b/cpp/lib/broker/QueuePolicy.h @@ -30,22 +30,22 @@ namespace qpid { static const std::string maxCountKey; static const std::string maxSizeKey; - const u_int32_t maxCount; - const u_int64_t maxSize; - u_int32_t count; - u_int64_t size; + const uint32_t maxCount; + const uint64_t maxSize; + uint32_t count; + uint64_t size; static int getInt(const qpid::framing::FieldTable& settings, const std::string& key, int defaultValue); public: - QueuePolicy(u_int32_t maxCount, u_int64_t maxSize); + QueuePolicy(uint32_t maxCount, uint64_t maxSize); QueuePolicy(const qpid::framing::FieldTable& settings); - void enqueued(u_int64_t size); - void dequeued(u_int64_t size); + void enqueued(uint64_t size); + void dequeued(uint64_t size); void update(qpid::framing::FieldTable& settings); bool limitExceeded(); - u_int32_t getMaxCount() const { return maxCount; } - u_int64_t getMaxSize() const { return maxSize; } + uint32_t getMaxCount() const { return maxCount; } + uint64_t getMaxSize() const { return maxSize; } }; } } diff --git a/cpp/lib/broker/QueueRegistry.cpp b/cpp/lib/broker/QueueRegistry.cpp index ff2f83b725..d33cd09840 100644 --- a/cpp/lib/broker/QueueRegistry.cpp +++ b/cpp/lib/broker/QueueRegistry.cpp @@ -31,7 +31,7 @@ QueueRegistry::~QueueRegistry(){} std::pair<Queue::shared_ptr, bool> QueueRegistry::declare(const string& declareName, bool durable, - u_int32_t autoDelete, const ConnectionToken* owner) + uint32_t autoDelete, const ConnectionToken* owner) { Mutex::ScopedLock locker(lock); string name = declareName.empty() ? generateName() : declareName; diff --git a/cpp/lib/broker/QueueRegistry.h b/cpp/lib/broker/QueueRegistry.h index 7232024675..079034359e 100644 --- a/cpp/lib/broker/QueueRegistry.h +++ b/cpp/lib/broker/QueueRegistry.h @@ -47,7 +47,7 @@ class QueueRegistry{ * @return The queue and a boolean flag which is true if the queue * was created by this declare call false if it already existed. */ - std::pair<Queue::shared_ptr, bool> declare(const string& name, bool durable = false, u_int32_t autodelete = 0, + std::pair<Queue::shared_ptr, bool> declare(const string& name, bool durable = false, uint32_t autodelete = 0, const ConnectionToken* const owner = 0); /** diff --git a/cpp/lib/broker/Reference.h b/cpp/lib/broker/Reference.h index 7b3a63fca2..e453645a54 100644 --- a/cpp/lib/broker/Reference.h +++ b/cpp/lib/broker/Reference.h @@ -60,7 +60,7 @@ class Reference : id(id_), size(0), registry(reg) {} const std::string& getId() const { return id; } - u_int64_t getSize() const { return size; } + uint64_t getSize() const { return size; } /** Add a message to be completed with this reference */ void addMessage(MessagePtr message) { messages.push_back(message); } @@ -76,7 +76,7 @@ class Reference private: Id id; - u_int64_t size; + uint64_t size; ReferenceRegistry* registry; Messages messages; Appends appends; diff --git a/cpp/lib/client/Basic.cpp b/cpp/lib/client/Basic.cpp index 88d46541f4..4a1cf249a8 100644 --- a/cpp/lib/client/Basic.cpp +++ b/cpp/lib/client/Basic.cpp @@ -123,17 +123,17 @@ void Basic::publish( //break msg up into header frame and content frame(s) and send these channel.send(msg.getHeader()); string data = msg.getData(); - u_int64_t data_length = data.length(); + uint64_t data_length = data.length(); if(data_length > 0){ //frame itself uses 8 bytes - u_int32_t frag_size = channel.connection->getMaxFrameSize() - 8; + uint32_t frag_size = channel.connection->getMaxFrameSize() - 8; if(data_length < frag_size){ channel.send(new AMQContentBody(data)); }else{ - u_int32_t offset = 0; - u_int32_t remaining = data_length - offset; + uint32_t offset = 0; + uint32_t remaining = data_length - offset; while (remaining > 0) { - u_int32_t length = remaining > frag_size ? frag_size : remaining; + uint32_t length = remaining > frag_size ? frag_size : remaining; string frag(data.substr(offset, length)); channel.send(new AMQContentBody(frag)); diff --git a/cpp/lib/client/Basic.h b/cpp/lib/client/Basic.h index e598f5555b..f6ae633ab8 100644 --- a/cpp/lib/client/Basic.h +++ b/cpp/lib/client/Basic.h @@ -168,7 +168,7 @@ class Basic : public sys::Runnable MessageListener* listener; AckMode ackMode; int count; - u_int64_t lastDeliveryTag; + uint64_t lastDeliveryTag; }; typedef std::map<std::string, Consumer> ConsumerMap; diff --git a/cpp/lib/client/ClientChannel.cpp b/cpp/lib/client/ClientChannel.cpp index 24f21d1a30..84aa73e6bc 100644 --- a/cpp/lib/client/ClientChannel.cpp +++ b/cpp/lib/client/ClientChannel.cpp @@ -36,7 +36,7 @@ using namespace qpid::client; using namespace qpid::framing; using namespace qpid::sys; -Channel::Channel(bool _transactional, u_int16_t _prefetch) : +Channel::Channel(bool _transactional, uint16_t _prefetch) : basic(*this), connection(0), prefetch(_prefetch), @@ -87,7 +87,7 @@ void Channel::protocolInit( version, responses.getRequestId(), proposal->getChannelMax(), connection->getMaxFrameSize(), proposal->getHeartbeat())); - u_int16_t heartbeat = proposal->getHeartbeat(); + uint16_t heartbeat = proposal->getHeartbeat(); connection->connector->setReadTimeout(heartbeat * 2); connection->connector->setWriteTimeout(heartbeat); @@ -119,7 +119,7 @@ void Channel::setQos() { // FIXME aconway 2007-02-22: message } -void Channel::setPrefetch(u_int16_t _prefetch){ +void Channel::setPrefetch(uint16_t _prefetch){ prefetch = _prefetch; setQos(); } @@ -243,7 +243,7 @@ void Channel::start(){ // Close called by local application. void Channel::close( - u_int16_t code, const std::string& text, + uint16_t code, const std::string& text, ClassId classId, MethodId methodId) { if (isOpen()) { diff --git a/cpp/lib/client/ClientChannel.h b/cpp/lib/client/ClientChannel.h index 56fdd57d03..3ecab05d0b 100644 --- a/cpp/lib/client/ClientChannel.h +++ b/cpp/lib/client/ClientChannel.h @@ -65,7 +65,7 @@ class Channel : public framing::ChannelAdapter sys::Thread basicDispatcher; ResponseHandler responses; - u_int16_t prefetch; + uint16_t prefetch; const bool transactional; framing::ProtocolVersion version; @@ -122,7 +122,7 @@ class Channel : public framing::ChannelAdapter * messages the channel is willing to have sent to it * asynchronously */ - Channel(bool transactional = false, u_int16_t prefetch = 500); + Channel(bool transactional = false, uint16_t prefetch = 500); ~Channel(); /** @@ -221,9 +221,9 @@ class Channel : public framing::ChannelAdapter /** * Change the prefetch in use. */ - void setPrefetch(u_int16_t prefetch); + void setPrefetch(uint16_t prefetch); - u_int16_t getPrefetch() { return prefetch; } + uint16_t getPrefetch() { return prefetch; } /** * Start message dispatching on a new thread diff --git a/cpp/lib/client/ClientMessage.cpp b/cpp/lib/client/ClientMessage.cpp index bd4adb78f7..f55c4abfe6 100644 --- a/cpp/lib/client/ClientMessage.cpp +++ b/cpp/lib/client/ClientMessage.cpp @@ -55,11 +55,11 @@ FieldTable& Message::getHeaders() const { return getHeaderProperties()->getHeaders(); } -u_int8_t Message::getDeliveryMode() const { +uint8_t Message::getDeliveryMode() const { return getHeaderProperties()->getDeliveryMode(); } -u_int8_t Message::getPriority() const { +uint8_t Message::getPriority() const { return getHeaderProperties()->getPriority(); } @@ -79,7 +79,7 @@ const std::string& Message::getMessageId() const { return getHeaderProperties()->getMessageId(); } -u_int64_t Message::getTimestamp() const { +uint64_t Message::getTimestamp() const { return getHeaderProperties()->getTimestamp(); } @@ -111,11 +111,11 @@ void Message::setHeaders(const FieldTable& headers){ getHeaderProperties()->setHeaders(headers); } -void Message::setDeliveryMode(u_int8_t mode){ +void Message::setDeliveryMode(uint8_t mode){ getHeaderProperties()->setDeliveryMode(mode); } -void Message::setPriority(u_int8_t priority){ +void Message::setPriority(uint8_t priority){ getHeaderProperties()->setPriority(priority); } @@ -135,7 +135,7 @@ void Message::setMessageId(const std::string& messageId){ getHeaderProperties()->setMessageId(messageId); } -void Message::setTimestamp(u_int64_t timestamp){ +void Message::setTimestamp(uint64_t timestamp){ getHeaderProperties()->setTimestamp(timestamp); } @@ -156,7 +156,7 @@ void Message::setClusterId(const std::string& clusterId){ } -u_int64_t Message::getDeliveryTag() const { +uint64_t Message::getDeliveryTag() const { BasicDeliverBody* deliver=dynamic_cast<BasicDeliverBody*>(method.get()); return deliver ? deliver->getDeliveryTag() : 0; } diff --git a/cpp/lib/client/ClientMessage.h b/cpp/lib/client/ClientMessage.h index 0b44d51a47..cb239ed4d6 100644 --- a/cpp/lib/client/ClientMessage.h +++ b/cpp/lib/client/ClientMessage.h @@ -72,18 +72,18 @@ class Message { bool isRedelivered(){ return redelivered; } void setRedelivered(bool _redelivered){ redelivered = _redelivered; } - u_int64_t getDeliveryTag() const; + uint64_t getDeliveryTag() const; const std::string& getContentType() const; const std::string& getContentEncoding() const; qpid::framing::FieldTable& getHeaders() const; - u_int8_t getDeliveryMode() const; - u_int8_t getPriority() const; + uint8_t getDeliveryMode() const; + uint8_t getPriority() const; const std::string& getCorrelationId() const; const std::string& getReplyTo() const; const std::string& getExpiration() const; const std::string& getMessageId() const; - u_int64_t getTimestamp() const; + uint64_t getTimestamp() const; const std::string& getType() const; const std::string& getUserId() const; const std::string& getAppId() const; @@ -95,13 +95,13 @@ class Message { /** * Sets the delivery mode. 1 = non-durable, 2 = durable. */ - void setDeliveryMode(u_int8_t mode); - void setPriority(u_int8_t priority); + void setDeliveryMode(uint8_t mode); + void setPriority(uint8_t priority); void setCorrelationId(const std::string& correlationId); void setReplyTo(const std::string& replyTo); void setExpiration(const std::string& expiration); void setMessageId(const std::string& messageId); - void setTimestamp(u_int64_t timestamp); + void setTimestamp(uint64_t timestamp); void setType(const std::string& type); void setUserId(const std::string& userId); void setAppId(const std::string& appId); diff --git a/cpp/lib/client/Connection.cpp b/cpp/lib/client/Connection.cpp index 566c8fc573..618f3cbc92 100644 --- a/cpp/lib/client/Connection.cpp +++ b/cpp/lib/client/Connection.cpp @@ -41,7 +41,7 @@ namespace client { const std::string Connection::OK("OK"); Connection::Connection( - bool _debug, u_int32_t _max_frame_size, + bool _debug, uint32_t _max_frame_size, framing::ProtocolVersion _version ) : channelIdCounter(0), version(_version), max_frame_size(_max_frame_size), defaultConnector(version, _debug, _max_frame_size), diff --git a/cpp/lib/client/Connection.h b/cpp/lib/client/Connection.h index 4fa95a1439..b4bd311511 100644 --- a/cpp/lib/client/Connection.h +++ b/cpp/lib/client/Connection.h @@ -91,7 +91,7 @@ class Connection : public ConnectionForChannel static const std::string OK; framing::ProtocolVersion version; - const u_int32_t max_frame_size; + const uint32_t max_frame_size; ChannelMap channels; Connector defaultConnector; Connector* connector; @@ -121,7 +121,7 @@ class Connection : public ConnectionForChannel * @param max_frame_size the maximum frame size that the * client will accept. Optional and defaults to 65536. */ - Connection(bool debug = false, u_int32_t max_frame_size = 65536, + Connection(bool debug = false, uint32_t max_frame_size = 65536, framing::ProtocolVersion=framing::highestProtocolVersion); ~Connection(); @@ -182,7 +182,7 @@ class Connection : public ConnectionForChannel /** * @return the maximum frame size in use on this connection */ - inline u_int32_t getMaxFrameSize(){ return max_frame_size; } + inline uint32_t getMaxFrameSize(){ return max_frame_size; } /** @return protocol version in use on this connection. */ framing::ProtocolVersion getVersion() const { return version; } diff --git a/cpp/lib/client/Connector.cpp b/cpp/lib/client/Connector.cpp index ee90e6cd4c..7b73cc016a 100644 --- a/cpp/lib/client/Connector.cpp +++ b/cpp/lib/client/Connector.cpp @@ -31,7 +31,7 @@ using namespace qpid::framing; using qpid::QpidError; Connector::Connector( - ProtocolVersion ver, bool _debug, u_int32_t buffer_size + ProtocolVersion ver, bool _debug, uint32_t buffer_size ) : debug(_debug), receive_buffer_size(buffer_size), send_buffer_size(buffer_size), @@ -131,7 +131,7 @@ void Connector::checkIdle(ssize_t status){ } } -void Connector::setReadTimeout(u_int16_t t){ +void Connector::setReadTimeout(uint16_t t){ idleIn = t * 1000;//t is in secs if(idleIn && (!timeout || idleIn < timeout)){ timeout = idleIn; @@ -140,7 +140,7 @@ void Connector::setReadTimeout(u_int16_t t){ } -void Connector::setWriteTimeout(u_int16_t t){ +void Connector::setWriteTimeout(uint16_t t){ idleOut = t * 1000;//t is in secs if(idleOut && (!timeout || idleOut < timeout)){ timeout = idleOut; diff --git a/cpp/lib/client/Connector.h b/cpp/lib/client/Connector.h index ccac39f849..91234d2321 100644 --- a/cpp/lib/client/Connector.h +++ b/cpp/lib/client/Connector.h @@ -50,8 +50,8 @@ class Connector : public framing::OutputHandler, int64_t lastIn; int64_t lastOut; int64_t timeout; - u_int32_t idleIn; - u_int32_t idleOut; + uint32_t idleIn; + uint32_t idleOut; sys::TimeoutHandler* timeoutHandler; sys::ShutdownHandler* shutdownHandler; @@ -78,7 +78,7 @@ class Connector : public framing::OutputHandler, friend class Channel; public: Connector(framing::ProtocolVersion pVersion, - bool debug = false, u_int32_t buffer_size = 1024); + bool debug = false, uint32_t buffer_size = 1024); virtual ~Connector(); virtual void connect(const std::string& host, int port); virtual void init(); @@ -88,8 +88,8 @@ class Connector : public framing::OutputHandler, virtual void setShutdownHandler(sys::ShutdownHandler* handler); virtual framing::OutputHandler* getOutputHandler(); virtual void send(framing::AMQFrame* frame); - virtual void setReadTimeout(u_int16_t timeout); - virtual void setWriteTimeout(u_int16_t timeout); + virtual void setReadTimeout(uint16_t timeout); + virtual void setWriteTimeout(uint16_t timeout); }; }} diff --git a/cpp/lib/client/MethodBodyInstances.h b/cpp/lib/client/MethodBodyInstances.h index 3ab0c9af8f..acbeeb1158 100644 --- a/cpp/lib/client/MethodBodyInstances.h +++ b/cpp/lib/client/MethodBodyInstances.h @@ -61,7 +61,7 @@ public: const qpid::framing::TxRollbackOkBody tx_rollback_ok; const qpid::framing::TxSelectOkBody tx_select_ok; - MethodBodyInstances(u_int8_t major, u_int8_t minor) : + MethodBodyInstances(uint8_t major, uint8_t minor) : version(major, minor), basic_cancel_ok(version), basic_consume_ok(version), diff --git a/cpp/lib/common/framing/AMQBody.h b/cpp/lib/common/framing/AMQBody.h index 8b8e1a729d..26076956ca 100644 --- a/cpp/lib/common/framing/AMQBody.h +++ b/cpp/lib/common/framing/AMQBody.h @@ -34,10 +34,10 @@ namespace qpid { typedef boost::shared_ptr<AMQBody> shared_ptr; virtual ~AMQBody(); - virtual u_int32_t size() const = 0; - virtual u_int8_t type() const = 0; + virtual uint32_t size() const = 0; + virtual uint8_t type() const = 0; virtual void encode(Buffer& buffer) const = 0; - virtual void decode(Buffer& buffer, u_int32_t size) = 0; + virtual void decode(Buffer& buffer, uint32_t size) = 0; virtual void print(std::ostream& out) const = 0; }; diff --git a/cpp/lib/common/framing/AMQContentBody.cpp b/cpp/lib/common/framing/AMQContentBody.cpp index 4f51dca243..573c17dade 100644 --- a/cpp/lib/common/framing/AMQContentBody.cpp +++ b/cpp/lib/common/framing/AMQContentBody.cpp @@ -27,13 +27,13 @@ qpid::framing::AMQContentBody::AMQContentBody(){ qpid::framing::AMQContentBody::AMQContentBody(const string& _data) : data(_data){ } -u_int32_t qpid::framing::AMQContentBody::size() const{ +uint32_t qpid::framing::AMQContentBody::size() const{ return data.size(); } void qpid::framing::AMQContentBody::encode(Buffer& buffer) const{ buffer.putRawData(data); } -void qpid::framing::AMQContentBody::decode(Buffer& buffer, u_int32_t _size){ +void qpid::framing::AMQContentBody::decode(Buffer& buffer, uint32_t _size){ buffer.getRawData(data, _size); } diff --git a/cpp/lib/common/framing/AMQContentBody.h b/cpp/lib/common/framing/AMQContentBody.h index a324f1ab21..c9fa7cde5c 100644 --- a/cpp/lib/common/framing/AMQContentBody.h +++ b/cpp/lib/common/framing/AMQContentBody.h @@ -38,11 +38,11 @@ public: AMQContentBody(); AMQContentBody(const string& data); inline virtual ~AMQContentBody(){} - inline u_int8_t type() const { return CONTENT_BODY; }; + inline uint8_t type() const { return CONTENT_BODY; }; inline string& getData(){ return data; } - u_int32_t size() const; + uint32_t size() const; void encode(Buffer& buffer) const; - void decode(Buffer& buffer, u_int32_t size); + void decode(Buffer& buffer, uint32_t size); void print(std::ostream& out) const; }; diff --git a/cpp/lib/common/framing/AMQDataBlock.h b/cpp/lib/common/framing/AMQDataBlock.h index ac91c52164..2a6f843f1e 100644 --- a/cpp/lib/common/framing/AMQDataBlock.h +++ b/cpp/lib/common/framing/AMQDataBlock.h @@ -32,7 +32,7 @@ public: virtual ~AMQDataBlock() {} virtual void encode(Buffer& buffer) = 0; virtual bool decode(Buffer& buffer) = 0; - virtual u_int32_t size() const = 0; + virtual uint32_t size() const = 0; }; } diff --git a/cpp/lib/common/framing/AMQFrame.cpp b/cpp/lib/common/framing/AMQFrame.cpp index 4e061af2e1..bc9061b169 100644 --- a/cpp/lib/common/framing/AMQFrame.cpp +++ b/cpp/lib/common/framing/AMQFrame.cpp @@ -39,17 +39,17 @@ version(_version) assert(version != ProtocolVersion(0,0)); } -AMQFrame::AMQFrame(ProtocolVersion _version, u_int16_t _channel, AMQBody* _body) : +AMQFrame::AMQFrame(ProtocolVersion _version, uint16_t _channel, AMQBody* _body) : version(_version), channel(_channel), body(_body) {} -AMQFrame::AMQFrame(ProtocolVersion _version, u_int16_t _channel, const AMQBody::shared_ptr& _body) : +AMQFrame::AMQFrame(ProtocolVersion _version, uint16_t _channel, const AMQBody::shared_ptr& _body) : version(_version), channel(_channel), body(_body) {} AMQFrame::~AMQFrame() {} -u_int16_t AMQFrame::getChannel(){ +uint16_t AMQFrame::getChannel(){ return channel; } @@ -66,7 +66,7 @@ void AMQFrame::encode(Buffer& buffer) buffer.putOctet(0xCE); } -u_int32_t AMQFrame::size() const{ +uint32_t AMQFrame::size() const{ assert(body.get()); return 1/*type*/ + 2/*channel*/ + 4/*body size*/ + body->size() + 1/*0xCE*/; @@ -77,18 +77,18 @@ bool AMQFrame::decode(Buffer& buffer) if(buffer.available() < 7) return false; buffer.record(); - u_int32_t frameSize = decodeHead(buffer); + uint32_t frameSize = decodeHead(buffer); if(buffer.available() < frameSize + 1){ buffer.restore(); return false; } decodeBody(buffer, frameSize); - u_int8_t end = buffer.getOctet(); + uint8_t end = buffer.getOctet(); if(end != 0xCE) THROW_QPID_ERROR(FRAMING_ERROR, "Frame end not found"); return true; } -u_int32_t AMQFrame::decodeHead(Buffer& buffer){ +uint32_t AMQFrame::decodeHead(Buffer& buffer){ type = buffer.getOctet(); channel = buffer.getShort(); return buffer.getLong(); diff --git a/cpp/lib/common/framing/AMQFrame.h b/cpp/lib/common/framing/AMQFrame.h index 4e49b8871f..0c18e0c2a5 100644 --- a/cpp/lib/common/framing/AMQFrame.h +++ b/cpp/lib/common/framing/AMQFrame.h @@ -42,13 +42,13 @@ class AMQFrame : public AMQDataBlock { public: AMQFrame(ProtocolVersion _version = highestProtocolVersion); - AMQFrame(ProtocolVersion _version, u_int16_t channel, AMQBody* body); - AMQFrame(ProtocolVersion _version, u_int16_t channel, const AMQBody::shared_ptr& body); + AMQFrame(ProtocolVersion _version, uint16_t channel, AMQBody* body); + AMQFrame(ProtocolVersion _version, uint16_t channel, const AMQBody::shared_ptr& body); virtual ~AMQFrame(); virtual void encode(Buffer& buffer); virtual bool decode(Buffer& buffer); - virtual u_int32_t size() const; - u_int16_t getChannel(); + virtual uint32_t size() const; + uint16_t getChannel(); AMQBody::shared_ptr getBody(); /** Convenience template to cast the body to an expected type */ @@ -57,15 +57,15 @@ class AMQFrame : public AMQDataBlock boost::static_pointer_cast<T>(getBody()); } - u_int32_t decodeHead(Buffer& buffer); + uint32_t decodeHead(Buffer& buffer); void decodeBody(Buffer& buffer, uint32_t size); private: static AMQP_MethodVersionMap versionMap; ProtocolVersion version; - u_int16_t channel; - u_int8_t type; + uint16_t channel; + uint8_t type; AMQBody::shared_ptr body; diff --git a/cpp/lib/common/framing/AMQHeaderBody.cpp b/cpp/lib/common/framing/AMQHeaderBody.cpp index 3653073f29..3ddae4eebf 100644 --- a/cpp/lib/common/framing/AMQHeaderBody.cpp +++ b/cpp/lib/common/framing/AMQHeaderBody.cpp @@ -33,7 +33,7 @@ qpid::framing::AMQHeaderBody::~AMQHeaderBody(){ delete properties; } -u_int32_t qpid::framing::AMQHeaderBody::size() const{ +uint32_t qpid::framing::AMQHeaderBody::size() const{ return 12 + properties->size(); } @@ -44,8 +44,8 @@ void qpid::framing::AMQHeaderBody::encode(Buffer& buffer) const { properties->encode(buffer); } -void qpid::framing::AMQHeaderBody::decode(Buffer& buffer, u_int32_t bufSize){ - u_int16_t classId = buffer.getShort(); +void qpid::framing::AMQHeaderBody::decode(Buffer& buffer, uint32_t bufSize){ + uint16_t classId = buffer.getShort(); weight = buffer.getShort(); contentSize = buffer.getLongLong(); createProperties(classId); diff --git a/cpp/lib/common/framing/AMQHeaderBody.h b/cpp/lib/common/framing/AMQHeaderBody.h index 77f56d9a93..d57f93aacd 100644 --- a/cpp/lib/common/framing/AMQHeaderBody.h +++ b/cpp/lib/common/framing/AMQHeaderBody.h @@ -32,8 +32,8 @@ namespace framing { class AMQHeaderBody : public AMQBody { HeaderProperties* properties; - u_int16_t weight; - u_int64_t contentSize; + uint16_t weight; + uint64_t contentSize; void createProperties(int classId); public: @@ -41,15 +41,15 @@ public: AMQHeaderBody(int classId); AMQHeaderBody(); - inline u_int8_t type() const { return HEADER_BODY; } + inline uint8_t type() const { return HEADER_BODY; } HeaderProperties* getProperties(){ return properties; } const HeaderProperties* getProperties() const { return properties; } - inline u_int64_t getContentSize() const { return contentSize; } - inline void setContentSize(u_int64_t _size) { contentSize = _size; } + inline uint64_t getContentSize() const { return contentSize; } + inline void setContentSize(uint64_t _size) { contentSize = _size; } virtual ~AMQHeaderBody(); - virtual u_int32_t size() const; + virtual uint32_t size() const; virtual void encode(Buffer& buffer) const; - virtual void decode(Buffer& buffer, u_int32_t size); + virtual void decode(Buffer& buffer, uint32_t size); virtual void print(std::ostream& out) const; }; diff --git a/cpp/lib/common/framing/AMQHeartbeatBody.h b/cpp/lib/common/framing/AMQHeartbeatBody.h index 20a954c468..a3e9d823f1 100644 --- a/cpp/lib/common/framing/AMQHeartbeatBody.h +++ b/cpp/lib/common/framing/AMQHeartbeatBody.h @@ -34,10 +34,10 @@ public: typedef boost::shared_ptr<AMQHeartbeatBody> shared_ptr; virtual ~AMQHeartbeatBody(); - inline u_int32_t size() const { return 0; } - inline u_int8_t type() const { return HEARTBEAT_BODY; } + inline uint32_t size() const { return 0; } + inline uint8_t type() const { return HEARTBEAT_BODY; } inline void encode(Buffer& ) const {} - inline void decode(Buffer& , u_int32_t /*size*/) {} + inline void decode(Buffer& , uint32_t /*size*/) {} virtual void print(std::ostream& out) const; }; diff --git a/cpp/lib/common/framing/AMQMethodBody.cpp b/cpp/lib/common/framing/AMQMethodBody.cpp index ab1e15f845..23502068f5 100644 --- a/cpp/lib/common/framing/AMQMethodBody.cpp +++ b/cpp/lib/common/framing/AMQMethodBody.cpp @@ -52,7 +52,7 @@ void AMQMethodBody::ClassMethodId::decode(Buffer& buffer) { methodId = buffer.getShort(); } -void AMQMethodBody::decode(Buffer& buffer, u_int32_t /*size*/) { +void AMQMethodBody::decode(Buffer& buffer, uint32_t /*size*/) { decodeContent(buffer); } diff --git a/cpp/lib/common/framing/AMQMethodBody.h b/cpp/lib/common/framing/AMQMethodBody.h index 9b39a3d721..c2b00c2169 100644 --- a/cpp/lib/common/framing/AMQMethodBody.h +++ b/cpp/lib/common/framing/AMQMethodBody.h @@ -42,11 +42,11 @@ class AMQMethodBody : public AMQBody AMQP_MethodVersionMap& map, ProtocolVersion version, Buffer& buf); ProtocolVersion version; - u_int8_t type() const { return METHOD_BODY; } - AMQMethodBody(u_int8_t major, u_int8_t minor) : version(major, minor) {} + uint8_t type() const { return METHOD_BODY; } + AMQMethodBody(uint8_t major, uint8_t minor) : version(major, minor) {} AMQMethodBody(ProtocolVersion ver) : version(ver) {} virtual ~AMQMethodBody() {} - void decode(Buffer&, u_int32_t); + void decode(Buffer&, uint32_t); virtual MethodId amqpMethodId() const = 0; virtual ClassId amqpClassId() const = 0; @@ -64,11 +64,11 @@ class AMQMethodBody : public AMQBody virtual bool isResponse() const { return false; } protected: - static u_int32_t baseSize() { return 4; } + static uint32_t baseSize() { return 4; } struct ClassMethodId { - u_int16_t classId; - u_int16_t methodId; + uint16_t classId; + uint16_t methodId; void decode(Buffer& b); }; diff --git a/cpp/lib/common/framing/AMQRequestBody.h b/cpp/lib/common/framing/AMQRequestBody.h index d9eb78c26f..e184fff1d6 100644 --- a/cpp/lib/common/framing/AMQRequestBody.h +++ b/cpp/lib/common/framing/AMQRequestBody.h @@ -53,7 +53,7 @@ class AMQRequestBody : public AMQMethodBody AMQRequestBody(ProtocolVersion v, RequestId id=0, ResponseId mark=0) : AMQMethodBody(v), data(id, mark) {} - u_int8_t type() const { return REQUEST_BODY; } + uint8_t type() const { return REQUEST_BODY; } void encode(Buffer& buffer) const; Data& getData() { return data; } @@ -64,7 +64,7 @@ class AMQRequestBody : public AMQMethodBody bool isRequest()const { return true; } protected: - static const u_int32_t baseSize() { return AMQMethodBody::baseSize()+20; } + static const uint32_t baseSize() { return AMQMethodBody::baseSize()+20; } void printPrefix(std::ostream& out) const; private: diff --git a/cpp/lib/common/framing/AMQResponseBody.h b/cpp/lib/common/framing/AMQResponseBody.h index 5ed76ff67d..fa381baddd 100644 --- a/cpp/lib/common/framing/AMQResponseBody.h +++ b/cpp/lib/common/framing/AMQResponseBody.h @@ -41,9 +41,9 @@ class AMQResponseBody : public AMQMethodBody void encode(Buffer&) const; void decode(Buffer&); - u_int64_t responseId; - u_int64_t requestId; - u_int32_t batchOffset; + uint64_t responseId; + uint64_t requestId; + uint32_t batchOffset; }; static Data& getData(const AMQBody::shared_ptr& body) { @@ -58,7 +58,7 @@ class AMQResponseBody : public AMQMethodBody ProtocolVersion v, ResponseId id=0, RequestId req=0, BatchOffset off=0) : AMQMethodBody(v), data(id, req, off) {} - u_int8_t type() const { return RESPONSE_BODY; } + uint8_t type() const { return RESPONSE_BODY; } void encode(Buffer& buffer) const; Data& getData() { return data; } @@ -71,7 +71,7 @@ class AMQResponseBody : public AMQMethodBody bool isResponse() const { return true; } protected: - static const u_int32_t baseSize() { return AMQMethodBody::baseSize()+20; } + static const uint32_t baseSize() { return AMQMethodBody::baseSize()+20; } void printPrefix(std::ostream& out) const; private: diff --git a/cpp/lib/common/framing/BasicHeaderProperties.cpp b/cpp/lib/common/framing/BasicHeaderProperties.cpp index f673215536..930ec9f4dd 100644 --- a/cpp/lib/common/framing/BasicHeaderProperties.cpp +++ b/cpp/lib/common/framing/BasicHeaderProperties.cpp @@ -25,8 +25,8 @@ qpid::framing::BasicHeaderProperties::BasicHeaderProperties() : deliveryMode(0), priority(0), timestamp(0){} qpid::framing::BasicHeaderProperties::~BasicHeaderProperties(){} -u_int32_t qpid::framing::BasicHeaderProperties::size() const{ - u_int32_t bytes = 2;//flags +uint32_t qpid::framing::BasicHeaderProperties::size() const{ + uint32_t bytes = 2;//flags if(contentType.length() > 0) bytes += contentType.length() + 1; if(contentEncoding.length() > 0) bytes += contentEncoding.length() + 1; if(headers.count() > 0) bytes += headers.size(); @@ -46,7 +46,7 @@ u_int32_t qpid::framing::BasicHeaderProperties::size() const{ } void qpid::framing::BasicHeaderProperties::encode(qpid::framing::Buffer& buffer) const{ - u_int16_t flags = getFlags(); + uint16_t flags = getFlags(); buffer.putShort(flags); if(contentType.length() > 0) buffer.putShortString(contentType); @@ -65,8 +65,8 @@ void qpid::framing::BasicHeaderProperties::encode(qpid::framing::Buffer& buffer) if(clusterId.length() > 0) buffer.putShortString(clusterId); } -void qpid::framing::BasicHeaderProperties::decode(qpid::framing::Buffer& buffer, u_int32_t /*size*/){ - u_int16_t flags = buffer.getShort(); +void qpid::framing::BasicHeaderProperties::decode(qpid::framing::Buffer& buffer, uint32_t /*size*/){ + uint16_t flags = buffer.getShort(); if(flags & (1 << 15)) buffer.getShortString(contentType); if(flags & (1 << 14)) buffer.getShortString(contentEncoding); if(flags & (1 << 13)) buffer.getFieldTable(headers); @@ -83,8 +83,8 @@ void qpid::framing::BasicHeaderProperties::decode(qpid::framing::Buffer& buffer, if(flags & (1 << 2)) buffer.getShortString(clusterId); } -u_int16_t qpid::framing::BasicHeaderProperties::getFlags() const{ - u_int16_t flags(0); +uint16_t qpid::framing::BasicHeaderProperties::getFlags() const{ + uint16_t flags(0); if(contentType.length() > 0) flags |= (1 << 15); if(contentEncoding.length() > 0) flags |= (1 << 14); if(headers.count() > 0) flags |= (1 << 13); diff --git a/cpp/lib/common/framing/BasicHeaderProperties.h b/cpp/lib/common/framing/BasicHeaderProperties.h index bcd81b4776..1f3fd31250 100644 --- a/cpp/lib/common/framing/BasicHeaderProperties.h +++ b/cpp/lib/common/framing/BasicHeaderProperties.h @@ -36,39 +36,39 @@ namespace framing { string contentType; string contentEncoding; FieldTable headers; - u_int8_t deliveryMode; - u_int8_t priority; + uint8_t deliveryMode; + uint8_t priority; string correlationId; string replyTo; string expiration; string messageId; - u_int64_t timestamp; + uint64_t timestamp; string type; string userId; string appId; string clusterId; - u_int16_t getFlags() const; + uint16_t getFlags() const; public: BasicHeaderProperties(); virtual ~BasicHeaderProperties(); - virtual u_int32_t size() const; + virtual uint32_t size() const; virtual void encode(Buffer& buffer) const; - virtual void decode(Buffer& buffer, u_int32_t size); + virtual void decode(Buffer& buffer, uint32_t size); - inline virtual u_int8_t classId() { return BASIC; } + inline virtual uint8_t classId() { return BASIC; } inline const string& getContentType() const { return contentType; } inline const string& getContentEncoding() const { return contentEncoding; } inline FieldTable& getHeaders() { return headers; } - inline u_int8_t getDeliveryMode() const { return deliveryMode; } - inline u_int8_t getPriority() const { return priority; } + inline uint8_t getDeliveryMode() const { return deliveryMode; } + inline uint8_t getPriority() const { return priority; } inline const string& getCorrelationId() const {return correlationId; } inline const string& getReplyTo() const { return replyTo; } inline const string& getExpiration() const { return expiration; } inline const string& getMessageId() const {return messageId; } - inline u_int64_t getTimestamp() const { return timestamp; } + inline uint64_t getTimestamp() const { return timestamp; } inline const string& getType() const { return type; } inline const string& getUserId() const { return userId; } inline const string& getAppId() const { return appId; } @@ -77,13 +77,13 @@ namespace framing { void inline setContentType(const string& _type){ contentType = _type; } void inline setContentEncoding(const string& encoding){ contentEncoding = encoding; } void inline setHeaders(const FieldTable& _headers){ headers = _headers; } - void inline setDeliveryMode(u_int8_t mode){ deliveryMode = mode; } - void inline setPriority(u_int8_t _priority){ priority = _priority; } + void inline setDeliveryMode(uint8_t mode){ deliveryMode = mode; } + void inline setPriority(uint8_t _priority){ priority = _priority; } void inline setCorrelationId(const string& _correlationId){ correlationId = _correlationId; } void inline setReplyTo(const string& _replyTo){ replyTo = _replyTo;} void inline setExpiration(const string& _expiration){ expiration = _expiration; } void inline setMessageId(const string& _messageId){ messageId = _messageId; } - void inline setTimestamp(u_int64_t _timestamp){ timestamp = _timestamp; } + void inline setTimestamp(uint64_t _timestamp){ timestamp = _timestamp; } void inline setType(const string& _type){ type = _type; } void inline setUserId(const string& _userId){ userId = _userId; } void inline setAppId(const string& _appId){appId = _appId; } diff --git a/cpp/lib/common/framing/Buffer.cpp b/cpp/lib/common/framing/Buffer.cpp index 43815c2f1d..52c9a42d55 100644 --- a/cpp/lib/common/framing/Buffer.cpp +++ b/cpp/lib/common/framing/Buffer.cpp @@ -22,11 +22,11 @@ #include <FramingContent.h> #include <FieldTable.h> -qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), owner(true), position(0), limit(_size){ +qpid::framing::Buffer::Buffer(uint32_t _size) : size(_size), owner(true), position(0), limit(_size){ data = new char[size]; } -qpid::framing::Buffer::Buffer(char* _data, u_int32_t _size) : size(_size), owner(false), data(_data), position(0), limit(_size){ +qpid::framing::Buffer::Buffer(char* _data, uint32_t _size) : size(_size), owner(false), data(_data), position(0), limit(_size){ } qpid::framing::Buffer::~Buffer(){ @@ -44,7 +44,7 @@ void qpid::framing::Buffer::clear(){ } void qpid::framing::Buffer::compact(){ - u_int32_t p = limit - position; + uint32_t p = limit - position; //copy p chars from position to 0 memmove(data, data + position, p); limit = size; @@ -61,7 +61,7 @@ void qpid::framing::Buffer::restore(){ limit = r_limit; } -u_int32_t qpid::framing::Buffer::available(){ +uint32_t qpid::framing::Buffer::available(){ return limit - position; } @@ -69,51 +69,51 @@ char* qpid::framing::Buffer::start(){ return data + position; } -void qpid::framing::Buffer::move(u_int32_t bytes){ +void qpid::framing::Buffer::move(uint32_t bytes){ position += bytes; } -void qpid::framing::Buffer::putOctet(u_int8_t i){ +void qpid::framing::Buffer::putOctet(uint8_t i){ data[position++] = i; } -void qpid::framing::Buffer::putShort(u_int16_t i){ - u_int16_t b = i; - data[position++] = (u_int8_t) (0xFF & (b >> 8)); - data[position++] = (u_int8_t) (0xFF & b); +void qpid::framing::Buffer::putShort(uint16_t i){ + uint16_t b = i; + data[position++] = (uint8_t) (0xFF & (b >> 8)); + data[position++] = (uint8_t) (0xFF & b); } -void qpid::framing::Buffer::putLong(u_int32_t i){ - u_int32_t b = i; - data[position++] = (u_int8_t) (0xFF & (b >> 24)); - data[position++] = (u_int8_t) (0xFF & (b >> 16)); - data[position++] = (u_int8_t) (0xFF & (b >> 8)); - data[position++] = (u_int8_t) (0xFF & b); +void qpid::framing::Buffer::putLong(uint32_t i){ + uint32_t b = i; + data[position++] = (uint8_t) (0xFF & (b >> 24)); + data[position++] = (uint8_t) (0xFF & (b >> 16)); + data[position++] = (uint8_t) (0xFF & (b >> 8)); + data[position++] = (uint8_t) (0xFF & b); } -void qpid::framing::Buffer::putLongLong(u_int64_t i){ - u_int32_t hi = i >> 32; - u_int32_t lo = i; +void qpid::framing::Buffer::putLongLong(uint64_t i){ + uint32_t hi = i >> 32; + uint32_t lo = i; putLong(hi); putLong(lo); } -u_int8_t qpid::framing::Buffer::getOctet(){ - return (u_int8_t) data[position++]; +uint8_t qpid::framing::Buffer::getOctet(){ + return (uint8_t) data[position++]; } -u_int16_t qpid::framing::Buffer::getShort(){ - u_int16_t hi = (unsigned char) data[position++]; +uint16_t qpid::framing::Buffer::getShort(){ + uint16_t hi = (unsigned char) data[position++]; hi = hi << 8; hi |= (unsigned char) data[position++]; return hi; } -u_int32_t qpid::framing::Buffer::getLong(){ - u_int32_t a = (unsigned char) data[position++]; - u_int32_t b = (unsigned char) data[position++]; - u_int32_t c = (unsigned char) data[position++]; - u_int32_t d = (unsigned char) data[position++]; +uint32_t qpid::framing::Buffer::getLong(){ + uint32_t a = (unsigned char) data[position++]; + uint32_t b = (unsigned char) data[position++]; + uint32_t c = (unsigned char) data[position++]; + uint32_t d = (unsigned char) data[position++]; a = a << 24; a |= b << 16; a |= c << 8; @@ -121,36 +121,36 @@ u_int32_t qpid::framing::Buffer::getLong(){ return a; } -u_int64_t qpid::framing::Buffer::getLongLong(){ - u_int64_t hi = getLong(); - u_int64_t lo = getLong(); +uint64_t qpid::framing::Buffer::getLongLong(){ + uint64_t hi = getLong(); + uint64_t lo = getLong(); hi = hi << 32; return hi | lo; } void qpid::framing::Buffer::putShortString(const string& s){ - u_int8_t len = s.length(); + uint8_t len = s.length(); putOctet(len); s.copy(data + position, len); position += len; } void qpid::framing::Buffer::putLongString(const string& s){ - u_int32_t len = s.length(); + uint32_t len = s.length(); putLong(len); s.copy(data + position, len); position += len; } void qpid::framing::Buffer::getShortString(string& s){ - u_int8_t len = getOctet(); + uint8_t len = getOctet(); s.assign(data + position, len); position += len; } void qpid::framing::Buffer::getLongString(string& s){ - u_int32_t len = getLong(); + uint32_t len = getLong(); s.assign(data + position, len); position += len; } @@ -172,12 +172,12 @@ void qpid::framing::Buffer::getContent(Content& c){ } void qpid::framing::Buffer::putRawData(const string& s){ - u_int32_t len = s.length(); + uint32_t len = s.length(); s.copy(data + position, len); position += len; } -void qpid::framing::Buffer::getRawData(string& s, u_int32_t len){ +void qpid::framing::Buffer::getRawData(string& s, uint32_t len){ s.assign(data + position, len); position += len; } diff --git a/cpp/lib/common/framing/Buffer.h b/cpp/lib/common/framing/Buffer.h index f2dd5071a7..63a15c7c3d 100644 --- a/cpp/lib/common/framing/Buffer.h +++ b/cpp/lib/common/framing/Buffer.h @@ -31,18 +31,18 @@ class FieldTable; class Buffer { - const u_int32_t size; + const uint32_t size; const bool owner;//indicates whether the data is owned by this instance char* data; - u_int32_t position; - u_int32_t limit; - u_int32_t r_position; - u_int32_t r_limit; + uint32_t position; + uint32_t limit; + uint32_t r_position; + uint32_t r_limit; public: - Buffer(u_int32_t size); - Buffer(char* data, u_int32_t size); + Buffer(uint32_t size); + Buffer(char* data, uint32_t size); ~Buffer(); void flip(); @@ -50,19 +50,19 @@ public: void compact(); void record(); void restore(); - u_int32_t available(); + uint32_t available(); char* start(); - void move(u_int32_t bytes); + void move(uint32_t bytes); - void putOctet(u_int8_t i); - void putShort(u_int16_t i); - void putLong(u_int32_t i); - void putLongLong(u_int64_t i); + void putOctet(uint8_t i); + void putShort(uint16_t i); + void putLong(uint32_t i); + void putLongLong(uint64_t i); - u_int8_t getOctet(); - u_int16_t getShort(); - u_int32_t getLong(); - u_int64_t getLongLong(); + uint8_t getOctet(); + uint16_t getShort(); + uint32_t getLong(); + uint64_t getLongLong(); void putShortString(const string& s); void putLongString(const string& s); @@ -76,7 +76,7 @@ public: void getContent(Content& c); void putRawData(const string& s); - void getRawData(string& s, u_int32_t size); + void getRawData(string& s, uint32_t size); }; diff --git a/cpp/lib/common/framing/FieldTable.cpp b/cpp/lib/common/framing/FieldTable.cpp index cf16e87272..5bbc4651d3 100644 --- a/cpp/lib/common/framing/FieldTable.cpp +++ b/cpp/lib/common/framing/FieldTable.cpp @@ -29,8 +29,8 @@ namespace framing { FieldTable::~FieldTable() {} -u_int32_t FieldTable::size() const { - u_int32_t len(4); +uint32_t FieldTable::size() const { + uint32_t len(4); for(ValueMap::const_iterator i = values.begin(); i != values.end(); ++i) { // 2 = shortstr_len_byyte + type_char_byte len += 2 + (i->first).size() + (i->second)->size(); @@ -68,7 +68,7 @@ void FieldTable::setInt(const std::string& name, int value){ values[name] = ValuePtr(new IntegerValue(value)); } -void FieldTable::setTimestamp(const std::string& name, u_int64_t value){ +void FieldTable::setTimestamp(const std::string& name, uint64_t value){ values[name] = ValuePtr(new TimeValue(value)); } @@ -79,7 +79,7 @@ void FieldTable::setTable(const std::string& name, const FieldTable& value){ namespace { template <class T> T default_value() { return T(); } template <> int default_value<int>() { return 0; } -template <> u_int64_t default_value<u_int64_t>() { return 0; } +template <> uint64_t default_value<uint64_t>() { return 0; } } template <class T> @@ -99,8 +99,8 @@ int FieldTable::getInt(const std::string& name) const { return getValue<int>(name); } -u_int64_t FieldTable::getTimestamp(const std::string& name) const { - return getValue<u_int64_t>(name); +uint64_t FieldTable::getTimestamp(const std::string& name) const { + return getValue<uint64_t>(name); } void FieldTable::getTable(const std::string& name, FieldTable& value) const { @@ -117,11 +117,11 @@ void FieldTable::encode(Buffer& buffer) const{ } void FieldTable::decode(Buffer& buffer){ - u_int32_t len = buffer.getLong(); - u_int32_t available = buffer.available(); + uint32_t len = buffer.getLong(); + uint32_t available = buffer.available(); if (available < len) THROW_QPID_ERROR(FRAMING_ERROR, "Not enough data for field table."); - u_int32_t leftover = available - len; + uint32_t leftover = available - len; while(buffer.available() > leftover){ std::string name; buffer.getShortString(name); diff --git a/cpp/lib/common/framing/FieldTable.h b/cpp/lib/common/framing/FieldTable.h index 6fa10ab108..e25a7d3f8c 100644 --- a/cpp/lib/common/framing/FieldTable.h +++ b/cpp/lib/common/framing/FieldTable.h @@ -50,16 +50,16 @@ class FieldTable typedef std::map<std::string, ValuePtr> ValueMap; ~FieldTable(); - u_int32_t size() const; + uint32_t size() const; int count() const; void setString(const std::string& name, const std::string& value); void setInt(const std::string& name, int value); - void setTimestamp(const std::string& name, u_int64_t value); + void setTimestamp(const std::string& name, uint64_t value); void setTable(const std::string& name, const FieldTable& value); //void setDecimal(string& name, xxx& value); std::string getString(const std::string& name) const; int getInt(const std::string& name) const; - u_int64_t getTimestamp(const std::string& name) const; + uint64_t getTimestamp(const std::string& name) const; void getTable(const std::string& name, FieldTable& value) const; //void getDecimal(string& name, xxx& value); void erase(const std::string& name); diff --git a/cpp/lib/common/framing/FramingContent.cpp b/cpp/lib/common/framing/FramingContent.cpp index 45335ba9c9..24efa38dcb 100644 --- a/cpp/lib/common/framing/FramingContent.cpp +++ b/cpp/lib/common/framing/FramingContent.cpp @@ -30,7 +30,7 @@ namespace framing { Content::Content() : discriminator(0) {} -Content::Content(u_int8_t _discriminator, const string& _value): discriminator(_discriminator), value(_value) { +Content::Content(uint8_t _discriminator, const string& _value): discriminator(_discriminator), value(_value) { validate(); } diff --git a/cpp/lib/common/framing/FramingContent.h b/cpp/lib/common/framing/FramingContent.h index cffd46ee24..696bcc7c1a 100644 --- a/cpp/lib/common/framing/FramingContent.h +++ b/cpp/lib/common/framing/FramingContent.h @@ -14,14 +14,14 @@ enum discriminator_types { INLINE = 0, REFERENCE = 1 }; */ class Content { - u_int8_t discriminator; + uint8_t discriminator; string value; void validate(); public: Content(); - Content(u_int8_t _discriminator, const string& _value); + Content(uint8_t _discriminator, const string& _value); ~Content(); void encode(Buffer& buffer) const; diff --git a/cpp/lib/common/framing/HeaderProperties.h b/cpp/lib/common/framing/HeaderProperties.h index 7a8c65549d..1ec4840309 100644 --- a/cpp/lib/common/framing/HeaderProperties.h +++ b/cpp/lib/common/framing/HeaderProperties.h @@ -34,10 +34,10 @@ namespace framing { public: inline virtual ~HeaderProperties(){} - virtual u_int8_t classId() = 0; - virtual u_int32_t size() const = 0; + virtual uint8_t classId() = 0; + virtual uint32_t size() const = 0; virtual void encode(Buffer& buffer) const = 0; - virtual void decode(Buffer& buffer, u_int32_t size) = 0; + virtual void decode(Buffer& buffer, uint32_t size) = 0; }; } } diff --git a/cpp/lib/common/framing/ProtocolInitiation.cpp b/cpp/lib/common/framing/ProtocolInitiation.cpp index c119b79d6d..de53488f7b 100644 --- a/cpp/lib/common/framing/ProtocolInitiation.cpp +++ b/cpp/lib/common/framing/ProtocolInitiation.cpp @@ -25,7 +25,7 @@ namespace framing { ProtocolInitiation::ProtocolInitiation(){} -ProtocolInitiation::ProtocolInitiation(u_int8_t _major, u_int8_t _minor) : version(_major, _minor) {} +ProtocolInitiation::ProtocolInitiation(uint8_t _major, uint8_t _minor) : version(_major, _minor) {} ProtocolInitiation::ProtocolInitiation(ProtocolVersion p) : version(p) {} diff --git a/cpp/lib/common/framing/ProtocolInitiation.h b/cpp/lib/common/framing/ProtocolInitiation.h index fb5cb3abed..ed7b59e94e 100644 --- a/cpp/lib/common/framing/ProtocolInitiation.h +++ b/cpp/lib/common/framing/ProtocolInitiation.h @@ -36,14 +36,14 @@ private: public: ProtocolInitiation(); - ProtocolInitiation(u_int8_t major, u_int8_t minor); + ProtocolInitiation(uint8_t major, uint8_t minor); ProtocolInitiation(ProtocolVersion p); virtual ~ProtocolInitiation(); virtual void encode(Buffer& buffer); virtual bool decode(Buffer& buffer); - inline virtual u_int32_t size() const { return 8; } - inline u_int8_t getMajor() const { return version.getMajor(); } - inline u_int8_t getMinor() const { return version.getMinor(); } + inline virtual uint32_t size() const { return 8; } + inline uint8_t getMajor() const { return version.getMajor(); } + inline uint8_t getMinor() const { return version.getMinor(); } inline ProtocolVersion getVersion() const { return version; } }; diff --git a/cpp/lib/common/framing/ProtocolVersion.h b/cpp/lib/common/framing/ProtocolVersion.h index aa526aa293..5e1429c1ea 100644 --- a/cpp/lib/common/framing/ProtocolVersion.h +++ b/cpp/lib/common/framing/ProtocolVersion.h @@ -31,17 +31,17 @@ namespace framing class ProtocolVersion { private: - u_int8_t major_; - u_int8_t minor_; + uint8_t major_; + uint8_t minor_; public: - ProtocolVersion(u_int8_t _major=0, u_int8_t _minor=0) + ProtocolVersion(uint8_t _major=0, uint8_t _minor=0) : major_(_major), minor_(_minor) {} - u_int8_t getMajor() const { return major_; } - void setMajor(u_int8_t major) { major_ = major; } - u_int8_t getMinor() const { return minor_; } - void setMinor(u_int8_t minor) { minor_ = minor; } + uint8_t getMajor() const { return major_; } + void setMajor(uint8_t major) { major_ = major; } + uint8_t getMinor() const { return minor_; } + void setMinor(uint8_t minor) { minor_ = minor; } const std::string toString() const; ProtocolVersion& operator=(ProtocolVersion p); diff --git a/cpp/lib/common/framing/Value.cpp b/cpp/lib/common/framing/Value.cpp index 9b1f3bbc94..03e005e384 100644 --- a/cpp/lib/common/framing/Value.cpp +++ b/cpp/lib/common/framing/Value.cpp @@ -37,7 +37,7 @@ void StringValue::decode(Buffer& buffer){ } void IntegerValue::encode(Buffer& buffer){ - buffer.putLong((u_int32_t) value); + buffer.putLong((uint32_t) value); } void IntegerValue::decode(Buffer& buffer){ value = buffer.getLong(); @@ -68,7 +68,7 @@ void FieldTableValue::decode(Buffer& buffer){ std::auto_ptr<Value> Value::decode_value(Buffer& buffer) { std::auto_ptr<Value> value; - u_int8_t type = buffer.getOctet(); + uint8_t type = buffer.getOctet(); switch(type){ case 'S': value.reset(new StringValue()); diff --git a/cpp/lib/common/framing/Value.h b/cpp/lib/common/framing/Value.h index e7ae865a70..8752b02f40 100644 --- a/cpp/lib/common/framing/Value.h +++ b/cpp/lib/common/framing/Value.h @@ -36,10 +36,10 @@ class Buffer; * No arithmetic functionality for now, we only care about encoding/decoding. */ struct Decimal { - u_int32_t value; - u_int8_t decimals; + uint32_t value; + uint8_t decimals; - Decimal(u_int32_t value_=0, u_int8_t decimals_=0) : value(value_), decimals(decimals_) {} + Decimal(uint32_t value_=0, uint8_t decimals_=0) : value(value_), decimals(decimals_) {} bool operator==(const Decimal& d) const { return decimals == d.decimals && value == d.value; } @@ -54,7 +54,7 @@ std::ostream& operator<<(std::ostream& out, const Decimal& d); class Value { public: virtual ~Value(); - virtual u_int32_t size() const = 0; + virtual uint32_t size() const = 0; virtual char getType() const = 0; virtual void encode(Buffer& buffer) = 0; virtual void decode(Buffer& buffer) = 0; @@ -97,7 +97,7 @@ class StringValue : public ValueOps<std::string> { public: StringValue(const std::string& v) : ValueOps<std::string>(v) {} StringValue() {} - virtual u_int32_t size() const { return 4 + value.length(); } + virtual uint32_t size() const { return 4 + value.length(); } virtual char getType() const { return 'S'; } virtual void encode(Buffer& buffer); virtual void decode(Buffer& buffer); @@ -107,17 +107,17 @@ class IntegerValue : public ValueOps<int> { public: IntegerValue(int v) : ValueOps<int>(v) {} IntegerValue(){} - virtual u_int32_t size() const { return 4; } + virtual uint32_t size() const { return 4; } virtual char getType() const { return 'I'; } virtual void encode(Buffer& buffer); virtual void decode(Buffer& buffer); }; -class TimeValue : public ValueOps<u_int64_t> { +class TimeValue : public ValueOps<uint64_t> { public: - TimeValue(u_int64_t v) : ValueOps<u_int64_t>(v){} + TimeValue(uint64_t v) : ValueOps<uint64_t>(v){} TimeValue(){} - virtual u_int32_t size() const { return 8; } + virtual uint32_t size() const { return 8; } virtual char getType() const { return 'T'; } virtual void encode(Buffer& buffer); virtual void decode(Buffer& buffer); @@ -126,9 +126,9 @@ class TimeValue : public ValueOps<u_int64_t> { class DecimalValue : public ValueOps<Decimal> { public: DecimalValue(const Decimal& d) : ValueOps<Decimal>(d) {} - DecimalValue(u_int32_t value_=0, u_int8_t decimals_=0) : + DecimalValue(uint32_t value_=0, uint8_t decimals_=0) : ValueOps<Decimal>(Decimal(value_, decimals_)){} - virtual u_int32_t size() const { return 5; } + virtual uint32_t size() const { return 5; } virtual char getType() const { return 'D'; } virtual void encode(Buffer& buffer); virtual void decode(Buffer& buffer); @@ -139,7 +139,7 @@ class FieldTableValue : public ValueOps<FieldTable> { public: FieldTableValue(const FieldTable& v) : ValueOps<FieldTable>(v){} FieldTableValue(){} - virtual u_int32_t size() const { return 4 + value.size(); } + virtual uint32_t size() const { return 4 + value.size(); } virtual char getType() const { return 'F'; } virtual void encode(Buffer& buffer); virtual void decode(Buffer& buffer); @@ -148,7 +148,7 @@ class FieldTableValue : public ValueOps<FieldTable> { class EmptyValue : public Value { public: ~EmptyValue(); - virtual u_int32_t size() const { return 0; } + virtual uint32_t size() const { return 0; } virtual char getType() const { return 0; } virtual void encode(Buffer& ) {} virtual void decode(Buffer& ) {} diff --git a/cpp/lib/common/framing/amqp_types.h b/cpp/lib/common/framing/amqp_types.h index 2f56cb877e..49963bd570 100644 --- a/cpp/lib/common/framing/amqp_types.h +++ b/cpp/lib/common/framing/amqp_types.h @@ -29,10 +29,10 @@ #include <string> #ifdef _WINDOWS #include "windows.h" -typedef unsigned char u_int8_t; -typedef unsigned short u_int16_t; -typedef unsigned int u_int32_t; -typedef unsigned __int64 u_int64_t; +typedef unsigned char uint8_t; +typedef unsigned short uint16_t; +typedef unsigned int uint32_t; +typedef unsigned __int64 uint64_t; #endif #ifndef _WINDOWS #include "stdint.h" @@ -42,13 +42,13 @@ namespace qpid { namespace framing { using std::string; -typedef u_int16_t ChannelId; -typedef u_int64_t RequestId; -typedef u_int64_t ResponseId; -typedef u_int32_t BatchOffset; -typedef u_int16_t ClassId; -typedef u_int16_t MethodId; -typedef u_int16_t ReplyCode; +typedef uint16_t ChannelId; +typedef uint64_t RequestId; +typedef uint64_t ResponseId; +typedef uint32_t BatchOffset; +typedef uint16_t ClassId; +typedef uint16_t MethodId; +typedef uint16_t ReplyCode; // Types represented by classes. class Content; diff --git a/cpp/lib/common/sys/apr/APRSocket.cpp b/cpp/lib/common/sys/apr/APRSocket.cpp index 621a66b919..96dbd132a1 100644 --- a/cpp/lib/common/sys/apr/APRSocket.cpp +++ b/cpp/lib/common/sys/apr/APRSocket.cpp @@ -63,7 +63,7 @@ bool APRSocket::isOpen() const { return !closed; } -u_int8_t APRSocket::read(){ +uint8_t APRSocket::read(){ char data[1]; apr_size_t bytes = 1; apr_status_t s = apr_socket_recv(socket, data, &bytes); diff --git a/cpp/lib/common/sys/apr/APRSocket.h b/cpp/lib/common/sys/apr/APRSocket.h index d4274300f2..a55dfc06b0 100644 --- a/cpp/lib/common/sys/apr/APRSocket.h +++ b/cpp/lib/common/sys/apr/APRSocket.h @@ -37,7 +37,7 @@ namespace sys { void write(qpid::framing::Buffer& b); void close(); bool isOpen() const; - u_int8_t read(); + uint8_t read(); ~APRSocket(); }; diff --git a/cpp/tests/AccumulatedAckTest.cpp b/cpp/tests/AccumulatedAckTest.cpp index d00977b69e..30554f808e 100644 --- a/cpp/tests/AccumulatedAckTest.cpp +++ b/cpp/tests/AccumulatedAckTest.cpp @@ -92,12 +92,12 @@ class AccumulatedAckTest : public CppUnit::TestCase ack.update(2, 2); ack.update(0, 5); ack.consolidate(); - CPPUNIT_ASSERT_EQUAL((u_int64_t) 6, ack.range); + CPPUNIT_ASSERT_EQUAL((uint64_t) 6, ack.range); CPPUNIT_ASSERT_EQUAL((size_t) 2, ack.individual.size()); - list<u_int64_t>::iterator i = ack.individual.begin(); - CPPUNIT_ASSERT_EQUAL((u_int64_t) 8, *i); + list<uint64_t>::iterator i = ack.individual.begin(); + CPPUNIT_ASSERT_EQUAL((uint64_t) 8, *i); i++; - CPPUNIT_ASSERT_EQUAL((u_int64_t) 10, *i); + CPPUNIT_ASSERT_EQUAL((uint64_t) 10, *i); } }; diff --git a/cpp/tests/BrokerChannelTest.cpp b/cpp/tests/BrokerChannelTest.cpp index bd96d554b4..9216ae4672 100644 --- a/cpp/tests/BrokerChannelTest.cpp +++ b/cpp/tests/BrokerChannelTest.cpp @@ -163,17 +163,17 @@ class BrokerChannelTest : public CppUnit::TestCase string tagB; channel.consume(tagA, queue, false, false, owner); channel.consume(tagB, queue, false, false, owner); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 3, queue->getConsumerCount()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 3, queue->getConsumerCount()); CPPUNIT_ASSERT(channel.exists("my_consumer")); CPPUNIT_ASSERT(channel.exists(tagA)); CPPUNIT_ASSERT(channel.exists(tagB)); channel.cancel(tagA); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 2, queue->getConsumerCount()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 2, queue->getConsumerCount()); CPPUNIT_ASSERT(channel.exists("my_consumer")); CPPUNIT_ASSERT(!channel.exists(tagA)); CPPUNIT_ASSERT(channel.exists(tagB)); channel.close(); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, queue->getConsumerCount()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 0, queue->getConsumerCount()); } void testDeliveryNoAck(){ @@ -261,7 +261,7 @@ class BrokerChannelTest : public CppUnit::TestCase exchange->bind(queue, "", 0); AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC)); - u_int64_t contentSize(0); + uint64_t contentSize(0); for (int i = 0; i < 3; i++) { contentSize += data[i].size(); } @@ -315,13 +315,13 @@ class BrokerChannelTest : public CppUnit::TestCase Message::shared_ptr next = queue->dequeue(); CPPUNIT_ASSERT_EQUAL(msg1, next); - CPPUNIT_ASSERT_EQUAL((u_int32_t) data1.size(), next->encodedContentSize()); + CPPUNIT_ASSERT_EQUAL((uint32_t) data1.size(), next->encodedContentSize()); next = queue->dequeue(); CPPUNIT_ASSERT_EQUAL(msg2, next); - CPPUNIT_ASSERT_EQUAL((u_int32_t) data2.size(), next->encodedContentSize()); + CPPUNIT_ASSERT_EQUAL((uint32_t) data2.size(), next->encodedContentSize()); next = queue->dequeue(); CPPUNIT_ASSERT_EQUAL(msg3, next); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, next->encodedContentSize()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 0, next->encodedContentSize()); next.reset(); msg1.reset(); @@ -332,7 +332,7 @@ class BrokerChannelTest : public CppUnit::TestCase store.check(); } - Message* createMessage(const string& exchange, const string& routingKey, const string& messageId, u_int64_t contentSize) + Message* createMessage(const string& exchange, const string& routingKey, const string& messageId, uint64_t contentSize) { BasicMessage* msg = new BasicMessage( 0, exchange, routingKey, false, false, diff --git a/cpp/tests/EventChannelConnectionTest.cpp b/cpp/tests/EventChannelConnectionTest.cpp index 5e94b07dbd..66561daf83 100644 --- a/cpp/tests/EventChannelConnectionTest.cpp +++ b/cpp/tests/EventChannelConnectionTest.cpp @@ -74,8 +74,8 @@ class EventChannelConnectionTest : public CppUnit::TestCase // Send a heartbeat frame, verify connection got it. connection->send(new AMQFrame(42, new AMQHeartbeatBody())); AMQFrame frame = factory.handler->waitForFrame(); - CPPUNIT_ASSERT_EQUAL(u_int16_t(42), frame.getChannel()); - CPPUNIT_ASSERT_EQUAL(u_int8_t(HEARTBEAT_BODY), + CPPUNIT_ASSERT_EQUAL(uint16_t(42), frame.getChannel()); + CPPUNIT_ASSERT_EQUAL(uint8_t(HEARTBEAT_BODY), frame.getBody()->type()); threads->shutdown(); } diff --git a/cpp/tests/HeaderTest.cpp b/cpp/tests/HeaderTest.cpp index 01927c7190..f77aaaedb4 100644 --- a/cpp/tests/HeaderTest.cpp +++ b/cpp/tests/HeaderTest.cpp @@ -53,13 +53,13 @@ public: void testAllSpecificProperties(){ string contentType("text/html"); string contentEncoding("UTF8"); - u_int8_t deliveryMode(2); - u_int8_t priority(3); + uint8_t deliveryMode(2); + uint8_t priority(3); string correlationId("abc"); string replyTo("no-address"); string expiration("why is this a string?"); string messageId("xyz"); - u_int64_t timestamp(0xabcd); + uint64_t timestamp(0xabcd); string type("eh?"); string userId("guest"); string appId("just testing"); @@ -106,10 +106,10 @@ public: void testSomeSpecificProperties(){ string contentType("application/octet-stream"); - u_int8_t deliveryMode(5); - u_int8_t priority(6); + uint8_t deliveryMode(5); + uint8_t priority(6); string expiration("Z"); - u_int64_t timestamp(0xabe4a34a); + uint64_t timestamp(0xabe4a34a); AMQHeaderBody body(BASIC); BasicHeaderProperties* properties = diff --git a/cpp/tests/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp index c8433432e8..d02cc56a7b 100644 --- a/cpp/tests/InMemoryContentTest.cpp +++ b/cpp/tests/InMemoryContentTest.cpp @@ -55,7 +55,7 @@ public: } - void refragment(size_t inCount, string* in, size_t outCount, string* out, u_int32_t framesize = 5) + void refragment(size_t inCount, string* in, size_t outCount, string* out, uint32_t framesize = 5) { InMemoryContent content; MockChannel channel(3); diff --git a/cpp/tests/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp index 365e4f6a11..b24cd5a84a 100644 --- a/cpp/tests/LazyLoadedContentTest.cpp +++ b/cpp/tests/LazyLoadedContentTest.cpp @@ -50,7 +50,7 @@ class LazyLoadedContentTest : public CppUnit::TestCase public: TestMessageStore(const string& _content) : content(_content) {} - void loadContent(Message* const, string& data, u_int64_t offset, u_int32_t length) + void loadContent(Message* const, string& data, uint64_t offset, uint32_t length) { if (offset + length <= content.size()) { data = content.substr(offset, length); @@ -67,7 +67,7 @@ public: void testFragmented() { string data = "abcdefghijklmnopqrstuvwxyz"; - u_int32_t framesize = 5; + uint32_t framesize = 5; string out[] = {"abcde", "fghij", "klmno", "pqrst", "uvwxy", "z"}; load(data, 6, out, framesize); } @@ -75,7 +75,7 @@ public: void testWhole() { string data = "abcdefghijklmnopqrstuvwxyz"; - u_int32_t framesize = 50; + uint32_t framesize = 50; string out[] = {data}; load(data, 1, out, framesize); } @@ -83,12 +83,12 @@ public: void testHalved() { string data = "abcdefghijklmnopqrstuvwxyz"; - u_int32_t framesize = 13; + uint32_t framesize = 13; string out[] = {"abcdefghijklm", "nopqrstuvwxyz"}; load(data, 2, out, framesize); } - void load(string& in, size_t outCount, string* out, u_int32_t framesize) + void load(string& in, size_t outCount, string* out, uint32_t framesize) { TestMessageStore store(in); LazyLoadedContent content(&store, 0, in.size()); diff --git a/cpp/tests/MessageBuilderTest.cpp b/cpp/tests/MessageBuilderTest.cpp index d1b9c6ee62..d3b3902e97 100644 --- a/cpp/tests/MessageBuilderTest.cpp +++ b/cpp/tests/MessageBuilderTest.cpp @@ -47,7 +47,7 @@ class MessageBuilderTest : public CppUnit::TestCase { Buffer* header; Buffer* content; - const u_int32_t contentBufferSize; + const uint32_t contentBufferSize; public: @@ -99,7 +99,7 @@ class MessageBuilderTest : public CppUnit::TestCase } //dont care about any of the other methods: - TestMessageStore(u_int32_t _contentBufferSize) : NullMessageStore(), header(0), content(0), + TestMessageStore(uint32_t _contentBufferSize) : NullMessageStore(), header(0), content(0), contentBufferSize(_contentBufferSize) {} ~TestMessageStore(){} }; @@ -216,7 +216,7 @@ class MessageBuilderTest : public CppUnit::TestCase CPPUNIT_ASSERT_EQUAL(message->getHeaderProperties()->getMessageId(), restored->getHeaderProperties()->getMessageId()); CPPUNIT_ASSERT_EQUAL(message->getHeaderProperties()->getHeaders().getString("abc"), restored->getHeaderProperties()->getHeaders().getString("abc")); - CPPUNIT_ASSERT_EQUAL((u_int64_t) 14, restored->contentSize()); + CPPUNIT_ASSERT_EQUAL((uint64_t) 14, restored->contentSize()); } } }; diff --git a/cpp/tests/MessageTest.cpp b/cpp/tests/MessageTest.cpp index 95f1a9b90a..a3bbfe4afc 100644 --- a/cpp/tests/MessageTest.cpp +++ b/cpp/tests/MessageTest.cpp @@ -69,9 +69,9 @@ class MessageTest : public CppUnit::TestCase CPPUNIT_ASSERT_EQUAL(exchange, msg->getExchange()); CPPUNIT_ASSERT_EQUAL(routingKey, msg->getRoutingKey()); CPPUNIT_ASSERT_EQUAL(messageId, msg->getHeaderProperties()->getMessageId()); - CPPUNIT_ASSERT_EQUAL((u_int8_t) PERSISTENT, msg->getHeaderProperties()->getDeliveryMode()); + CPPUNIT_ASSERT_EQUAL((uint8_t) PERSISTENT, msg->getHeaderProperties()->getDeliveryMode()); CPPUNIT_ASSERT_EQUAL(string("xyz"), msg->getHeaderProperties()->getHeaders().getString("abc")); - CPPUNIT_ASSERT_EQUAL((u_int64_t) 14, msg->contentSize()); + CPPUNIT_ASSERT_EQUAL((uint64_t) 14, msg->contentSize()); MockChannel channel(1); // FIXME aconway 2007-02-02: deliver should take ProtocolVersion diff --git a/cpp/tests/QueuePolicyTest.cpp b/cpp/tests/QueuePolicyTest.cpp index 0ae0d2f7bc..20917dcd6a 100644 --- a/cpp/tests/QueuePolicyTest.cpp +++ b/cpp/tests/QueuePolicyTest.cpp @@ -38,8 +38,8 @@ class QueuePolicyTest : public CppUnit::TestCase QueuePolicy policy(5, 0); CPPUNIT_ASSERT(!policy.limitExceeded()); for (int i = 0; i < 5; i++) policy.enqueued(10); - CPPUNIT_ASSERT_EQUAL((u_int64_t) 0, policy.getMaxSize()); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 5, policy.getMaxCount()); + CPPUNIT_ASSERT_EQUAL((uint64_t) 0, policy.getMaxSize()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 5, policy.getMaxCount()); CPPUNIT_ASSERT(!policy.limitExceeded()); policy.enqueued(10); CPPUNIT_ASSERT(policy.limitExceeded()); diff --git a/cpp/tests/QueueTest.cpp b/cpp/tests/QueueTest.cpp index 59ca7728ca..fa38029de1 100644 --- a/cpp/tests/QueueTest.cpp +++ b/cpp/tests/QueueTest.cpp @@ -70,7 +70,7 @@ class QueueTest : public CppUnit::TestCase queue->consume(&c1); queue->consume(&c2); - CPPUNIT_ASSERT_EQUAL(u_int32_t(2), queue->getConsumerCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(2), queue->getConsumerCount()); //Test basic delivery: Message::shared_ptr msg1 = message("e", "A"); @@ -88,9 +88,9 @@ class QueueTest : public CppUnit::TestCase //Test cancellation: queue->cancel(&c1); - CPPUNIT_ASSERT_EQUAL(u_int32_t(1), queue->getConsumerCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(1), queue->getConsumerCount()); queue->cancel(&c2); - CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getConsumerCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(0), queue->getConsumerCount()); } void testBinding(){ @@ -138,25 +138,25 @@ class QueueTest : public CppUnit::TestCase queue->deliver(msg2); queue->deliver(msg3); - CPPUNIT_ASSERT_EQUAL(u_int32_t(3), queue->getMessageCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(3), queue->getMessageCount()); received = queue->dequeue(); CPPUNIT_ASSERT_EQUAL(msg1.get(), received.get()); - CPPUNIT_ASSERT_EQUAL(u_int32_t(2), queue->getMessageCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(2), queue->getMessageCount()); received = queue->dequeue(); CPPUNIT_ASSERT_EQUAL(msg2.get(), received.get()); - CPPUNIT_ASSERT_EQUAL(u_int32_t(1), queue->getMessageCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(1), queue->getMessageCount()); TestConsumer consumer; queue->consume(&consumer); queue->dispatch(); CPPUNIT_ASSERT_EQUAL(msg3.get(), consumer.last.get()); - CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getMessageCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(0), queue->getMessageCount()); received = queue->dequeue(); CPPUNIT_ASSERT(!received); - CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getMessageCount()); + CPPUNIT_ASSERT_EQUAL(uint32_t(0), queue->getMessageCount()); } }; diff --git a/cpp/tests/TxPublishTest.cpp b/cpp/tests/TxPublishTest.cpp index 39d27a754d..d9d5607c06 100644 --- a/cpp/tests/TxPublishTest.cpp +++ b/cpp/tests/TxPublishTest.cpp @@ -111,10 +111,10 @@ public: { //ensure messages are delivered to queue op.commit(); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, queue1->getMessageCount()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 1, queue1->getMessageCount()); CPPUNIT_ASSERT_EQUAL(msg, queue1->dequeue()); - CPPUNIT_ASSERT_EQUAL((u_int32_t) 1, queue2->getMessageCount()); + CPPUNIT_ASSERT_EQUAL((uint32_t) 1, queue2->getMessageCount()); CPPUNIT_ASSERT_EQUAL(msg, queue2->dequeue()); } }; |