[qpid-dispatch] branch master updated: DISPATCH-1627: fix missing free of message body in core client
This is an automated email from the ASF dual-hosted git repository.
kgiusti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new fc284e0 DISPATCH-1627: fix missing free of message body in core client
fc284e0 is described below
commit fc284e005dcf0bb644ad8318e5f943cf0a43bc7e
Author: Kenneth Giusti
AuthorDate: Thu Apr 23 11:21:24 2020 -0400
DISPATCH-1627: fix missing free of message body in core client
---
src/router_core/modules/address_lookup_client/lookup_client.c | 2 ++
src/router_core/modules/edge_router/edge_mgmt.c | 3 +++
2 files changed, 5 insertions(+)
diff --git a/src/router_core/modules/address_lookup_client/lookup_client.c
b/src/router_core/modules/address_lookup_client/lookup_client.c
index ea4c888..b835cfb 100644
--- a/src/router_core/modules/address_lookup_client/lookup_client.c
+++ b/src/router_core/modules/address_lookup_client/lookup_client.c
@@ -649,6 +649,8 @@ static uint64_t on_reply(qdr_core_t*core,
if (conn == 0 || link == 0) {
qdr_terminus_free(request->source);
qdr_terminus_free(request->target);
+qd_iterator_free(body);
+qd_iterator_free(app_properties);
return 0;
}
diff --git a/src/router_core/modules/edge_router/edge_mgmt.c
b/src/router_core/modules/edge_router/edge_mgmt.c
index 84cb9a2..edeba96 100644
--- a/src/router_core/modules/edge_router/edge_mgmt.c
+++ b/src/router_core/modules/edge_router/edge_mgmt.c
@@ -217,6 +217,9 @@ static uint64_t _mgmt_on_reply_cb_CT(qdr_core_t*core,
statusCode,
statusDescription,
body);
+else
+qd_iterator_free(body);
+
free(statusDescription);
return disposition;
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-2172: temporarily disable test pending proper epoll timers fix
This is an automated email from the ASF dual-hosted git repository.
cliffjansen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new b496997 PROTON-2172: temporarily disable test pending proper epoll
timers fix
b496997 is described below
commit b496997bf7ec201e1469f5d1707f55f821bddab2
Author: Cliff Jansen
AuthorDate: Thu Apr 23 11:48:14 2020 -0700
PROTON-2172: temporarily disable test pending proper epoll timers fix
---
c/tests/fdlimit.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/c/tests/fdlimit.py b/c/tests/fdlimit.py
index 349ab0b..6848c68 100644
--- a/c/tests/fdlimit.py
+++ b/c/tests/fdlimit.py
@@ -51,7 +51,8 @@ class FdLimitTest(unittest.TestCase):
if cls.devnull:
cls.devnull.close()
-@unittest.skipUnless(prlimit_available, "prlimit not available")
+# @unittest.skipUnless(prlimit_available, "prlimit not available")
+@unittest.skip("temporarily disabled (epoll fix pending)")
def test_fd_limit_broker(self):
"""Check behaviour when running out of file descriptors on accept"""
# Not too many FDs but not too few either, some are used for system
purposes.
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-dispatch] branch master updated: DISPATCH-975: manually free oversized messages that are not forwarded
This is an automated email from the ASF dual-hosted git repository.
kgiusti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 28200e3 DISPATCH-975: manually free oversized messages that are not
forwarded
28200e3 is described below
commit 28200e3c5266807624fff2a5e8d04a93a09b017d
Author: Kenneth Giusti
AuthorDate: Wed Apr 22 13:31:13 2020 -0400
DISPATCH-975: manually free oversized messages that are not forwarded
This closes #723
---
src/router_node.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/router_node.c b/src/router_node.c
index d2e2d36..02eccff 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -395,6 +395,11 @@ static bool AMQP_rx_handler(void* context, qd_link_t *link)
(void) pn_condition_set_name( cond,
QD_AMQP_COND_CONNECTION_FORCED);
(void) pn_condition_set_description(cond, "Message size exceeded");
pn_connection_close(pn_conn);
+if (!delivery) {
+// this message has not been forwarded yet, so it will not be
+// cleaned up when the link is freed.
+qd_message_free(msg);
+}
}
return false;
// oversize messages are not processed any further
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-2130: Really fix include files
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 2b1a968 PROTON-2130: Really fix include files
2b1a968 is described below
commit 2b1a968591c5c3097ddfcd2e6af6233a13a22e69
Author: Andrew Stitcher
AuthorDate: Thu Apr 23 10:47:49 2020 -0400
PROTON-2130: Really fix include files
---
c/src/proactor/epoll-internal.h | 1 +
c/src/proactor/epoll.c | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/c/src/proactor/epoll-internal.h b/c/src/proactor/epoll-internal.h
index ed831a6..20b01ac 100644
--- a/c/src/proactor/epoll-internal.h
+++ b/c/src/proactor/epoll-internal.h
@@ -35,6 +35,7 @@
#include
#include "netaddr-internal.h"
+#include "proactor-internal.h"
#ifdef __cplusplus
extern "C" {
diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index d2a424d..76b5c37 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -57,8 +57,8 @@
/* Avoid GNU extensions, in particular the incompatible alternative
strerror_r() */
#undef _GNU_SOURCE
-#include "proactor-internal.h"
#include "epoll-internal.h"
+#include "proactor-internal.h"
#include "core/engine-internal.h"
#include "core/logger_private.h"
#include "core/util.h"
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton] branch master updated: PROTON-2130: Rework epoll process logic to switch on type of context
This is an automated email from the ASF dual-hosted git repository.
astitcher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 9d4777c PROTON-2130: Rework epoll process logic to switch on type of
context
9d4777c is described below
commit 9d4777c43c79cb288c118ccbf3ea0d57932993b2
Author: Andrew Stitcher
AuthorDate: Wed Apr 22 22:27:21 2020 -0400
PROTON-2130: Rework epoll process logic to switch on type of context
---
c/src/proactor/epoll-internal.h | 3 +--
c/src/proactor/epoll.c | 35 +--
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/c/src/proactor/epoll-internal.h b/c/src/proactor/epoll-internal.h
index 3dfe956..ed831a6 100644
--- a/c/src/proactor/epoll-internal.h
+++ b/c/src/proactor/epoll-internal.h
@@ -72,8 +72,7 @@ typedef struct ptimer_t {
typedef enum {
PROACTOR,
PCONNECTION,
- LISTENER,
- WAKEABLE
+ LISTENER
} pcontext_type_t;
typedef struct pcontext_t {
diff --git a/c/src/proactor/epoll.c b/c/src/proactor/epoll.c
index baf1638..d2a424d 100644
--- a/c/src/proactor/epoll.c
+++ b/c/src/proactor/epoll.c
@@ -2375,7 +2375,8 @@ static pn_event_batch_t *process(pcontext_t *ctx) {
ctx_wake = true;
}
- if (ctx->type == PROACTOR) {
+ switch (ctx->type) {
+ case PROACTOR: {
pn_proactor_t *p = ctx->proactor;
bool timeout = p->sched_timeout;
if (timeout) p->sched_timeout = false;
@@ -2384,8 +2385,8 @@ static pn_event_batch_t *process(pcontext_t *ctx) {
unlock(&p->sched_mutex);
return proactor_process(p, timeout, intr, ctx_wake);
}
- pconnection_t *pc = pcontext_pconnection(ctx);
- if (pc) {
+ case PCONNECTION: {
+pconnection_t *pc = pcontext_pconnection(ctx);
uint32_t events = pc->psocket.sched_io_events;
if (events) pc->psocket.sched_io_events = 0;
bool timeout = pc->sched_timeout;
@@ -2393,19 +2394,25 @@ static pn_event_batch_t *process(pcontext_t *ctx) {
unlock(&ctx->proactor->sched_mutex);
return pconnection_process(pc, events, timeout, ctx_wake, false);
}
- pn_listener_t *l = pcontext_listener(ctx);
- int n_events = 0;
- for (size_t i = 0; i < l->acceptors_size; i++) {
-psocket_t *ps = &l->acceptors[i].psocket;
-if (ps->sched_io_events) {
- ps->working_io_events = ps->sched_io_events;
- ps->sched_io_events = 0;
+ case LISTENER: {
+pn_listener_t *l = pcontext_listener(ctx);
+int n_events = 0;
+for (size_t i = 0; i < l->acceptors_size; i++) {
+ psocket_t *ps = &l->acceptors[i].psocket;
+ if (ps->sched_io_events) {
+ps->working_io_events = ps->sched_io_events;
+ps->sched_io_events = 0;
+ }
+ if (ps->working_io_events)
+n_events++;
}
-if (ps->working_io_events)
- n_events++;
+unlock(&ctx->proactor->sched_mutex);
+return listener_process(l, n_events, ctx_wake);
}
- unlock(&ctx->proactor->sched_mutex);
- return listener_process(l, n_events, ctx_wake);
+ default:
+assert(NULL);
+ }
+ return NULL;
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-proton-j] branch master updated: PROTON-2197: update to Apache parent pom 23
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-proton-j.git The following commit(s) were added to refs/heads/master by this push: new 8c230e2 PROTON-2197: update to Apache parent pom 23 8c230e2 is described below commit 8c230e2e01cfdd8323ed5453e7332f9b1c4aea2d Author: Robbie Gemmell AuthorDate: Thu Apr 23 11:31:44 2020 +0100 PROTON-2197: update to Apache parent pom 23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 129da3f..2ec2f1c 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ org.apache apache -21 +23 4.0.0 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
[qpid-jms] branch master updated: QPIDJMS-500: update to apache parent pom 23
This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-jms.git The following commit(s) were added to refs/heads/master by this push: new b892cc0 QPIDJMS-500: update to apache parent pom 23 b892cc0 is described below commit b892cc0e98d89b3cef93b3043b3e44516ec521d7 Author: Robbie Gemmell AuthorDate: Thu Apr 23 10:55:00 2020 +0100 QPIDJMS-500: update to apache parent pom 23 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98546f6..1175b01 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ org.apache apache -21 +23 4.0.0 - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
