[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba has been updated. Commit Message changed to: FOTS test driver changes: 1. Use xqxq:delete-query to release resources, 2. Comments, 3. Cosmetic changes, 4. Small performance improvements For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba has been updated. Description changed to: FOTS test driver changes: 1. Use xqxq:delete-query to release resources, 2. Comments, 3. Cosmetic changes, 4. Small performance improvements For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
Review: Approve -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fots_driver-2013-01-30T11-30-30.217Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The attempt to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job fots_driver-2013-01-30T11-30-30.217Z is finished. The final status was: No tests were run - build or configure step must have failed. Not commiting changes. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fots_driver-2013-01-30T13-43-32.011Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
Validation queue job fots_driver-2013-01-30T13-43-32.011Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fots_driver into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/fots_driver into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 -- https://code.launchpad.net/~zorba-coders/zorba/fots_driver/+merge/145128 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/store/naive/simple_collection.cpp -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/xml-in-json-indices-2013-01-30T14-46-35.086Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/bug1109853 into lp:zorba/jdbc-module
Sorry I added this later, I find out this problem when I was creating the paper. -- https://code.launchpad.net/~zorba-coders/zorba/bug1109853/+merge/145525 Your team Zorba Coders is subscribed to branch lp:zorba/jdbc-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
Voting does not meet specified criteria. Required: Approve 1, Disapprove 1, Needs Fixing 1, Pending 1. Got: 4 Needs Fixing, 1 Needs Information. -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
The proposal to merge lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/xml-in-json-indices into lp:zorba
Validation queue job xml-in-json-indices-2013-01-30T14-46-35.086Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/xml-in-json-indices/+merge/122548 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/pjl-misc-2013-01-30T15-40-37.894Z/log.html -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/couchbase-test-fixes into lp:zorba/couchbase-module
Juan - I'm confused by the change to the view.xq test case. You modified the
implementation of delete-view(), but you've removed the call to delete-view()
from the test. Is this actually fixing the bug?
Yes, deleting a view using the REST interface causes crashes. I am not sure why
but using both a command line using curl and using the delete of the module if
a test is run in a time gap after delete-view it breaks.
Also, your commit message says you changed test to use development views,
but I don't see how that was done. Does having a view name start with dev do
this magically?
In fact it is, if the name of a document it is called dev_{name} it is a
development document.
--
https://code.launchpad.net/~zorba-coders/zorba/couchbase-test-fixes/+merge/144352
Your team Zorba Coders is subscribed to branch lp:zorba/couchbase-module.
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The attempt to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba failed. Below is the output from the failed tests. CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:275 (message): Validation queue job pjl-misc-2013-01-30T15-40-37.894Z is finished. The final status was: 1 tests did not succeed - changes not commited. Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module
Review: Approve Approving it, just because hopefully it's a xalan2 dependency that hopefully they will handle correctly. -- https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
Validation queue job pjl-misc-2013-01-30T16-46-40.37Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/pjl-misc into lp:zorba
The proposal to merge lp:~paul-lucas/zorba/pjl-misc into lp:zorba has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 -- https://code.launchpad.net/~paul-lucas/zorba/pjl-misc/+merge/145533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/hof into lp:zorba
The proposal to merge lp:~nbrinza/zorba/hof into lp:zorba has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~nbrinza/zorba/hof/+merge/144533 -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/144533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~nbrinza/zorba/hof into lp:zorba
Attempt to merge into lp:zorba failed due to conflicts: text conflict in src/compiler/translator/translator.cpp text conflict in src/types/typeops.cpp -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/144533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~nbrinza/zorba/hof into lp:zorba
The proposal to merge lp:~nbrinza/zorba/hof into lp:zorba has been updated. Status: Approved = Needs review For more details, see: https://code.launchpad.net/~nbrinza/zorba/hof/+merge/144533 -- https://code.launchpad.net/~nbrinza/zorba/hof/+merge/144533 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-855481 into lp:zorba
Paul J. Lucas has proposed merging lp:~paul-lucas/zorba/bug-855481 into
lp:zorba.
Commit message:
Fixed millisecond time for Windows.
Requested reviews:
Paul J. Lucas (paul-lucas)
Related bugs:
Bug #855481 in Zorba: Too small time types on Windows
https://bugs.launchpad.net/zorba/+bug/855481
For more details, see:
https://code.launchpad.net/~paul-lucas/zorba/bug-855481/+merge/145740
Fixed millisecond time for Windows.
--
https://code.launchpad.net/~paul-lucas/zorba/bug-855481/+merge/145740
Your team Zorba Coders is subscribed to branch lp:zorba.
=== modified file 'include/zorba/util/time.h'
--- include/zorba/util/time.h 2012-09-19 21:16:15 +
+++ include/zorba/util/time.h 2013-01-30 22:26:22 +
@@ -17,6 +17,8 @@
#ifndef ZORBA_UTIL_TIME_H
#define ZORBA_UTIL_TIME_H
+#include zorba/config.h
+
/**
* This header includes utility functions for certain timing-related
* operations, namely getting current wall-clock time and current
@@ -53,6 +55,13 @@
namespace time
{
+// Large enough to hold number of milliseconds since epoch.
+#if ZORBA_SIZEOF_LONG = 4
+typedef long long msec_type;
+#else
+typedef long msec_type;
+#endif /* ZORBA_SIZEOF_LONG */
+
//
//
// Types and functions for CPU time
@@ -139,12 +148,12 @@
clock_gettime(CLOCK_MONOTONIC, t);
#else
clock_gettime(CLOCK_REALTIME, t);
-#endif
+#endif /* _POSIX_MONOTONIC_CLOCK */
}
-inline long get_walltime_in_millis(const walltime t)
+inline msec_type get_walltime_in_millis(const walltime t)
{
- return t.tv_sec * 1000 + t.tv_nsec / 100;
+ return t.tv_sec * (msec_type)1000 + t.tv_nsec / 100;
}
#elif defined(WIN32)
@@ -160,7 +169,7 @@
typedef struct timeb walltime;
#else
typedef struct _timeb walltime;
-#endif
+#endif /* WINCE */
inline double get_walltime_elapsed (const walltime t0, const walltime t1)
{
@@ -173,12 +182,12 @@
ftime(t);
#else
_ftime_s(t);
-#endif
+#endif /* WINCE */
}
-inline long get_walltime_in_millis(const walltime t)
+inline msec_type get_walltime_in_millis(const walltime t)
{
- return (long)(t.time * 1000 + t.millitm);
+ return t.time * (msec_type)1000 + t.millitm;
}
#else /* not Windows, and no clock_gettime() */
@@ -199,19 +208,17 @@
gettimeofday(t, NULL);
}
-inline long get_walltime_in_millis(const walltime t)
+inline msec_type get_walltime_in_millis(const walltime t)
{
- return t.tv_sec * 1000 + t.tv_usec / 1000;
+ return t.tv_sec * (msec_type)1000 + t.tv_usec / 1000;
}
#endif /* ZORBA_HAVE_CLOCKGETTIME_FUNCTION */
- } // ::time
-
-} // ::zorba
-
-#endif
-
+ } // namespace time
+} // namesace zorba
+
+#endif /* ZORBA_UTIL_TIME_H */
/*
* Local variables:
* mode: c++
=== modified file 'include/zorba/util/timer.h'
--- include/zorba/util/timer.h 2012-09-19 21:16:15 +
+++ include/zorba/util/timer.h 2013-01-30 22:26:22 +
@@ -37,7 +37,7 @@
return get_walltime_elapsed(theStart, lEnd);
}
- long getStart() const {
+ time::msec_type getStart() const {
return get_walltime_in_millis(theStart);
}
=== modified file 'src/runtime/random/random_impl.cpp'
--- src/runtime/random/random_impl.cpp 2012-10-08 12:09:36 +
+++ src/runtime/random/random_impl.cpp 2013-01-30 22:26:22 +
@@ -105,7 +105,7 @@
{
store::Item_tnum;
unsigned int int_seed;
- long walltime_millis;
+ time::msec_type walltime_millis;
uint32_t time_low;
zstring ltmp;
--
Mailing list: https://launchpad.net/~zorba-coders
Post to : zorba-coders@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zorba-coders
More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-855481 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-855481/+merge/145740 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-855481 into lp:zorba
Review: Needs Fixing Add bug fix to ChangeLog. -- https://code.launchpad.net/~paul-lucas/zorba/bug-855481/+merge/145740 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module has been updated. Status: Needs review = Approved For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 -- https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module
Validation queue starting for merge proposal. Log at: http://zorbatest.lambda.nu:8080/remotequeue/fix_dependency-2013-01-31T01-11-50.364Z/log.html -- https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module
Validation queue job fix_dependency-2013-01-31T01-11-50.364Z is finished. The final status was: All tests succeeded! -- https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
[Zorba-coders] [Merge] lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module
The proposal to merge lp:~zorba-coders/zorba/fix_dependency into lp:zorba/data-formatting-module has been updated. Status: Approved = Merged For more details, see: https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 -- https://code.launchpad.net/~zorba-coders/zorba/fix_dependency/+merge/144307 Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~zorba-coders/zorba/canonicalize-core-fixed into lp:zorba
Review: Needs Fixing There should be a canonicalize#2 function that allows to specify options. This should at least allow for the following libxml2 options. XML_PARSE_NOENT = 2 : substitute entities XML_PARSE_NOBLANKS = 256 : remove blank nodes XML_PARSE_NONET = 2048 : Forbid network access XML_PARSE_NSCLEAN = 8192 : remove redundant namespaces declarations XML_PARSE_NOCDATA = 16384 : merge CDATA as text nodes The comment could be improved. For example, the node about streamability should not be at the beginning. -- https://code.launchpad.net/~zorba-coders/zorba/canonicalize-core-fixed/+merge/142394 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~dennis-knochenwefel/zorba/dennis-misc into lp:zorba
Review: Approve -- https://code.launchpad.net/~dennis-knochenwefel/zorba/dennis-misc/+merge/144373 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~dennis-knochenwefel/zorba/dennis-misc into lp:zorba
Conditional approve: before merging, the ChangeLog should be adapted. -- https://code.launchpad.net/~dennis-knochenwefel/zorba/dennis-misc/+merge/144373 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
Re: [Zorba-coders] [Merge] lp:~paul-lucas/zorba/bug-855481 into lp:zorba
Review: Approve -- https://code.launchpad.net/~paul-lucas/zorba/bug-855481/+merge/145740 Your team Zorba Coders is subscribed to branch lp:zorba. -- Mailing list: https://launchpad.net/~zorba-coders Post to : zorba-coders@lists.launchpad.net Unsubscribe : https://launchpad.net/~zorba-coders More help : https://help.launchpad.net/ListHelp
