Author: tross
Date: Fri Dec 5 21:43:32 2014
New Revision: 1643439
URL: http://svn.apache.org/r1643439
Log:
DISPATCH-78 - Use the alloc module to manage the driver's listeners and
connectors.
Modified:
qpid/dispatch/trunk/src/posix/driver.c
Modified: qpid/dispatch/trunk/src/posix/driver.c
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/posix/driver.c?rev=1643439&r1=1643438&r2=1643439&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/posix/driver.c (original)
+++ qpid/dispatch/trunk/src/posix/driver.c Fri Dec 5 21:43:32 2014
@@ -34,6 +34,7 @@
#include <string.h>
#include <qpid/dispatch/driver.h>
+#include <qpid/dispatch/alloc.h>
//#include <proton/driver_extras.h>
#include <proton/error.h>
#include <proton/io.h>
@@ -103,6 +104,12 @@ struct qdpn_connector_t {
bool output_done;
};
+ALLOC_DECLARE(qdpn_listener_t);
+ALLOC_DEFINE(qdpn_listener_t);
+
+ALLOC_DECLARE(qdpn_connector_t);
+ALLOC_DEFINE(qdpn_connector_t);
+
/* Impls */
static void pni_fatal(const char *text)
@@ -221,7 +228,7 @@ qdpn_listener_t *qdpn_listener_fd(qdpn_d
{
if (!driver) return NULL;
- qdpn_listener_t *l = (qdpn_listener_t *) malloc(sizeof(qdpn_listener_t));
+ qdpn_listener_t *l = new_qdpn_listener_t();
if (!l) return NULL;
DEQ_ITEM_INIT(l);
l->driver = driver;
@@ -300,7 +307,7 @@ void qdpn_listener_free(qdpn_listener_t
if (!l) return;
if (l->driver) qdpn_driver_remove_listener(l->driver, l);
- free(l);
+ free_qdpn_listener_t(l);
}
// connector
@@ -345,7 +352,7 @@ qdpn_connector_t *qdpn_connector_fd(qdpn
{
if (!driver) return NULL;
- qdpn_connector_t *c = (qdpn_connector_t *)
malloc(sizeof(qdpn_connector_t));
+ qdpn_connector_t *c = new_qdpn_connector_t();
if (!c) return NULL;
DEQ_ITEM_INIT(c);
c->driver = driver;
@@ -482,7 +489,7 @@ void qdpn_connector_free(qdpn_connector_
ctor->transport = NULL;
if (ctor->connection) pn_class_decref(PN_OBJECT, ctor->connection);
ctor->connection = NULL;
- free(ctor);
+ free_qdpn_connector_t(ctor);
}
void qdpn_connector_activate(qdpn_connector_t *ctor, qdpn_activate_criteria_t
crit)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
