You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/12/19 19:31:04 UTC
svn commit: r1552392 - in /qpid/dispatch/trunk: doc/book/release-0.1.md
include/qpid/dispatch/alloc.h include/qpid/dispatch/python_embedded.h
src/python_embedded.c tests/system_tests_one_router.py
Author: tross
Date: Thu Dec 19 18:31:04 2013
New Revision: 1552392
URL: http://svn.apache.org/r1552392
Log:
NO-JIRA
- Fixed the system test to use the RELEASED disposition that is now exposed in Messenger.
- Updated the list of fixed Jiras in the release page.
- Replaced () with (void) in the function prototypes of functions with no argument.
Modified:
qpid/dispatch/trunk/doc/book/release-0.1.md
qpid/dispatch/trunk/include/qpid/dispatch/alloc.h
qpid/dispatch/trunk/include/qpid/dispatch/python_embedded.h
qpid/dispatch/trunk/src/python_embedded.c
qpid/dispatch/trunk/tests/system_tests_one_router.py
Modified: qpid/dispatch/trunk/doc/book/release-0.1.md
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/doc/book/release-0.1.md?rev=1552392&r1=1552391&r2=1552392&view=diff
==============================================================================
--- qpid/dispatch/trunk/doc/book/release-0.1.md (original)
+++ qpid/dispatch/trunk/doc/book/release-0.1.md Thu Dec 19 18:31:04 2013
@@ -275,6 +275,7 @@ Nevertheless, the following are known is
- [QPID-5212](https://issues.apache.org/jira/browse/QPID-5212) Dispatch - Add management access to data in the router module
- [QPID-5213](https://issues.apache.org/jira/browse/QPID-5213) Dispatch - Add a CLI tool to display manageable data in Dispatch
- [QPID-5216](https://issues.apache.org/jira/browse/QPID-5216) Dispatch - Stabilization in anticipation of an early release
+ - [QPID-5217](https://issues.apache.org/jira/browse/QPID-5217) Dispatch - Cleanup of API inconsistencies and oddities
- [QPID-5218](https://issues.apache.org/jira/browse/QPID-5218) [dispatch] Crash when outgoing window > 0 and multiple subscribed Messenger clients
- [QPID-5220](https://issues.apache.org/jira/browse/QPID-5220) Dispatch - Define Modes of Operation for the router function
- [QPID-5221](https://issues.apache.org/jira/browse/QPID-5221) Dispatch - Configured connections can be annotated as to their role
@@ -292,7 +293,10 @@ Nevertheless, the following are known is
- [QPID-5351](https://issues.apache.org/jira/browse/QPID-5351) Settle on one prefix for Dispatch names
- [QPID-5352](https://issues.apache.org/jira/browse/QPID-5352) Installation of python code ignores prefix
- [QPID-5365](https://issues.apache.org/jira/browse/QPID-5365) Clean up file locations in Dispatch
+ - [QPID-5367](https://issues.apache.org/jira/browse/QPID-5367) Dispatch - Add man pages and stubs for other documentation
+ - [QPID-5380](https://issues.apache.org/jira/browse/QPID-5380) Dispatch - Simplify use of non-system instances
- [QPID-5381](https://issues.apache.org/jira/browse/QPID-5381) Dispatch - Use dynamic source address for the reply-to in qdstat tool
+ - [QPID-5392](https://issues.apache.org/jira/browse/QPID-5392) Dispatch - Remove ChangeLog; use jira and our website release pages instead
- [QPID-5393](https://issues.apache.org/jira/browse/QPID-5393) Dispatch - Allow qdstat to query any router in the network from a connection
- [QPID-5397](https://issues.apache.org/jira/browse/QPID-5397) Dispatch - Crash occurs when linked deliveries are concurrently settled
- [QPID-5403](https://issues.apache.org/jira/browse/QPID-5403) Dispatch - The router-specific annotations have reserved keys
Modified: qpid/dispatch/trunk/include/qpid/dispatch/alloc.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/include/qpid/dispatch/alloc.h?rev=1552392&r1=1552391&r2=1552392&view=diff
==============================================================================
--- qpid/dispatch/trunk/include/qpid/dispatch/alloc.h (original)
+++ qpid/dispatch/trunk/include/qpid/dispatch/alloc.h Thu Dec 19 18:31:04 2013
@@ -58,15 +58,15 @@ void qd_dealloc(qd_alloc_type_desc_t *de
#define ALLOC_DECLARE(T) \
- T *new_##T(); \
+ T *new_##T(void); \
void free_##T(T *p)
#define ALLOC_DEFINE_CONFIG(T,S,A,C) \
qd_alloc_type_desc_t __desc_##T = {0, #T, S, A, 0, C, 0, 0, 0, 0}; \
__thread qd_alloc_pool_t *__local_pool_##T = 0; \
- T *new_##T() { return (T*) qd_alloc(&__desc_##T, &__local_pool_##T); } \
+ T *new_##T(void) { return (T*) qd_alloc(&__desc_##T, &__local_pool_##T); } \
void free_##T(T *p) { qd_dealloc(&__desc_##T, &__local_pool_##T, (void*) p); } \
- qd_alloc_stats_t *alloc_stats_##T() { return __desc_##T.stats; }
+ qd_alloc_stats_t *alloc_stats_##T(void) { return __desc_##T.stats; }
#define ALLOC_DEFINE(T) ALLOC_DEFINE_CONFIG(T, sizeof(T), 0, 0)
Modified: qpid/dispatch/trunk/include/qpid/dispatch/python_embedded.h
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/include/qpid/dispatch/python_embedded.h?rev=1552392&r1=1552391&r2=1552392&view=diff
==============================================================================
--- qpid/dispatch/trunk/include/qpid/dispatch/python_embedded.h (original)
+++ qpid/dispatch/trunk/include/qpid/dispatch/python_embedded.h Thu Dec 19 18:31:04 2013
@@ -36,25 +36,25 @@ void qd_python_initialize(qd_dispatch_t
* Finalize the embedded-python subsystem. After this is called, there
* must be no further invocation of qd_python methods.
*/
-void qd_python_finalize();
+void qd_python_finalize(void);
/**
* Start using embedded python. This is called once by each module that plans
* to use embedded python capabilities. It must call qd_python_start before
* using any python components.
*/
-void qd_python_start();
+void qd_python_start(void);
/**
* Stop using embedded python. This is called once by each module after it is
* finished using embedded python capabilities.
*/
-void qd_python_stop();
+void qd_python_stop(void);
/**
* Get the Python top level "dispatch" module.
*/
-PyObject *qd_python_module();
+PyObject *qd_python_module(void);
/**
* Convert a Python object to AMQP format and append to a composed_field.
@@ -76,7 +76,7 @@ PyObject *qd_field_to_py(qd_parsed_field
* These are temporary and will eventually be replaced by having an internal python
* work queue that feeds a dedicated embedded-python thread.
*/
-void qd_python_lock();
-void qd_python_unlock();
+void qd_python_lock(void);
+void qd_python_unlock(void);
#endif
Modified: qpid/dispatch/trunk/src/python_embedded.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/python_embedded.c?rev=1552392&r1=1552391&r2=1552392&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/python_embedded.c (original)
+++ qpid/dispatch/trunk/src/python_embedded.c Thu Dec 19 18:31:04 2013
@@ -38,7 +38,7 @@ static PyObject *dispatch_python_pk
static qd_address_semantics_t py_semantics = {false, QD_FORWARD_MULTICAST};
-static void qd_python_setup();
+static void qd_python_setup(void);
void qd_python_initialize(qd_dispatch_t *qd,
@@ -51,14 +51,14 @@ void qd_python_initialize(qd_dispatch_t
}
-void qd_python_finalize()
+void qd_python_finalize(void)
{
assert(ref_count == 0);
sys_mutex_free(lock);
}
-void qd_python_start()
+void qd_python_start(void)
{
sys_mutex_lock(lock);
if (ref_count == 0) {
@@ -71,7 +71,7 @@ void qd_python_start()
}
-void qd_python_stop()
+void qd_python_stop(void)
{
sys_mutex_lock(lock);
ref_count--;
@@ -85,7 +85,7 @@ void qd_python_stop()
}
-PyObject *qd_python_module()
+PyObject *qd_python_module(void)
{
assert(dispatch_module);
return dispatch_module;
@@ -636,7 +636,7 @@ static void qd_register_log_constant(PyO
}
-static void qd_python_setup()
+static void qd_python_setup(void)
{
LogAdapterType.tp_new = PyType_GenericNew;
IoAdapterType.tp_new = PyType_GenericNew;
@@ -680,12 +680,12 @@ static void qd_python_setup()
}
}
-void qd_python_lock()
+void qd_python_lock(void)
{
sys_mutex_lock(lock);
}
-void qd_python_unlock()
+void qd_python_unlock(void)
{
sys_mutex_unlock(lock);
}
Modified: qpid/dispatch/trunk/tests/system_tests_one_router.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_one_router.py?rev=1552392&r1=1552391&r2=1552392&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_one_router.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_one_router.py Thu Dec 19 18:31:04 2013
@@ -22,7 +22,7 @@ import os
import time
import unittest
import subprocess
-from proton import Messenger, Message, PENDING, ACCEPTED, REJECTED
+from proton import Messenger, Message, PENDING, ACCEPTED, REJECTED, RELEASED
def startRouter(obj):
default_home = os.path.normpath('/usr/lib/qpid-dispatch')
@@ -366,7 +366,7 @@ class RouterTest(unittest.TestCase):
tx_tracker = M1.put(tm)
M1.send(0)
self.flush(M1)
- self.assertEqual(PENDING, M1.status(tx_tracker)) ## Is this right???
+ self.assertEqual(RELEASED, M1.status(tx_tracker))
M1.stop()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org