You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2017/09/15 18:48:56 UTC

[3/7] qpid-dispatch git commit: DISPATCH-807: move q2 holdoff flag from message into content

DISPATCH-807: move q2 holdoff flag from message into content

Random senders free message content buffers. Each sender must be
able to sense the receiver's holdoff state to know when to
schedule a callback. Message content is common to the receiver
and to all the senders.


Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/41e363e2
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/41e363e2
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/41e363e2

Branch: refs/heads/DISPATCH-807-1
Commit: 41e363e2ee3b0b60fd8caf2d06b844dc9265bbe0
Parents: ece8bfe
Author: Chuck Rolke <cr...@redhat.com>
Authored: Thu Sep 14 10:15:05 2017 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Fri Sep 15 14:47:26 2017 -0400

----------------------------------------------------------------------
 src/message.c         | 4 ++--
 src/message_private.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/41e363e2/src/message.c
----------------------------------------------------------------------
diff --git a/src/message.c b/src/message.c
index 12b09ce..c15dd56 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1869,13 +1869,13 @@ int qd_message_get_phase_val(qd_message_t *msg)
 
 void qd_message_set_Q2_input_holdoff(qd_message_t *msg, bool holdoff)
 {
-    ((qd_message_pvt_t*)msg)->q2_input_holdoff = holdoff;
+    ((qd_message_pvt_t*)msg)->content->q2_input_holdoff = holdoff;
 }
 
 
 bool qd_message_get_Q2_input_holdoff(qd_message_t *msg)
 {
-    return ((qd_message_pvt_t*)msg)->q2_input_holdoff;
+    return ((qd_message_pvt_t*)msg)->content->q2_input_holdoff;
 }
 
 

http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/41e363e2/src/message_private.h
----------------------------------------------------------------------
diff --git a/src/message_private.h b/src/message_private.h
index aa01831..9be0f7f 100644
--- a/src/message_private.h
+++ b/src/message_private.h
@@ -112,6 +112,7 @@ typedef struct {
     bool                 discard;                        // Should this message be discarded?
     bool                 receive_complete;               // true if the message has been completely received, false otherwise
     sys_atomic_t         fanout;                         // The number of receivers for this message. This number does not include in-process subscribers.
+    bool                 q2_input_holdoff;               // hold off calling pn_link_recv 
 } qd_message_content_t;
 
 typedef struct {
@@ -127,7 +128,6 @@ typedef struct {
     qd_buffer_list_t      ma_ingress;      // ingress field in outgoing message annotations
     int                   ma_phase;        // phase for the override address
     bool                  strip_annotations_in;
-    bool                  q2_input_holdoff;// hold off calling pn_link_recv 
 } qd_message_pvt_t;
 
 ALLOC_DECLARE(qd_message_t);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org