You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2015/06/18 19:54:25 UTC
[1/2] qpid-proton git commit: PROTON-904: provide a better seed to
srand()
Repository: qpid-proton
Updated Branches:
refs/heads/master e38957ae5 -> 98e27c681
PROTON-904: provide a better seed to srand()
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/824dfefd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/824dfefd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/824dfefd
Branch: refs/heads/master
Commit: 824dfefd53ad88f305816273f9896f91dddc5d08
Parents: e38957a
Author: Ken Giusti <kg...@apache.org>
Authored: Thu Jun 18 13:31:06 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Thu Jun 18 13:31:06 2015 -0400
----------------------------------------------------------------------
proton-c/src/messenger/messenger.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/824dfefd/proton-c/src/messenger/messenger.c
----------------------------------------------------------------------
diff --git a/proton-c/src/messenger/messenger.c b/proton-c/src/messenger/messenger.c
index ec4fb2c..9749bf5 100644
--- a/proton-c/src/messenger/messenger.c
+++ b/proton-c/src/messenger/messenger.c
@@ -503,7 +503,10 @@ static char *build_name(const char *name)
if (!seeded) {
int pid = pn_i_getpid();
- srand(pn_i_now() + pid);
+ int nowish = (int)pn_i_now();
+ // the lower bits of time are the most random, shift pid to push some
+ // randomness into the higher order bits
+ srand(nowish ^ (pid<<16));
seeded = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: NO-JIRA: temporary skip of Mick's
session tests - he's fixing it now
Posted by kg...@apache.org.
NO-JIRA: temporary skip of Mick's session tests - he's fixing it now
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/98e27c68
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/98e27c68
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/98e27c68
Branch: refs/heads/master
Commit: 98e27c681e5700483fddc574d890acaee1bdf0c5
Parents: 824dfef
Author: Ken Giusti <kg...@apache.org>
Authored: Thu Jun 18 13:53:53 2015 -0400
Committer: Ken Giusti <kg...@apache.org>
Committed: Thu Jun 18 13:53:53 2015 -0400
----------------------------------------------------------------------
tests/python/proton_tests/engine.py | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/98e27c68/tests/python/proton_tests/engine.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/engine.py b/tests/python/proton_tests/engine.py
index 1563889..e3258a2 100644
--- a/tests/python/proton_tests/engine.py
+++ b/tests/python/proton_tests/engine.py
@@ -221,12 +221,16 @@ class ConnectionTest(Test):
assert self.c1.transport.channel_max == value, (self.c1.transport.channel_max, value)
def test_channel_max_high(self, value=33333):
+ if "java" in sys.platform:
+ raise Skipped("Mick needs to fix me")
self.c1.transport.channel_max = value
self.c1.open()
self.pump()
assert self.c1.transport.channel_max == 32767, (self.c1.transport.channel_max, value)
def test_channel_max_raise_and_lower(self):
+ if "java" in sys.platform:
+ raise Skipped("Mick needs to fix me, also")
# It's OK to lower the max below 32767.
self.c1.transport.channel_max = 12345
assert self.c1.transport.channel_max == 12345
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org