jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qamqp/src/qamqpqueue_p.h

60 lines
1.6 KiB
C
Raw Normal View History

rename amqp_ files to qamqp amqp_<filename> is used in at least two other C/C++ projects related to amqp, so this commit changes all our source to use a qamqp header. This avoids potential clashes, and is more in line with Qt style
2014-08-27 03:05:39 +08:00
#ifndef QAMQPQUEUE_P_H
#define QAMQPQUEUE_P_H
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
namespace cleanup
2014-05-29 01:52:27 +08:00
#include <QQueue>
change the way messages are received Messages used to be "delivered" and pushed right onto the queue, which is where the requirement for Message to be explicitly shared came from. Now messages that are incomplete come in and are stored in a "currentMessage" private member (there is a requirement that messages are delivered in this fashion, by the spec). Once the message body has come in, it is put into the local queue and the messageReceived signal is emitted. Also, modified Queue to be able to track a number of consumer tags. This was exposed by the "routing" tutorial, where a single consumer can bind to a number of exchanges with a generated consumer tag. The previous example did not run into this problem because it used an explicitly set consumer tag and therefore there were no conflicts.
2014-06-19 22:01:47 +08:00
#include <QStringList>
rename amqp_ files to qamqp amqp_<filename> is used in at least two other C/C++ projects related to amqp, so this commit changes all our source to use a qamqp header. This avoids potential clashes, and is more in line with Qt style
2014-08-27 03:05:39 +08:00
#include "qamqpchannel_p.h"
namespace cleanup
2014-05-29 01:52:27 +08:00
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
class QAmqpQueuePrivate: public QAmqpChannelPrivate,
public QAmqpContentFrameHandler,
public QAmqpContentBodyFrameHandler
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
{
public:
enum MethodId {
METHOD_ID_ENUM(miDeclare, 10),
METHOD_ID_ENUM(miBind, 20),
METHOD_ID_ENUM(miUnbind, 50),
METHOD_ID_ENUM(miPurge, 30),
METHOD_ID_ENUM(miDelete, 40)
};
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
QAmqpQueuePrivate(QAmqpQueue *q);
~QAmqpQueuePrivate();
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
- added auto tests for remove - remove now takes flags rather than magical booleans - fixed a bug delete -> deleteOk in QueuePrivate so we can listen for sync queue destruction - added error signals to Client(Connection), and Channel - removed automatic calls to remove a Queue when the channel is closed, or Queue is deleted this behavior is already handled by the AutoDelete declare option
2014-06-07 00:10:51 +08:00
void declare();
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
virtual bool _q_method(const QAmqpMethodFrame &frame);
add support for cancelling a consumer cancel method and cancelled signal added to Queue, added auto tests to guarantee conditions surrounding the cancel process
2014-06-24 23:09:19 +08:00
// AMQP Queue method handlers
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
void declareOk(const QAmqpMethodFrame &frame);
void deleteOk(const QAmqpMethodFrame &frame);
void purgeOk(const QAmqpMethodFrame &frame);
void bindOk(const QAmqpMethodFrame &frame);
void unbindOk(const QAmqpMethodFrame &frame);
void consumeOk(const QAmqpMethodFrame &frame);
add support for cancelling a consumer cancel method and cancelled signal added to Queue, added auto tests to guarantee conditions surrounding the cancel process
2014-06-24 23:09:19 +08:00
// AMQP Basic method handlers
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
virtual void _q_content(const QAmqpContentFrame &frame);
virtual void _q_body(const QAmqpContentBodyFrame &frame);
void deliver(const QAmqpMethodFrame &frame);
void getOk(const QAmqpMethodFrame &frame);
void cancelOk(const QAmqpMethodFrame &frame);
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
QString type;
- added auto tests for remove - remove now takes flags rather than magical booleans - fixed a bug delete -> deleteOk in QueuePrivate so we can listen for sync queue destruction - added error signals to Client(Connection), and Channel - removed automatic calls to remove a Queue when the channel is closed, or Queue is deleted this behavior is already handled by the AutoDelete declare option
2014-06-07 00:10:51 +08:00
int options;
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
bool delayedDeclare;
bool declared;
QQueue<QPair<QString, QString> > delayedBindings;
clean up QAMQP::Queue api removed noAck as it relates only to the synchronous get AMQP api moved noAck to get method applied visual separation in headers between AMQP Queue and AMQP Basic methods
2014-06-25 09:09:45 +08:00
QString consumerTag;
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
bool recievingMessage;
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
QAmqpMessage currentMessage;
ensure consuming only occurs once per queue a Queue can act as a consumer in QAMQP, but previously we did no checks to ensure that a Queue sent a request to consume only once. This commit adds API for checking and ensuring that this is the case. Also, I reverted the changes to allow multiple consumer tags because this was incorrect. Also included is a new signal "consuming" to notify when consumption occurs, and auto tests have been updated to use this, as well as verify that it can only occur once per-consumer
2014-06-24 22:30:05 +08:00
bool consuming;
fix(multiple-consume): only send consume message once Previously if multiple attempts to call consume were made, then QAmqpQueue would send a frame for each of them leading to multiple consumer tags and general confusion. This guards from calling consume multiple times.
2015-04-06 22:25:56 +08:00
bool consumeRequested;
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
remove QAMQP namespace This is a very small library, so there is no real pressing need for a library namespace. Further, the namespacing actually makes it rather difficult to work with in some cases. Opting for a more "Qt" style class naming scheme, using the QAmqp class prefix
2014-09-15 23:51:48 +08:00
Q_DECLARE_PUBLIC(QAmqpQueue)
use Q_Q/Q_D from Qt rather than P_Q/P_D, style cleanups for Qt coding style delete exception-related code, as Qt does not officially support them anymore
2014-05-29 00:25:28 +08:00
};
rename amqp_ files to qamqp amqp_<filename> is used in at least two other C/C++ projects related to amqp, so this commit changes all our source to use a qamqp header. This avoids potential clashes, and is more in line with Qt style
2014-08-27 03:05:39 +08:00
#endif // QAMQPQUEUE_P_H