Author: rhs
Date: Mon Jun 25 16:34:32 2012
New Revision: 1353643
URL: http://svn.apache.org/viewvc?rev=1353643&view=rev
Log:
renamed *_destroy -> *_free
Added:
qpid/proton/trunk/tests/jproton-test (with props)
Modified:
qpid/proton/trunk/design/src/proton/Endpoint.java
qpid/proton/trunk/design/src/proton/package.html
qpid/proton/trunk/examples/broker/broker
qpid/proton/trunk/examples/broker/brokerlib.py
qpid/proton/trunk/examples/mailbox/server
qpid/proton/trunk/proton-c/bindings/php/examples/client.php
qpid/proton/trunk/proton-c/bindings/php/examples/server.php
qpid/proton/trunk/proton-c/bindings/php/php.i
qpid/proton/trunk/proton-c/bindings/php/tests.php
qpid/proton/trunk/proton-c/bindings/python/python.i
qpid/proton/trunk/proton-c/include/proton/driver.h
qpid/proton/trunk/proton-c/include/proton/engine.h
qpid/proton/trunk/proton-c/include/proton/sasl.h
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h
qpid/proton/trunk/proton-c/src/driver.c
qpid/proton/trunk/proton-c/src/engine/engine.c
qpid/proton/trunk/proton-c/src/messenger.c
qpid/proton/trunk/proton-c/src/proton.c
qpid/proton/trunk/proton-c/src/sasl/sasl.c
qpid/proton/trunk/proton-j/jproton.py
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/driver/DelegatingTransport.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/EndpointImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SessionImpl.java
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
qpid/proton/trunk/tests/proton_tests/engine.py
Modified: qpid/proton/trunk/design/src/proton/Endpoint.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/design/src/proton/Endpoint.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/design/src/proton/Endpoint.java (original)
+++ qpid/proton/trunk/design/src/proton/Endpoint.java Mon Jun 25 16:34:32 2012
@@ -114,6 +114,6 @@ public interface Endpoint
/**
* free the endpoint and any associated resources
*/
- public void destroy();
+ public void free();
}
Modified: qpid/proton/trunk/design/src/proton/package.html
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/design/src/proton/package.html?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/design/src/proton/package.html (original)
+++ qpid/proton/trunk/design/src/proton/package.html Mon Jun 25 16:34:32 2012
@@ -3,7 +3,7 @@
<p>
Connections are the primary unit of resource management.
Sessions and Links are components of connections. When the
- Connection is destroyed/discarded, any resources associated with
+ Connection is freed/discarded, any resources associated with
the Sessions and Links are automatically destroyed or discarded
as well.
</p>
Modified: qpid/proton/trunk/examples/broker/broker
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/broker/broker?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/examples/broker/broker (original)
+++ qpid/proton/trunk/examples/broker/broker Mon Jun 25 16:34:32 2012
@@ -123,8 +123,8 @@ try:
window.redraw()
if pn_connector_closed(c):
conn = pn_connector_connection(c)
- if conn: pn_connection_destroy(conn)
- pn_connector_destroy(c)
+ if conn: pn_connection_free(conn)
+ pn_connector_free(c)
else:
pn_connector_process(c)
Modified: qpid/proton/trunk/examples/broker/brokerlib.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/broker/brokerlib.py?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/examples/broker/brokerlib.py (original)
+++ qpid/proton/trunk/examples/broker/brokerlib.py Mon Jun 25 16:34:32 2012
@@ -185,14 +185,14 @@ class Broker:
self.detach_receiver(lnk, connection)
lnk = pn_link_next(lnk, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED)
- # XXX: need to destroy links
+ # XXX: need to free links
ssn = pn_session_head(connection, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED)
while ssn:
pn_session_close(ssn)
ssn = pn_session_next(ssn, PN_LOCAL_ACTIVE | PN_REMOTE_CLOSED)
- # XXX: need to destroy sessions
+ # XXX: need to free sessions
# XXX: need to orphan links
state = pn_connection_state(connection)
Modified: qpid/proton/trunk/examples/mailbox/server
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/examples/mailbox/server?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/examples/mailbox/server (original)
+++ qpid/proton/trunk/examples/mailbox/server Mon Jun 25 16:34:32 2012
@@ -125,7 +125,7 @@ class MailboxServer(object):
if pn_connector_closed(cxtr):
self.log("Closing connector")
- pn_connector_destroy(cxtr)
+ pn_connector_free(cxtr)
cxtr = pn_driver_connector(self.driver)
Modified: qpid/proton/trunk/proton-c/bindings/php/examples/client.php
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/examples/client.php?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/examples/client.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/examples/client.php Mon Jun 25
16:34:32 2012
@@ -153,8 +153,8 @@ while (!$done) {
$h = pn_connector_context($c);
$h($c);
if (pn_connector_closed($c)) {
- pn_connection_destroy(pn_connector_connection($c));
- pn_connector_destroy($c);
+ pn_connection_free(pn_connector_connection($c));
+ pn_connector_free($c);
unset($c);
$done = true;
} else {
Modified: qpid/proton/trunk/proton-c/bindings/php/examples/server.php
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/examples/server.php?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/examples/server.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/examples/server.php Mon Jun 25
16:34:32 2012
@@ -183,9 +183,9 @@ while (TRUE) {
$h = pn_connector_context($c);
$h($c);
if (pn_connector_closed($c)) {
- // destroy the connector if closed
- pn_connection_destroy(pn_connector_connection($c));
- pn_connector_destroy($c);
+ // free the connector if closed
+ pn_connection_free(pn_connector_connection($c));
+ pn_connector_free($c);
unset($c);
} else {
// otherwise process any work the handler might have done
Modified: qpid/proton/trunk/proton-c/bindings/php/php.i
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/php.i?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/php.i (original)
+++ qpid/proton/trunk/proton-c/bindings/php/php.i Mon Jun 25 16:34:32 2012
@@ -214,17 +214,17 @@ pn_listener_t *pn_listener_fd(pn_driver_
}
%ignore pn_listener_context;
-%rename(pn_listener_destroy) wrap_pn_listener_destroy;
+%rename(pn_listener_free) wrap_pn_listener_free;
%inline %{
- void wrap_pn_listener_destroy(pn_listener_t *l) {
+ void wrap_pn_listener_free(pn_listener_t *l) {
zval *obj = pn_listener_context(l);
if (obj) {
zval_ptr_dtor(&obj); // drop the reference taken on input
}
- pn_listener_destroy(l);
+ pn_listener_free(l);
}
%}
-%ignore pn_listener_destroy;
+%ignore pn_listener_free;
// increment reference count of PHP_CONTEXT on input:
@@ -261,17 +261,17 @@ pn_connector_t *pn_connector_fd(pn_drive
}
%ignore pn_connector_set_context;
-%rename(pn_connector_destroy) wrap_pn_connector_destroy;
+%rename(pn_connector_free) wrap_pn_connector_free;
%inline %{
- void wrap_pn_connector_destroy(pn_connector_t *c) {
+ void wrap_pn_connector_free(pn_connector_t *c) {
zval *obj = pn_connector_context(c);
if (obj) {
zval_ptr_dtor(&obj); // drop the reference taken on input
}
- pn_connector_destroy(c);
+ pn_connector_free(c);
}
%}
-%ignore pn_connector_destroy;
+%ignore pn_connector_free;
%include "../cproton.i"
Modified: qpid/proton/trunk/proton-c/bindings/php/tests.php
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/tests.php?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/tests.php (original)
+++ qpid/proton/trunk/proton-c/bindings/php/tests.php Mon Jun 25 16:34:32 2012
@@ -103,8 +103,8 @@ pn_settle($sd);
pump($t1, $t2);
// cleanup
-pn_connection_destroy($c1);
-pn_connection_destroy($c2);
+pn_connection_free($c1);
+pn_connection_free($c2);
//
@@ -128,7 +128,7 @@ $pnl = pn_driver_listener($pnd);
$pnlc = pn_listener_context($pnl);
//print("Empty listener " . $pnlc . "\n");
unset($pnlc);
-pn_listener_destroy($pnl);
+pn_listener_free($pnl);
$pnc = pn_driver_connector($pnd);
$pncc = pn_connector_context($pnc);
@@ -136,7 +136,7 @@ $pncc = pn_connector_context($pnc);
//assert("is_null($pncc)");
unset($pncc);
-pn_connector_destroy($pnc);
+pn_connector_free($pnc);
// manage a listener context
@@ -148,8 +148,8 @@ assert('$x == "listener-context"');
//print("Retrieved listener context: " . $x . "\n");
unset($x);
$m = pn_listener_context($pnl);
-pn_listener_destroy($pnl);
-//print("After destroy: " . $m . "\n");
+pn_listener_free($pnl);
+//print("After free: " . $m . "\n");
assert('$m == "listener-context"');
@@ -166,12 +166,12 @@ unset($y);
//print("Updated connector context: " . pn_connector_context($pnc) . "\n");
assert('pn_connector_context($pnc) == 75');
$m = pn_connector_context($pnc);
-pn_connector_destroy($pnc);
-//print("After destroy: " . $m . "\n");
+pn_connector_free($pnc);
+//print("After free: " . $m . "\n");
assert('$m == 75');
-pn_driver_destroy($pnd);
+pn_driver_free($pnd);
print("END TEST\n");
Modified: qpid/proton/trunk/proton-c/bindings/python/python.i
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/python.i?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/python.i (original)
+++ qpid/proton/trunk/proton-c/bindings/python/python.i Mon Jun 25 16:34:32 2012
@@ -160,15 +160,15 @@ ssize_t pn_input(pn_transport_t *transpo
}
%ignore pn_listener_context;
-%rename(pn_listener_destroy) wrap_pn_listener_destroy;
+%rename(pn_listener_free) wrap_pn_listener_free;
%inline %{
- void wrap_pn_listener_destroy(pn_listener_t *l) {
+ void wrap_pn_listener_free(pn_listener_t *l) {
PyObject *obj = pn_listener_context(l);
Py_XDECREF(obj);
- pn_listener_destroy(l);
+ pn_listener_free(l);
}
%}
-%ignore pn_listener_destroy;
+%ignore pn_listener_free;
%rename(pn_connector) wrap_pn_connector;
%inline {
@@ -203,15 +203,15 @@ ssize_t pn_input(pn_transport_t *transpo
}
%ignore pn_connector_set_context;
-%rename(pn_connector_destroy) wrap_pn_connector_destroy;
+%rename(pn_connector_free) wrap_pn_connector_free;
%inline %{
- void wrap_pn_connector_destroy(pn_connector_t *c) {
+ void wrap_pn_connector_free(pn_connector_t *c) {
PyObject *obj = pn_connector_context(c);
Py_XDECREF(obj);
- pn_connector_destroy(c);
+ pn_connector_free(c);
}
%}
-%ignore pn_connector_destroy;
+%ignore pn_connector_free;
%exception pn_driver_wait
{
Modified: qpid/proton/trunk/proton-c/include/proton/driver.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/driver.h?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/driver.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/driver.h Mon Jun 25 16:34:32 2012
@@ -47,7 +47,7 @@ typedef struct pn_connector_t pn_connect
/** Construct a driver
*
- * Call pn_driver_destroy() to release the driver object.
+ * Call pn_driver_free() to release the driver object.
* @return new driver object, NULL if error
*/
pn_driver_t *pn_driver(void);
@@ -91,13 +91,13 @@ pn_listener_t *pn_driver_listener(pn_dri
*/
pn_connector_t *pn_driver_connector(pn_driver_t *driver);
-/** Destruct the driver allocated via pn_driver, and all associated
+/** Free the driver allocated via pn_driver, and all associated
* listeners and connectors.
*
- * @param[in] driver the driver to destruct, no longer valid on
+ * @param[in] driver the driver to free, no longer valid on
* return
*/
-void pn_driver_destroy(pn_driver_t *driver);
+void pn_driver_free(pn_driver_t *driver);
/** pn_listener - the server API **/
@@ -150,14 +150,14 @@ void *pn_listener_context(pn_listener_t
*/
void pn_listener_close(pn_listener_t *listener);
-/** Destructor for the given listener.
+/** Frees the given listener.
*
* Assumes the listener's socket has been closed prior to call.
*
- * @param[in] listener the listener object to destroy, no longer valid
+ * @param[in] listener the listener object to free, no longer valid
* on return
*/
-void pn_listener_destroy(pn_listener_t *listener);
+void pn_listener_free(pn_listener_t *listener);
/** pn_connector - the client API **/
@@ -268,9 +268,9 @@ bool pn_connector_closed(pn_connector_t
*
* Assumes the connector's socket has been closed prior to call.
*
- * @param[in] connector the connector object to destroy. No longer
+ * @param[in] connector the connector object to free. No longer
* valid on return
*/
-void pn_connector_destroy(pn_connector_t *connector);
+void pn_connector_free(pn_connector_t *connector);
#endif /* driver.h */
Modified: qpid/proton/trunk/proton-c/include/proton/engine.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/engine.h?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/engine.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/engine.h Mon Jun 25 16:34:32 2012
@@ -215,7 +215,7 @@ pn_link_t *pn_link_next(pn_link_t *link,
void pn_connection_open(pn_connection_t *connection);
void pn_connection_close(pn_connection_t *connection);
-void pn_connection_destroy(pn_connection_t *connection);
+void pn_connection_free(pn_connection_t *connection);
// transport
pn_error_t *pn_transport_error(pn_transport_t *transport);
@@ -223,7 +223,7 @@ ssize_t pn_input(pn_transport_t *transpo
ssize_t pn_output(pn_transport_t *transport, char *bytes, size_t size);
time_t pn_tick(pn_transport_t *transport, time_t now);
void pn_trace(pn_transport_t *transport, pn_trace_t trace);
-void pn_transport_destroy(pn_transport_t *transport);
+void pn_transport_free(pn_transport_t *transport);
// session
pn_state_t pn_session_state(pn_session_t *session);
@@ -233,7 +233,7 @@ pn_link_t *pn_receiver(pn_session_t *ses
pn_connection_t *pn_get_connection(pn_session_t *session);
void pn_session_open(pn_session_t *session);
void pn_session_close(pn_session_t *session);
-void pn_session_destroy(pn_session_t *session);
+void pn_session_free(pn_session_t *session);
// link
const char *pn_link_name(pn_link_t *link);
@@ -260,7 +260,7 @@ pn_delivery_t *pn_unsettled_next(pn_deli
void pn_link_open(pn_link_t *sender);
void pn_link_close(pn_link_t *sender);
-void pn_link_destroy(pn_link_t *sender);
+void pn_link_free(pn_link_t *sender);
// sender
//void pn_offer(pn_sender_t *sender, int credits);
Modified: qpid/proton/trunk/proton-c/include/proton/sasl.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/include/proton/sasl.h?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/include/proton/sasl.h (original)
+++ qpid/proton/trunk/proton-c/include/proton/sasl.h Mon Jun 25 16:34:32 2012
@@ -187,10 +187,10 @@ void pn_sasl_trace(pn_sasl_t *sasl, pn_t
/** Destructor for the given SASL layer.
*
- * @param[in] sasl the SASL object to destroy. No longer valid on
+ * @param[in] sasl the SASL object to free. No longer valid on
* return.
*/
-void pn_sasl_destroy(pn_sasl_t *sasl);
+void pn_sasl_free(pn_sasl_t *sasl);
#endif /* sasl.h */
Modified: qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.c Mon Jun 25 16:34:32
2012
@@ -53,7 +53,7 @@ pn_dispatcher_t *pn_dispatcher(uint8_t f
return disp;
}
-void pn_dispatcher_destroy(pn_dispatcher_t *disp)
+void pn_dispatcher_free(pn_dispatcher_t *disp)
{
if (disp) {
pn_data_free(disp->args);
Modified: qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h (original)
+++ qpid/proton/trunk/proton-c/src/dispatcher/dispatcher.h Mon Jun 25 16:34:32
2012
@@ -56,7 +56,7 @@ struct pn_dispatcher_t {
};
pn_dispatcher_t *pn_dispatcher(uint8_t frame_type, void *context);
-void pn_dispatcher_destroy(pn_dispatcher_t *disp);
+void pn_dispatcher_free(pn_dispatcher_t *disp);
void pn_dispatcher_action(pn_dispatcher_t *disp, uint8_t code, const char
*name,
pn_action_t *action);
int pn_scan_args(pn_dispatcher_t *disp, const char *fmt, ...);
Modified: qpid/proton/trunk/proton-c/src/driver.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Mon Jun 25 16:34:32 2012
@@ -243,7 +243,7 @@ void pn_listener_close(pn_listener_t *l)
perror("close");
}
-void pn_listener_destroy(pn_listener_t *l)
+void pn_listener_free(pn_listener_t *l)
{
if (!l) return;
@@ -419,14 +419,14 @@ bool pn_connector_closed(pn_connector_t
return ctor ? ctor->closed : true;
}
-void pn_connector_destroy(pn_connector_t *ctor)
+void pn_connector_free(pn_connector_t *ctor)
{
if (!ctor) return;
if (ctor->driver) pn_driver_remove_connector(ctor->driver, ctor);
ctor->connection = NULL;
ctor->transport = NULL;
- pn_sasl_destroy(ctor->sasl);
+ pn_sasl_free(ctor->sasl);
free(ctor);
}
@@ -701,16 +701,16 @@ void pn_driver_trace(pn_driver_t *d, pn_
d->trace = trace;
}
-void pn_driver_destroy(pn_driver_t *d)
+void pn_driver_free(pn_driver_t *d)
{
if (!d) return;
close(d->ctrl[0]);
close(d->ctrl[1]);
while (d->connector_head)
- pn_connector_destroy(d->connector_head);
+ pn_connector_free(d->connector_head);
while (d->listener_head)
- pn_listener_destroy(d->listener_head);
+ pn_listener_free(d->listener_head);
free(d->fds);
free(d);
}
Modified: qpid/proton/trunk/proton-c/src/engine/engine.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/engine/engine.c?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/engine/engine.c (original)
+++ qpid/proton/trunk/proton-c/src/engine/engine.c Mon Jun 25 16:34:32 2012
@@ -41,7 +41,7 @@ void pn_delivery_buffer_init(pn_delivery
db->size = 0;
}
-void pn_delivery_buffer_destroy(pn_delivery_buffer_t *db)
+void pn_delivery_buffer_free(pn_delivery_buffer_t *db)
{
free(db->deliveries);
}
@@ -155,24 +155,24 @@ void pn_close(pn_endpoint_t *endpoint)
pn_modified(pn_ep_get_connection(endpoint), endpoint);
}
-void pn_destroy(pn_endpoint_t *endpoint)
+void pn_free(pn_endpoint_t *endpoint)
{
switch (endpoint->type)
{
case CONNECTION:
- pn_connection_destroy((pn_connection_t *)endpoint);
+ pn_connection_free((pn_connection_t *)endpoint);
break;
case TRANSPORT:
- pn_transport_destroy((pn_transport_t *)endpoint);
+ pn_transport_free((pn_transport_t *)endpoint);
break;
case SESSION:
- pn_session_destroy((pn_session_t *)endpoint);
+ pn_session_free((pn_session_t *)endpoint);
break;
case SENDER:
- pn_link_destroy((pn_link_t *)endpoint);
+ pn_link_free((pn_link_t *)endpoint);
break;
case RECEIVER:
- pn_link_destroy((pn_link_t *)endpoint);
+ pn_link_free((pn_link_t *)endpoint);
break;
}
}
@@ -187,13 +187,13 @@ void pn_connection_close(pn_connection_t
if (connection) pn_close((pn_endpoint_t *) connection);
}
-void pn_connection_destroy(pn_connection_t *connection)
+void pn_connection_free(pn_connection_t *connection)
{
if (!connection) return;
- pn_transport_destroy(connection->transport);
+ pn_transport_free(connection->transport);
while (connection->session_count)
- pn_session_destroy(connection->sessions[connection->session_count - 1]);
+ pn_session_free(connection->sessions[connection->session_count - 1]);
free(connection->sessions);
free(connection->container);
free(connection->hostname);
@@ -212,14 +212,14 @@ void pn_transport_close(pn_transport_t *
pn_close((pn_endpoint_t *) transport);
}
-void pn_transport_destroy(pn_transport_t *transport)
+void pn_transport_free(pn_transport_t *transport)
{
if (!transport) return;
- pn_dispatcher_destroy(transport->disp);
+ pn_dispatcher_free(transport->disp);
for (int i = 0; i < transport->session_capacity; i++) {
- pn_delivery_buffer_destroy(&transport->sessions[i].incoming);
- pn_delivery_buffer_destroy(&transport->sessions[i].outgoing);
+ pn_delivery_buffer_free(&transport->sessions[i].incoming);
+ pn_delivery_buffer_free(&transport->sessions[i].outgoing);
free(transport->sessions[i].links);
free(transport->sessions[i].handles);
}
@@ -265,12 +265,12 @@ void pn_session_close(pn_session_t *sess
if (session) pn_close((pn_endpoint_t *) session);
}
-void pn_session_destroy(pn_session_t *session)
+void pn_session_free(pn_session_t *session)
{
if (!session) return;
while (session->link_count)
- pn_link_destroy(session->links[session->link_count - 1]);
+ pn_link_free(session->links[session->link_count - 1]);
pn_remove_session(session->connection, session);
free(session->links);
free(session);
@@ -334,7 +334,7 @@ void pn_link_close(pn_link_t *link)
if (link) pn_close((pn_endpoint_t *) link);
}
-void pn_link_destroy(pn_link_t *link)
+void pn_link_free(pn_link_t *link)
{
if (!link) return;
Modified: qpid/proton/trunk/proton-c/src/messenger.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/messenger.c?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/messenger.c (original)
+++ qpid/proton/trunk/proton-c/src/messenger.c Mon Jun 25 16:34:32 2012
@@ -55,7 +55,7 @@ pn_messenger_t *pn_messenger()
void pn_messenger_free(pn_messenger_t *messenger)
{
if (messenger) {
- pn_driver_destroy(messenger->driver);
+ pn_driver_free(messenger->driver);
pn_error_free(messenger->error);
}
}
@@ -181,9 +181,9 @@ int pn_messenger_sync(pn_messenger_t *me
if (c == messenger->connectors[i]) {
memmove(messenger->connectors + i, messenger->connectors + i + 1,
messenger->size - i - 1);
messenger->size--;
- pn_connector_destroy(c);
+ pn_connector_free(c);
pn_messenger_reclaim(messenger, conn);
- pn_connection_destroy(conn);
+ pn_connection_free(conn);
pn_messenger_flow(messenger);
break;
}
Modified: qpid/proton/trunk/proton-c/src/proton.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/proton.c?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/proton.c (original)
+++ qpid/proton/trunk/proton-c/src/proton.c Mon Jun 25 16:34:32 2012
@@ -556,8 +556,8 @@ int main(int argc, char **argv)
pn_connector_process(c);
client_callback(c);
if (pn_connector_closed(c)) {
- pn_connection_destroy(pn_connector_connection(c));
- pn_connector_destroy(c);
+ pn_connection_free(pn_connector_connection(c));
+ pn_connector_free(c);
} else {
pn_connector_process(c);
}
@@ -580,8 +580,8 @@ int main(int argc, char **argv)
pn_connector_process(c);
server_callback(c);
if (pn_connector_closed(c)) {
- pn_connection_destroy(pn_connector_connection(c));
- pn_connector_destroy(c);
+ pn_connection_free(pn_connector_connection(c));
+ pn_connector_free(c);
} else {
pn_connector_process(c);
}
@@ -589,7 +589,7 @@ int main(int argc, char **argv)
}
}
- pn_driver_destroy(drv);
+ pn_driver_free(drv);
return 0;
}
Modified: qpid/proton/trunk/proton-c/src/sasl/sasl.c
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/sasl/sasl.c?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/sasl/sasl.c (original)
+++ qpid/proton/trunk/proton-c/src/sasl/sasl.c Mon Jun 25 16:34:32 2012
@@ -200,13 +200,13 @@ void pn_sasl_trace(pn_sasl_t *sasl, pn_t
sasl->disp->trace = trace;
}
-void pn_sasl_destroy(pn_sasl_t *sasl)
+void pn_sasl_free(pn_sasl_t *sasl)
{
free(sasl->mechanisms);
free(sasl->remote_mechanisms);
free(sasl->send_data.start);
free(sasl->recv_data.start);
- pn_dispatcher_destroy(sasl->disp);
+ pn_dispatcher_free(sasl->disp);
free(sasl);
}
Modified: qpid/proton/trunk/proton-j/jproton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/jproton.py?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/jproton.py (original)
+++ qpid/proton/trunk/proton-j/jproton.py Mon Jun 25 16:34:32 2012
@@ -86,7 +86,7 @@ def state(endpoint):
def pn_connection():
return impl.ConnectionImpl()
-def pn_connection_destroy(c):
+def pn_connection_free(c):
pass
def pn_connection_state(c):
@@ -101,7 +101,7 @@ def pn_connection_close(c):
def pn_session(c):
return c.session()
-def pn_session_destroy(s):
+def pn_session_free(s):
pass
def pn_session_state(s):
@@ -141,7 +141,7 @@ def pn_sender(ssn, name):
def pn_receiver(ssn, name):
return ssn.receiver(name)
-def pn_link_destroy(lnk):
+def pn_link_free(lnk):
pass
def pn_link_state(lnk):
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/driver/DelegatingTransport.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/driver/DelegatingTransport.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/driver/DelegatingTransport.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/driver/DelegatingTransport.java
Mon Jun 25 16:34:32 2012
@@ -120,7 +120,7 @@ public class DelegatingTransport impleme
return null; //TODO.
}
- public void destroy()
+ public void free()
{
//TODO.
}
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java
(original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Delivery.java
Mon Jun 25 16:34:32 2012
@@ -52,7 +52,7 @@ public interface Delivery
*/
public void settle();
- public void destroy();
+ public void free();
public Delivery getWorkNext();
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java
(original)
+++ qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/Endpoint.java
Mon Jun 25 16:34:32 2012
@@ -51,7 +51,7 @@ public interface Endpoint
/**
* free the endpoint and any associated resources
*/
- public void destroy();
+ public void free();
/**
* transition local state to ACTIVE
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ConnectionImpl.java
Mon Jun 25 16:34:32 2012
@@ -178,17 +178,17 @@ public class ConnectionImpl extends Endp
return this;
}
- public void destroy()
+ public void free()
{
- super.destroy();
+ super.free();
for(Session session : _sessions)
{
- session.destroy();
+ session.free();
}
_sessions = null;
if(_transport != null)
{
- _transport.destroy();
+ _transport.free();
}
}
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
Mon Jun 25 16:34:32 2012
@@ -114,7 +114,7 @@ public class DeliveryImpl implements Del
return _linkNext;
}
- public void destroy()
+ public void free()
{
_link.remove(this);
if(_linkPrevious != null)
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/EndpointImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/EndpointImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/EndpointImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/EndpointImpl.java
Mon Jun 25 16:34:32 2012
@@ -152,7 +152,7 @@ public abstract class EndpointImpl imple
}
- public void destroy()
+ public void free()
{
if(_next != null)
{
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/LinkImpl.java
Mon Jun 25 16:34:32 2012
@@ -84,9 +84,9 @@ public abstract class LinkImpl extends E
return delivery;
}
- public void destroy()
+ public void free()
{
- super.destroy();
+ super.free();
_session.getConnectionImpl().removeLinkEndpoint(_node);
//TODO.
}
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ReceiverImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/ReceiverImpl.java
Mon Jun 25 16:34:32 2012
@@ -63,11 +63,11 @@ public class ReceiverImpl extends LinkIm
return null; //TODO.
}
- public void destroy()
+ public void free()
{
- getSession().destroyReceiver(this);
+ getSession().freeReceiver(this);
- super.destroy();
+ super.free();
//TODO.
}
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SenderImpl.java
Mon Jun 25 16:34:32 2012
@@ -61,10 +61,10 @@ public class SenderImpl extends LinkImp
}
- public void destroy()
+ public void free()
{
- getSession().destroySender(this);
- super.destroy();
+ getSession().freeSender(this);
+ super.free();
}
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SessionImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SessionImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SessionImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/SessionImpl.java
Mon Jun 25 16:34:32 2012
@@ -93,21 +93,21 @@ public class SessionImpl extends Endpoin
return _connection;
}
- public void destroy()
+ public void free()
{
- super.destroy();
+ super.free();
_connection.removeSessionEndpoint(_node);
_node = null;
for(SenderImpl sender : _senders.values())
{
- sender.destroy();
+ sender.free();
}
_senders.clear();
for(ReceiverImpl receiver : _receivers.values())
{
- receiver.destroy();
+ receiver.free();
}
_receivers.clear();
}
@@ -127,12 +127,12 @@ public class SessionImpl extends Endpoin
_node = node;
}
- void destroySender(SenderImpl sender)
+ void freeSender(SenderImpl sender)
{
_senders.remove(sender.getName());
}
- void destroyReceiver(ReceiverImpl receiver)
+ void freeReceiver(ReceiverImpl receiver)
{
_receivers.remove(receiver.getName());
}
Modified:
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
(original)
+++
qpid/proton/trunk/proton-j/src/org/apache/qpid/proton/engine/impl/TransportImpl.java
Mon Jun 25 16:34:32 2012
@@ -628,9 +628,9 @@ public class TransportImpl extends Endpo
return _connectionEndpoint;
}
- public void destroy()
+ public void free()
{
- super.destroy();
+ super.free();
_connectionEndpoint.clearTransport();
}
Added: qpid/proton/trunk/tests/jproton-test
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/jproton-test?rev=1353643&view=auto
==============================================================================
--- qpid/proton/trunk/tests/jproton-test (added)
+++ qpid/proton/trunk/tests/jproton-test Mon Jun 25 16:34:32 2012
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+TEST_HOME=$(dirname $(readlink -f ${BASH_SOURCE[0]}))
+exec jython ${TEST_HOME}/proton-test
Propchange: qpid/proton/trunk/tests/jproton-test
------------------------------------------------------------------------------
svn:executable = *
Modified: qpid/proton/trunk/tests/proton_tests/engine.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/engine.py?rev=1353643&r1=1353642&r2=1353643&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/engine.py (original)
+++ qpid/proton/trunk/tests/proton_tests/engine.py Mon Jun 25 16:34:32 2012
@@ -81,8 +81,8 @@ class Test(common.Test):
def cleanup(self):
for c1, t1, c2, t2 in self._wires:
- pn_connection_destroy(c1)
- pn_connection_destroy(c2)
+ pn_connection_free(c1)
+ pn_connection_free(c2)
def pump(self):
for c1, t1, c2, t2 in self._wires:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
