From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5C5BC1381F3 for ; Wed, 11 Sep 2013 17:27:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB0FCE0BD0; Wed, 11 Sep 2013 17:27:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 03B4DE0BD0 for ; Wed, 11 Sep 2013 17:27:12 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C937833EBC0 for ; Wed, 11 Sep 2013 17:27:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7EAAEE5464 for ; Wed, 11 Sep 2013 17:27:10 +0000 (UTC) From: "Nicolas Bock" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nicolas Bock" Message-ID: <1378920407.64302b37bf4fb940d3eb260d51b491b111094485.nicolasbock@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/charm/, sys-cluster/charm/files/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/charm/ChangeLog sys-cluster/charm/charm-6.5.1.ebuild sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch X-VCS-Directories: sys-cluster/charm/ sys-cluster/charm/files/ X-VCS-Committer: nicolasbock X-VCS-Committer-Name: Nicolas Bock X-VCS-Revision: 64302b37bf4fb940d3eb260d51b491b111094485 X-VCS-Branch: master Date: Wed, 11 Sep 2013 17:27:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 54acba80-d8b5-4e60-afb1-86af629e7402 X-Archives-Hash: ba2e1a09da2ead42d36e51027d3c693a commit: 64302b37bf4fb940d3eb260d51b491b111094485 Author: Nicolas Bock gmail com> AuthorDate: Wed Sep 11 17:26:47 2013 +0000 Commit: Nicolas Bock gmail com> CommitDate: Wed Sep 11 17:26:47 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=64302b37 Added patch to fix bug in CkReductionMgr::reduceMessages(). This issues has been reported upstream (issue #287). Package-Manager: portage-2.2.1 --- sys-cluster/charm/ChangeLog | 5 ++++ sys-cluster/charm/charm-6.5.1.ebuild | 1 + .../charm/files/charm-6.5.1-CkReductionMgr.patch | 34 ++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/sys-cluster/charm/ChangeLog b/sys-cluster/charm/ChangeLog index 60a0d00..f6f824c 100644 --- a/sys-cluster/charm/ChangeLog +++ b/sys-cluster/charm/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 11 Sep 2013; Nicolas Bock + +files/charm-6.5.1-CkReductionMgr.patch, charm-6.5.1.ebuild: + Added patch to fix bug in CkReductionMgr::reduceMessages(). This issues has + been reported upstream (issue #287). + 23 Jul 2013; Nicolas Bock +files/charm-6.5.1-cleanup-config.patch, charm-6.5.1.ebuild: sys-cluster/charm-6.5.1: Added patch to fix config.h The added patch diff --git a/sys-cluster/charm/charm-6.5.1.ebuild b/sys-cluster/charm/charm-6.5.1.ebuild index 5405952..9161c8f 100644 --- a/sys-cluster/charm/charm-6.5.1.ebuild +++ b/sys-cluster/charm/charm-6.5.1.ebuild @@ -90,6 +90,7 @@ src_prepare() { append-cflags -DALLOCA_H epatch "${FILESDIR}/charm-6.5.1-cleanup-config.patch" + epatch "${FILESDIR}/charm-6.5.1-CkReductionMgr.patch" } src_compile() { diff --git a/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch b/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch new file mode 100644 index 0000000..8387180 --- /dev/null +++ b/sys-cluster/charm/files/charm-6.5.1-CkReductionMgr.patch @@ -0,0 +1,34 @@ +From f9cc5724818141201ba201e698c21aea62ecd362 Mon Sep 17 00:00:00 2001 +From: Nicolas Bock +Date: Thu, 5 Sep 2013 04:04:06 -0600 +Subject: [PATCH] Fixed bug in CkReductionMgr::reduceMessages(). + +The first contribution of a child node is a single message. In this case +CkReductionMgr::reduceMessages() simply returns the message without calling +the reducer. However, when using the CkReduction::set reducer this behavior is +incorrect, and instead the reducer should be called even for one single +message so that the message is wrapped into a setElement struct. In the +current implementation, the reduction becomes corrupted because the +CkReduction::set() method one tier up in the reduction sizes the remote +contribution incorrectly assuming a setElement struct and not a simple +message. +--- + src/ck-core/ckreduction.C | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ck-core/ckreduction.C b/src/ck-core/ckreduction.C +index f2ac8cd..d94f5b1 100644 +--- a/src/ck-core/ckreduction.C ++++ b/src/ck-core/ckreduction.C +@@ -862,7 +862,7 @@ CkReductionMsg *CkReductionMgr::reduceMessages(void) + else + {//Use the reducer to reduce the messages + //if there is only one msg to be reduced just return that message +- if(nMsgs == 1){ ++ if(nMsgs == 1 && msgArr[0]->reducer != CkReduction::set) { + ret = msgArr[0]; + }else{ + if (msgArr[0]->reducer == CkReduction::random) { +-- +1.8.1.5 +