svn commit: r1372768 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
Author: robbie Date: Tue Aug 14 08:30:25 2012 New Revision: 1372768 URL: http://svn.apache.org/viewvc?rev=1372768view=rev Log: NO-JIRA: remove unused manual test class Removed: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372769 - /qpid/trunk/qpid/java/client/test/
Author: robbie Date: Tue Aug 14 08:30:45 2012 New Revision: 1372769 URL: http://svn.apache.org/viewvc?rev=1372769view=rev Log: NO-JIRA: remove unused client/test folder Removed: qpid/trunk/qpid/java/client/test/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372852 - in /qpid/trunk/qpid/java/perftests/visualisation-jfc/src: main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java test/java/org/apache/qpid/disttest/charting/writer/
Author: kwall
Date: Tue Aug 14 12:05:30 2012
New Revision: 1372852
URL: http://svn.apache.org/viewvc?rev=1372852view=rev
Log:
QPID-4143: modified perf test visualisation code so that chart-summary.html now
contains a table of contents.
Applied patch from Philip Harvey p...@philharveyonline.com
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
(contents, props changed)
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java?rev=1372852r1=1372851r2=1372852view=diff
==
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/main/java/org/apache/qpid/disttest/charting/writer/ChartWriter.java
Tue Aug 14 12:05:30 2012
@@ -105,8 +105,17 @@ public class ChartWriter
writer = new BufferedWriter(new FileWriter(summaryFile));
writer.write(htmlHeader);
+
+writer.write(ul\n);
+for (File chartFile : _chartFiles)
+{
+writer.write(lia href='#+ chartFile.getName()
+' + chartFile.getName() + /a/li\n);
+}
+writer.write(/ul\n);
+
for (File chartFile : _chartFiles)
{
+writer.write(a name=' + chartFile.getName() +
'/\n);
writer.write(img src=' + chartFile.getName() +
'/\n);
}
writer.write(htmlFooter);
Modified:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html?rev=1372852r1=1372851r2=1372852view=diff
==
---
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
(original)
+++
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
Tue Aug 14 12:05:30 2012
@@ -3,7 +3,13 @@
titlePerformance Charts/title
/head
body
+ul
+lia href='#chart1.png'chart1.png/a/li
+lia href='#chart2.png'chart2.png/a/li
+/ul
+a name='chart1.png'/
img src='chart1.png'/
+a name='chart2.png'/
img src='chart2.png'/
/body
/html
\ No newline at end of file
Propchange:
qpid/trunk/qpid/java/perftests/visualisation-jfc/src/test/java/org/apache/qpid/disttest/charting/writer/expected-chart-summary.html
--
svn:executable = *
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372946 - /qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
Author: kgiusti
Date: Tue Aug 14 15:54:56 2012
New Revision: 1372946
URL: http://svn.apache.org/viewvc?rev=1372946view=rev
Log:
NO-JIRA: bugfix - prevent re-running ssl shutdown if socket closed
Modified:
qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c?rev=1372946r1=1372945r2=1372946view=diff
==
--- qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c Tue
Aug 14 15:54:56 2012
@@ -772,6 +772,8 @@ static int start_clear_connected( pn_con
*/
static int start_ssl_shutdown( pn_connector_t *c )
{
+printf(start_ssl_shutdown...\n);
+if (c-closed) return 0;
return handle_ssl_shutdown( c );
}
@@ -800,6 +802,7 @@ static int handle_ssl_shutdown( pn_conne
case SSL_ERROR_NONE:
printf( shutdown code=%d\n, SSL_get_error(impl-ssl,rc));
// shutdown completed
+c-io_handler = pn_null_io_handler;
pn_connector_close( c );
return 0;
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372947 - in /qpid/proton/branches/driver_abstraction/examples/mailbox: README.txt fetch
Author: kgiusti Date: Tue Aug 14 15:55:12 2012 New Revision: 1372947 URL: http://svn.apache.org/viewvc?rev=1372947view=rev Log: NO-JIRA: add SSL support to fetch mailbox client Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/README.txt qpid/proton/branches/driver_abstraction/examples/mailbox/fetch Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/README.txt URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/README.txt?rev=1372947r1=1372946r2=1372947view=diff == --- qpid/proton/branches/driver_abstraction/examples/mailbox/README.txt (original) +++ qpid/proton/branches/driver_abstraction/examples/mailbox/README.txt Tue Aug 14 15:55:12 2012 @@ -59,6 +59,7 @@ Optional - using SSL to encrypt the data certificates: $ post -m myMailbox --ssl-cert-db ./trusted_db Here is a message +$ fetch --ssl-cert-db ./trusted_db myMailbox [1] At the time of this writing SSL/TLS is implemented using OpenSSL, and is only Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/fetch URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/fetch?rev=1372947r1=1372946r2=1372947view=diff == --- qpid/proton/branches/driver_abstraction/examples/mailbox/fetch (original) +++ qpid/proton/branches/driver_abstraction/examples/mailbox/fetch Tue Aug 14 15:55:12 2012 @@ -35,12 +35,23 @@ class Options(object): parser.add_option(-v, --verbose, action=store_true, help=Turn on extra trace messages.) +# SSL configuration +parser.add_option(--ssl-cert-db, type=str, metavar=dir, + help=database of trusted certificates) + +# if server wants authentication: +#parser.add_option(--ssl-cert-file) +#parser.add_option(--ssl-key-file) +#parser.add_option(--ssl-key-pw) + opts, mailboxes = parser.parse_args() # uses sys.argv[1:] self.mailbox = None if len(mailboxes) == 1: self.mailbox = str(mailboxes[0]) self.server = opts.server +self.ca_database = opts.ssl_cert_db + addr = opts.server.rsplit(:, 1) self.host = addr[0] if len(addr) == 2: @@ -52,7 +63,7 @@ class Options(object): class FetchClient(object): -def __init__(self, host, port, mailbox): +def __init__(self, host, port, mailbox, ca_database=None): Initialize the client by supplying the address of the server, and the name of the mailbox to fetch from. @@ -60,6 +71,7 @@ class FetchClient(object): self.port = port self.mailbox = mailbox self.logging = False +self.ca_database = ca_database def setup(self): Setup and configure the connection to the server. @@ -70,6 +82,11 @@ class FetchClient(object): self.driver = pn_driver(); self.cxtr = pn_connector(self.driver, self.host, self.port, None) +# configure database of trusted CA's +if self.ca_database: +rc = pn_connector_ssl_client_init(self.cxtr, self.ca_database); +assert(rc == 0) + # configure SASL self.sasl = pn_connector_sasl(self.cxtr) pn_sasl_mechanisms(self.sasl, ANONYMOUS) @@ -91,6 +108,25 @@ class FetchClient(object): pn_link_open(self.link) +def teardown(self): + Perform a clean disconnect from the server, and release the +resources created in setup() + +self.log(Shutting down the connection cleanly...) +pn_connection_close(self.conn) + +# now wait for the connector to close +while not (pn_connector_closed(self.cxtr)): +self.wait() + +#pn_sasl_free(self.sasl); +pn_link_free(self.link); +pn_session_free(self.ssn); +pn_connection_free(self.conn); +pn_connector_free(self.cxtr); +self.log(...Shutdown complete!) + + def wait(self): Wait for an event to process. @@ -150,7 +186,8 @@ def main(): receiver = FetchClient(options.host, options.port, - options.mailbox) + options.mailbox, + options.ca_database) if options.verbose: receiver.enableLogging() @@ -212,10 +249,9 @@ def main(): receiver.wait() receiver.settle() -# we're done, close and wait for the remote to close also -pn_connection_close(receiver.conn) -while not (pn_connection_state(receiver.conn) PN_REMOTE_CLOSED): -receiver.wait() +# we're done, now clean up the connection: +receiver.teardown() + return 0 -
svn commit: r1372948 - in /qpid/proton/branches/driver_abstraction: examples/mailbox/server proton-c/src/drivers/openssl.c
Author: kgiusti
Date: Tue Aug 14 15:55:23 2012
New Revision: 1372948
URL: http://svn.apache.org/viewvc?rev=1372948view=rev
Log:
PROTON-2: fix clear/encrypted detection.
Modified:
qpid/proton/branches/driver_abstraction/examples/mailbox/server
qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
Modified: qpid/proton/branches/driver_abstraction/examples/mailbox/server
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/examples/mailbox/server?rev=1372948r1=1372947r2=1372948view=diff
==
--- qpid/proton/branches/driver_abstraction/examples/mailbox/server (original)
+++ qpid/proton/branches/driver_abstraction/examples/mailbox/server Tue Aug 14
15:55:23 2012
@@ -116,6 +116,7 @@ class MailboxServer(object):
self.ca_database);
assert(rc == 0)
if not self.require_encryption:
+self.log(Allowing both encrypted AND unencrypted
connections!)
rc = pn_listener_ssl_allow_unsecured_clients(self.listener)
assert(rc == 0)
return True
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
URL:
http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c?rev=1372948r1=1372947r2=1372948view=diff
==
--- qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c
(original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/drivers/openssl.c Tue
Aug 14 15:55:23 2012
@@ -465,6 +465,7 @@ static int configure_ca_database(SSL_CTX
static int start_check_for_ssl( pn_connector_t *client )
{
+printf(start_check_for_ssl()\n);
client-status |= PN_SEL_RD;
client-io_handler = handle_check_for_ssl;
return 0;
@@ -477,13 +478,20 @@ static int handle_check_for_ssl( pn_conn
int rc;
int retries = 3;
+printf(handle_check_for_ssl()\n);
+
do {
rc = recv(client-fd, buf, sizeof(buf), MSG_PEEK);
if (rc == sizeof(buf))
break;
-if (rc 0 errno != EINTR errno != EAGAIN) {
-perror(handle_check_for_ssl() recv failed:);
-break;
+if (rc 0) {
+if (errno == EWOULDBLOCK) {
+client-status |= PN_SEL_RD;
+return 0;
+} else if (errno != EINTR) {
+perror(handle_check_for_ssl() recv failed:);
+break;
+}
}
} while (retries-- 0);
@@ -604,6 +612,7 @@ int handle_ssl_connect( pn_connector_t *
static int start_ssl_accept(pn_connector_t *client)
{
+printf(start_ssl_accept()\n);
pn_connector_ssl_t *impl = client-ssl;
if (!impl) return -1;
pn_listener_ssl_t *parent = client-listener-ssl;
@@ -618,6 +627,7 @@ static int start_ssl_accept(pn_connector
static int handle_ssl_accept(pn_connector_t *client)
{
+printf(handle_ssl_accept()\n);
pn_connector_ssl_t *impl = client-ssl;
if (!impl) return -1;
@@ -760,7 +770,9 @@ int handle_ssl_connection_up( pn_connect
*/
static int start_clear_connected( pn_connector_t *c )
{
+printf(start_clear_connected()\n);
pn_connector_free_ssl( c );
+c-status |= (PN_SEL_RD | PN_SEL_WR);
c-io_handler = pn_io_handler;
return 0;
}
@@ -772,7 +784,7 @@ static int start_clear_connected( pn_con
*/
static int start_ssl_shutdown( pn_connector_t *c )
{
-printf(start_ssl_shutdown...\n);
+printf(start_ssl_shutdown()\n);
if (c-closed) return 0;
return handle_ssl_shutdown( c );
}
@@ -783,7 +795,7 @@ static int handle_ssl_shutdown( pn_conne
pn_connector_ssl_t *impl = c-ssl;
if (!impl) return -1;
-printf(handle_ssl_shutdown...\n);
+printf(handle_ssl_shutdown()\n);
do {
rc = SSL_shutdown( impl-ssl );
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1373004 - /qpid/branches/0.18/qpid/cpp/src/qpid/cluster/Cluster.cpp
Author: mgoulish
Date: Tue Aug 14 18:20:05 2012
New Revision: 1373004
URL: http://svn.apache.org/viewvc?rev=1373004view=rev
Log:
QPID-4194 : re-enable queue events in CATCHUP state.
pavel moravec's fix -- without this, newbie broker with a replication
queue will not replicate messages received during CATCHUP.
Modified:
qpid/branches/0.18/qpid/cpp/src/qpid/cluster/Cluster.cpp
Modified: qpid/branches/0.18/qpid/cpp/src/qpid/cluster/Cluster.cpp
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/cpp/src/qpid/cluster/Cluster.cpp?rev=1373004r1=1373003r2=1373004view=diff
==
--- qpid/branches/0.18/qpid/cpp/src/qpid/cluster/Cluster.cpp (original)
+++ qpid/branches/0.18/qpid/cpp/src/qpid/cluster/Cluster.cpp Tue Aug 14
18:20:05 2012
@@ -615,7 +615,6 @@ void Cluster::configChange (
void Cluster::setReady(Lock) {
state = READY;
mcast.setReady();
-broker.getQueueEvents().enable();
enableClusterSafe();// Enable cluster-safe assertions.
}
@@ -979,6 +978,12 @@ void Cluster::checkUpdateIn(Lock l) {
map = *updatedMap;
mcast.mcastControl(ClusterReadyBody(ProtocolVersion(), myUrl.str()),
self);
state = CATCHUP;
+/* In CATCHUP mode the update has finished, and we are consuming
+** whatever backlog of messages has built up during the update.
+** We should enable queue events here, or messages that are received
+** during this phase will not be replicated properly. ( If there are
+** relevant replication queues. ) */
+broker.getQueueEvents().enable();
memberUpdate(l);
// Must be called *after* memberUpdate() to avoid sending an extra
update.
failoverExchange-setReady();
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
[CONF] Apache Qpid 0.18 Release
0.18 Release Page edited by Justin Ross Comment: Add RC3 Changes (4) ... h2. Status - 14 August: Proposed final RC3 is available at revision 1373004 of the release branch - 2 August: RC2 produced at revision 1368514 of the release branch - 20 July: RC1 produced at revision 1363863 of the release branch ... | Alpha | [http://people.apache.org/~jross/qpid-0.18-alpha/] | | Beta | [http://people.apache.org/~jross/qpid-0.18-beta/] | | RC1| [http://people.apache.org/~jross/qpid-0.18-rc1/] | | RC2| [http://people.apache.org/~jross/qpid-0.18-rc2/] | | RC3 | [http://people.apache.org/~jross/qpid-0.18-rc3/] | h2. Links ... Full Content 0.18 Release Status 14 August: Proposed final RC3 is available at revision 1373004 of the release branch 2 August: RC2 produced at revision 1368514 of the release branch 20 July: RC1 produced at revision 1363863 of the release branch 9 July: Beta distro produced at revision 1359232 of the release branch 9 July: Release branch created at revision 1359193 20 June: Alpha is released at revision 1351519 of trunk 8 March: Trunk is open for 0.18 development at revision 1297794 Issues Features and improvements http://bit.ly/MJfzly Open bugs http://bit.ly/LAj7Y4 Fixed bugs http://bit.ly/M7sT4m Candidate bugs http://bit.ly/MJj7Ep Distributions Alpha http://people.apache.org/~jross/qpid-0.18-alpha/ Beta http://people.apache.org/~jross/qpid-0.18-beta/ RC1 http://people.apache.org/~jross/qpid-0.18-rc1/ RC2 http://people.apache.org/~jross/qpid-0.18-rc2/ RC3 http://people.apache.org/~jross/qpid-0.18-rc3/ Links Release branch https://svn.apache.org/repos/asf/qpid/branches/0.18/ Schedule 18 June Alpha Major feature integration ends; with approval, certain less disruptive features can be committed Trunk remains open for bug fixing The alpha release tests the release process after the introduction of major features 2 July, 2 weeks later Beta The release branch is created Trunk opens for development toward the next release Release branch commits require approval Release manager produces outstanding bug report and triages bugs 18 July, 2 weeks later RC1 25 July, 1 week later RC2 1 August, 1 week later RC3 Targeted release date Change Notification Preferences View Online | View Changes | Add Comment - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1373133 - in /qpid/trunk/qpid/java/perftests/etc/chartdefs: 1021-AcknowledgementModes-AutoAck.chartdef 1021-AcknowledgementModes-Persistent.chartdef 1022-AcknowledgementModes-Transacted.c
Author: kwall
Date: Tue Aug 14 21:59:45 2012
New Revision: 1373133
URL: http://svn.apache.org/viewvc?rev=1373133view=rev
Log:
QPID-4143: [Java Perf Tests] Modified acknowledgement mode graphs to contrast
different ack-modes with like message persistence settings
Added:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
- copied, changed from r1372852,
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
- copied, changed from r1372852,
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
Removed:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
Copied:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
(from r1372852,
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdefp1=qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdefr1=1372852r2=1373133rev=1373133view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transacted.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-Persistent.chartdef
Tue Aug 14 21:59:45 2012
@@ -19,14 +19,17 @@
chartType=BAR
chartTitle=Performance of acknowledgement modes
-chartSubtitle=Transacted
-xAxisTitle=Persistence
+chartSubtitle=Persistent messages (1024b)
+xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
yAxisTitle=Throughput (KB/s)
-series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes
WHERE acknowledgeMode = '0' AND participantName = 'All'
+series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM
AcknowledgementModes WHERE testName like 'Persistent%' AND participantName =
'All' ORDER BY acknowledgeMode
series.1.legend=Current
series.1.dir=${csvCurrentDir}
-series.2.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes
WHERE acknowledgeMode = '0' AND participantName = 'All'
+
+
+series.2.statement=SELECT acknowledgeMode, throughputKbPerS FROM
AcknowledgementModes WHERE testName like 'Persistent%' AND participantName =
'All' ORDER BY acknowledgeMode
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
+
Copied:
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
(from r1372852,
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef?p2=qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdefp1=qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdefr1=1372852r2=1373133rev=1373133view=diff
==
---
qpid/trunk/qpid/java/perftests/etc/chartdefs/1021-AcknowledgementModes-AutoAck.chartdef
(original)
+++
qpid/trunk/qpid/java/perftests/etc/chartdefs/1022-AcknowledgementModes-Transient.chartdef
Tue Aug 14 21:59:45 2012
@@ -19,15 +19,14 @@
chartType=BAR
chartTitle=Performance of acknowledgement modes
-chartSubtitle=Auto-acknowledge
-xAxisTitle=Persistence
+chartSubtitle=Transient messages (1024b)
+xAxisTitle=Acknowledge mode (0=session transacted; 1=auto-acknowledge)
yAxisTitle=Throughput (KB/s)
-series.1.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes
WHERE acknowledgeMode = '1' AND participantName = 'All'
+series.1.statement=SELECT acknowledgeMode, throughputKbPerS FROM
AcknowledgementModes WHERE testName like 'Transient%' AND participantName =
'All' ORDER BY acknowledgeMode
series.1.legend=Current
series.1.dir=${csvCurrentDir}
-series.2.statement=SELECT testName, throughputKbPerS FROM AcknowledgementModes
WHERE acknowledgeMode = '1' AND participantName = 'All'
+series.2.statement=SELECT acknowledgeMode, throughputKbPerS FROM
AcknowledgementModes WHERE testName like 'Transient%' AND participantName =
'All' ORDER BY acknowledgeMode
series.2.legend=Baseline
series.2.dir=${csvBaselineDir}
-
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1373147 - /qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Author: shuston
Date: Tue Aug 14 22:26:28 2012
New Revision: 1373147
URL: http://svn.apache.org/viewvc?rev=1373147view=rev
Log:
Resolves QPID-4084, changing the format of high-res logged time from
seconds-since-start to date/time, consistent with the POSIX version of the
broker.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp?rev=1373147r1=1373146r2=1373147view=diff
==
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/Time.cpp Tue Aug 14 22:26:28 2012
@@ -20,10 +20,12 @@
*/
#include qpid/sys/Time.h
+#include cmath
#include ostream
#include boost/date_time/posix_time/posix_time.hpp
#include boost/thread/thread_time.hpp
#include windows.h
+#include time.h
using namespace boost::posix_time;
@@ -33,8 +35,16 @@ namespace {
// more or less. Keep track of the start value and the conversion factor to
// seconds.
bool timeInitialized = false;
-LARGE_INTEGER start;
-double freq = 1.0;
+LARGE_INTEGER start_hpc;
+double hpc_freq = 1.0;
+
+double start_time;
+
+/// Static constant to remove time skew between FILETIME and POSIX
+/// time. POSIX and Win32 use different epochs (Jan. 1, 1970 v.s.
+/// Jan. 1, 1601). The following constant defines the difference
+/// in 100ns ticks.
+const DWORDLONG FILETIME_to_timval_skew = 0x19db1ded53e8000;
}
@@ -114,23 +124,59 @@ void outputFormattedNow(std::ostream o)
}
void outputHiresNow(std::ostream o) {
+::time_t tv_sec;
+::tm timeinfo;
+char time_string[100];
+
if (!timeInitialized) {
-start.QuadPart = 0;
+// To start, get the current time from FILETIME which includes
+// sub-second resolution. However, since FILETIME is updated a bit
+// bumpy every 15 msec or so, future time displays will be the
+// starting FILETIME plus a delta based on the high-resolution
+// performance counter.
+FILETIME file_time;
+ULARGE_INTEGER start_usec;
+::GetSystemTimeAsFileTime(file_time); // This is in 100ns units
+start_usec.LowPart = file_time.dwLowDateTime;
+start_usec.HighPart = file_time.dwHighDateTime;
+start_usec.QuadPart -= FILETIME_to_timval_skew;
+start_usec.QuadPart /= 10; // Convert 100ns to usec
+tv_sec = (time_t)(start_usec.QuadPart / (1000 * 1000));
+long tv_usec = (long)(start_usec.QuadPart % (1000 * 1000));
+start_time = static_castdouble(tv_sec);
+start_time += tv_usec / 100.0;
+
+start_hpc.QuadPart = 0;
LARGE_INTEGER iFreq;
iFreq.QuadPart = 1;
-QueryPerformanceCounter(start);
+QueryPerformanceCounter(start_hpc);
QueryPerformanceFrequency(iFreq);
-freq = static_castdouble(iFreq.QuadPart);
+hpc_freq = static_castdouble(iFreq.QuadPart);
timeInitialized = true;
}
-LARGE_INTEGER iNow;
-iNow.QuadPart = 0;
-QueryPerformanceCounter(iNow);
-iNow.QuadPart -= start.QuadPart;
-if (iNow.QuadPart 0)
-iNow.QuadPart = 0;
-double now = static_castdouble(iNow.QuadPart);
-now /= freq; // now is seconds after this
-o std::fixed std::setprecision(8) std::setw(16)
std::setfill('0') now s ;
+LARGE_INTEGER hpc_now;
+hpc_now.QuadPart = 0;
+QueryPerformanceCounter(hpc_now);
+hpc_now.QuadPart -= start_hpc.QuadPart;
+if (hpc_now.QuadPart 0)
+hpc_now.QuadPart = 0;
+double now = static_castdouble(hpc_now.QuadPart);
+now /= hpc_freq; // now is seconds after this
+double fnow = start_time + now;
+double usec, sec;
+usec = modf(fnow, sec);
+tv_sec = static_casttime_t(sec);
+#ifdef _MSC_VER
+::localtime_s(timeinfo, tv_sec);
+#else
+timeinfo = *(::localtime(tv_sec));
+#endif
+::strftime(time_string, 100,
+ %Y-%m-%d %H:%M:%S,
+ timeinfo);
+// No way to set max field width to cleanly output the double usec so
+// convert it back to integral number of usecs and print that.
+unsigned long i_usec = usec * 1000 * 1000;
+o time_string . std::setw(6) std::setfill('0') i_usec
;
}
}}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1373155 - in /qpid/trunk/qpid: doc/book/src/java-broker/HA-Guide.xml java/build.deps java/ivy.retrieve.xml java/lib/poms/je-5.0.55.xml java/lib/poms/je-5.0.58.xml
Author: kwall
Date: Tue Aug 14 22:51:00 2012
New Revision: 1373155
URL: http://svn.apache.org/viewvc?rev=1373155view=rev
Log:
QPID-4231: Update optional BDB store to use version 5.0.58 of BDB
Added:
qpid/trunk/qpid/java/lib/poms/je-5.0.58.xml
- copied, changed from r1373133,
qpid/trunk/qpid/java/lib/poms/je-5.0.55.xml
Removed:
qpid/trunk/qpid/java/lib/poms/je-5.0.55.xml
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/ivy.retrieve.xml
Modified: qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml?rev=1373155r1=1373154r2=1373155view=diff
==
--- qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml Tue Aug 14 22:51:00
2012
@@ -1,7 +1,7 @@
?xml version=1.0 encoding=utf-8?
!DOCTYPE urls [
!ENTITY oracleBdbProductOverviewUrl
http://www.oracle.com/technetwork/products/berkeleydb/overview/index-093405.html;
-!ENTITY oracleBdbProductVersion 5.0.48
+!ENTITY oracleBdbProductVersion 5.0.58
!ENTITY oracleBdbRepGuideUrl
http://oracle.com/cd/E17277_02/html/ReplicationGuide/;
!ENTITY oracleBdbJavaDocUrl http://docs.oracle.com/cd/E17277_02/html/java/;
!ENTITY oracleJdkDocUrl http://oracle.com/javase/6/docs/api/;
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1373155r1=1373154r2=1373155view=diff
==
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Tue Aug 14 22:51:00 2012
@@ -106,7 +106,7 @@ jca.libs=${geronimo-j2ee} ${geronimo-jta
jca.test.libs=${test.libs}
# optional bdbstore module deps
-bdb-je=lib/bdbstore/je-5.0.55.jar
+bdb-je=lib/bdbstore/je-5.0.58.jar
bdbstore.libs=${bdb-je}
bdbstore.test.libs=${test.libs}
Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1373155r1=1373154r2=1373155view=diff
==
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Tue Aug 14 22:51:00 2012
@@ -74,7 +74,7 @@
!-- The following are optional dependencies, for modules providing
optional functionlity or
for use in optional build/test steps. Their optional status is usually
indicative of licences
which are not compatible with the Apache Licence --
-dependency org=com.sleepycat name=je rev=5.0.55 transitive=false
conf=bdbje/
+dependency org=com.sleepycat name=je rev=5.0.58 transitive=false
conf=bdbje/
dependency org=jfree name=jfreechart rev=1.0.13 transitive=false
conf=jfree/
dependency org=jfree name=jcommon rev=1.0.16 transitive=false
conf=jfree/
dependency org=net.sourceforge.csvjdbc name=csvjdbc rev=1.0.8
transitive=false conf=csvjdbc/
Copied: qpid/trunk/qpid/java/lib/poms/je-5.0.58.xml (from r1373133,
qpid/trunk/qpid/java/lib/poms/je-5.0.55.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/je-5.0.58.xml?p2=qpid/trunk/qpid/java/lib/poms/je-5.0.58.xmlp1=qpid/trunk/qpid/java/lib/poms/je-5.0.55.xmlr1=1373133r2=1373155rev=1373155view=diff
==
--- qpid/trunk/qpid/java/lib/poms/je-5.0.55.xml (original)
+++ qpid/trunk/qpid/java/lib/poms/je-5.0.58.xml Tue Aug 14 22:51:00 2012
@@ -18,5 +18,5 @@
dep
groupIdcom.sleepycat/groupId
artifactIdje/artifactId
- version5.0.55/version
+ version5.0.58/version
/dep
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
