charm AT lists.cs.illinois.edu
Subject: Charm++ parallel programming system
List archive
- From: Ake Sandgren <ake.sandgren AT hpc2n.umu.se>
- To: charm AT cs.uiuc.edu
- Subject: Re: [charm] Patches to charm++ 6.4.0
- Date: Fri, 30 Nov 2012 20:22:27 +0100
- List-archive: <http://lists.cs.uiuc.edu/pipermail/charm/>
- List-id: CHARM parallel programming system <charm.cs.uiuc.edu>
On Fri, 2012-11-30 at 12:20 -0600, Eric Bohm wrote:
> If could could check them against the development version for relevance,
> and then just send them to this list, that would be great.
Yes, i pulled the git and rechecked.
These are the patches remaining.
Nr 22 should probably be done differently since the current code doesn't
make much sense.
Have fun.
>From 242b5d1575ad65cd0a85495075afbb6565997c8f Mon Sep 17 00:00:00 2001 From: Ake Sandgren <ake AT hpc2n.umu.se> Date: Fri, 30 Nov 2012 12:42:16 +0100 Subject: [PATCH 01/23] Don't assume "." is in PATH in test Makefiles --- tests/charm++/arrayPerf/Makefile | 2 +- tests/charm++/commSpeed/Makefile | 8 ++++---- .../commtest/section-multicast-test-6/Makefile | 8 ++++---- .../commtest/section-multicast-test/Makefile | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/charm++/arrayPerf/Makefile b/tests/charm++/arrayPerf/Makefile index a082ff8..1cdb6ed 100644 --- a/tests/charm++/arrayPerf/Makefile +++ b/tests/charm++/arrayPerf/Makefile @@ -17,5 +17,5 @@ hello.o: hello.C hello.decl.h $(CHARMC) -c hello.C test: all - ./charmrun hello +p1 2 $(TESTOPTS) + ./charmrun ./hello +p1 2 $(TESTOPTS) diff --git a/tests/charm++/commSpeed/Makefile b/tests/charm++/commSpeed/Makefile index 1e1cb39..1f609fc 100644 --- a/tests/charm++/commSpeed/Makefile +++ b/tests/charm++/commSpeed/Makefile @@ -21,7 +21,7 @@ clean: rm -f *.decl.h *.def.h conv-host *.o commSpeed charmrun *~ test: all - ./charmrun commSpeed +p1 100 100 $(TESTOPTS) - ./charmrun commSpeed +p2 100 100 $(TESTOPTS) - ./charmrun commSpeed +p4 100 100 $(TESTOPTS) - ./charmrun commSpeed +p8 100 100 $(TESTOPTS) + ./charmrun ./commSpeed +p1 100 100 100 $(TESTOPTS) + ./charmrun ./commSpeed +p2 100 100 100 $(TESTOPTS) + ./charmrun ./commSpeed +p4 100 100 100 $(TESTOPTS) + ./charmrun ./commSpeed +p8 100 100 100 $(TESTOPTS) diff --git a/tests/charm++/commtest/section-multicast-test-6/Makefile b/tests/charm++/commtest/section-multicast-test-6/Makefile index 99d5668..d64acc7 100644 --- a/tests/charm++/commtest/section-multicast-test-6/Makefile +++ b/tests/charm++/commtest/section-multicast-test-6/Makefile @@ -4,10 +4,10 @@ all: pgm test: pgm - ./charmrun pgm +p1 2 2 $(TESTOPTS) - ./charmrun pgm +p2 5 5 $(TESTOPTS) - ./charmrun pgm +p4 5 5 $(TESTOPTS) - ./charmrun pgm +p8 5 5 $(TESTOPTS) + ./charmrun ./pgm +p1 2 2 $(TESTOPTS) + ./charmrun ./pgm +p2 5 5 $(TESTOPTS) + ./charmrun ./pgm +p4 5 5 $(TESTOPTS) + ./charmrun ./pgm +p8 5 5 $(TESTOPTS) pgm: test.o $(CHARMC) -language charm++ -o pgm test.o $(COMLIB) diff --git a/tests/charm++/commtest/section-multicast-test/Makefile b/tests/charm++/commtest/section-multicast-test/Makefile index 6c5b17a..d5b6129 100644 --- a/tests/charm++/commtest/section-multicast-test/Makefile +++ b/tests/charm++/commtest/section-multicast-test/Makefile @@ -4,10 +4,10 @@ all: pgm test: pgm - ./charmrun pgm +p1 $(TESTOPTS) - ./charmrun pgm +p2 $(TESTOPTS) - ./charmrun pgm +p4 $(TESTOPTS) - ./charmrun pgm +p8 $(TESTOPTS) + ./charmrun ./pgm +p1 $(TESTOPTS) + ./charmrun ./pgm +p2 $(TESTOPTS) + ./charmrun ./pgm +p4 $(TESTOPTS) + ./charmrun ./pgm +p8 $(TESTOPTS) pgm: test.o $(CHARMC) -language charm++ -o pgm test.o $(COMLIB) -- 1.7.0.4
>From fbc24017bfcf6cced43d0c696a8de3dacbcc6804 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:44:02 +0100
Subject: [PATCH 02/23] Fix some use before initialize cases.
---
src/ck-com/ChunkMulticastStrategy.C | 2 +-
src/ck-com/ComlibSectionInfo.C | 2 +-
src/ck-core/ckarrayreductionmgr.C | 2 +-
src/ck-core/ckreduction.C | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ck-com/ChunkMulticastStrategy.C b/src/ck-com/ChunkMulticastStrategy.C
index 023fdcf..aecafaa 100644
--- a/src/ck-com/ChunkMulticastStrategy.C
+++ b/src/ck-com/ChunkMulticastStrategy.C
@@ -59,7 +59,7 @@ void ChunkMulticastStrategy::insertMessage(CharmMessageHolder *cmsg){
const CkArrayID destArrayID(env->getsetArrayMgr());
int nRemotePes=-1, nRemoteIndices=-1;
ComlibMulticastIndexCount *indicesCount;
- int *belongingList;
+ int *belongingList = NULL;
sinfo.getPeCount(cmsg->sec_id->_nElems, cmsg->sec_id->_elems, destArrayID, nRemotePes, nRemoteIndices, indicesCount, belongingList);
// int numChunks = nRemotePes/2;
diff --git a/src/ck-com/ComlibSectionInfo.C b/src/ck-com/ComlibSectionInfo.C
index abdd8a3..9f0d1c8 100644
--- a/src/ck-com/ComlibSectionInfo.C
+++ b/src/ck-com/ComlibSectionInfo.C
@@ -46,7 +46,7 @@ ComlibMulticastMsg * ComlibSectionInfo::getNewMulticastMessage(CharmMessageHolde
const CkArrayID destArrayID(env->getsetArrayMgr());
int nRemotePes=-1, nRemoteIndices=-1;
ComlibMulticastIndexCount *indicesCount;
- int *belongingList;
+ int *belongingList = NULL;
// Determine the last known locations of all the destination objects.
diff --git a/src/ck-core/ckarrayreductionmgr.C b/src/ck-core/ckarrayreductionmgr.C
index d557f5f..ddab3b0 100644
--- a/src/ck-core/ckarrayreductionmgr.C
+++ b/src/ck-core/ckarrayreductionmgr.C
@@ -106,7 +106,7 @@ CkReductionMsg *CkArrayReductionMgr::reduceMessages(void){
int nMsgs=0;
CkReductionMsg *m;
CkReductionMsg **msgArr=new CkReductionMsg*[my_msgs.length()];
- bool isMigratableContributor;
+ bool isMigratableContributor = false;
while(NULL!=(m=my_msgs.deq()))
{
diff --git a/src/ck-core/ckreduction.C b/src/ck-core/ckreduction.C
index f8bc45e..a9162f6 100644
--- a/src/ck-core/ckreduction.C
+++ b/src/ck-core/ckreduction.C
@@ -812,7 +812,7 @@ CkReductionMsg *CkReductionMgr::reduceMessages(void)
int nMsgs=0;
CkReductionMsg **msgArr=new CkReductionMsg*[msgs.length()];
CkReductionMsg *m;
- bool isMigratableContributor;
+ bool isMigratableContributor = false;
// Copy message queue into msgArr, skipping placeholders:
while (NULL!=(m=msgs.deq()))
@@ -2188,7 +2188,7 @@ CkReductionMsg *CkNodeReductionMgr::reduceMessages(void)
int nMsgs=0;
CkReductionMsg *m;
CkReductionMsg **msgArr=new CkReductionMsg*[msgs.length()];
- bool isMigratableContributor;
+ bool isMigratableContributor = false;
while(NULL!=(m=msgs.deq()))
--
1.7.0.4
>From dd7bffa5e8aea50bca440206ba924067ef163cae Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:45:10 +0100
Subject: [PATCH 03/23] Fix an incorrect type and amissing return.
---
tests/converse/commbench/memoryAccess.c | 2 +-
tests/converse/megacon/posixth.c | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/tests/converse/commbench/memoryAccess.c b/tests/converse/commbench/memoryAccess.c
index 2c2a299..798f04f 100755
--- a/tests/converse/commbench/memoryAccess.c
+++ b/tests/converse/commbench/memoryAccess.c
@@ -28,7 +28,7 @@ int dist[] = {1,5,9,10};
CpvStaticDeclare(int, memoryIdx);
-double memoryTest(){
+void memoryTest(){
double starttime, endtime;
double extraOverhead;
myType **ptrs = NULL;
diff --git a/tests/converse/megacon/posixth.c b/tests/converse/megacon/posixth.c
index de4c86b..6f898e9 100644
--- a/tests/converse/megacon/posixth.c
+++ b/tests/converse/megacon/posixth.c
@@ -81,6 +81,7 @@ void *posixth_top(void *x)
if (CpvAccess(fibs)==0)
errck(Cpthread_cond_signal(&CpvAccess(donecond)));
if (CrnRand()&1) CthYield();
+ return NULL;
}
void posixth_main(int argc, char **argv)
--
1.7.0.4
>From cb5ea668c7c0a7415595de0c01eeefdcfe14a795 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:46:08 +0100
Subject: [PATCH 04/23] Fix typo in assignement.
---
src/ck-perf/trace-utilization.h | 2 +-
src/util/RTH.C | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ck-perf/trace-utilization.h b/src/ck-perf/trace-utilization.h
index d30d9f7..53e77c0 100644
--- a/src/ck-perf/trace-utilization.h
+++ b/src/ck-perf/trace-utilization.h
@@ -215,7 +215,7 @@ class TraceUtilization : public Trace {
TraceUtilization() {
- execEp == TRACEON_EP;
+ execEp = TRACEON_EP;
cpuTime = NULL;
lastBinUsed = -1;
numBinsSent = 0;
diff --git a/src/util/RTH.C b/src/util/RTH.C
index 9ce115a..b4a3f30 100644
--- a/src/util/RTH.C
+++ b/src/util/RTH.C
@@ -172,7 +172,7 @@ void RTH_Runtime_destroy(RTH_Runtime *runtime) {
int RTH_Runtime_call(RTH_Runtime *runtime,RTH_Routine fn,int localsSize,int nextPC) {
/* Save the old frame */
RTH_StackFrame &oldFrame=runtime->tos();
- oldFrame.pc==PC_START; /* pretend we've never suspended */
+ oldFrame.pc=PC_START; /* pretend we've never suspended */
/* Push new frame for execution */
runtime->push(RTH_StackFrame(fn,PC_START,localsSize));
--
1.7.0.4
>From 700a2d0d3108e3bb31e2c33e08faa341a873c727 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:49:59 +0100
Subject: [PATCH 05/23] Fix compiler warnings.
Use void* instead of unsigned long* for longjmp.
---
src/QuickThreads/md/setjmp64.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/QuickThreads/md/setjmp64.c b/src/QuickThreads/md/setjmp64.c
index 943514e..b5ce134 100644
--- a/src/QuickThreads/md/setjmp64.c
+++ b/src/QuickThreads/md/setjmp64.c
@@ -53,7 +53,7 @@ static void qt_args_1(qt_t *rjb, void *u, void *t,
rhelp = (struct helpdesc *)pbuf[index];
if (rhelp == 0) {
SHIFTSP(rjb);
- longjmp((unsigned long*)rjb, push_buf((void *)jb));
+ longjmp((void *)rjb, push_buf((void *)jb));
}
rhelp->hfn(rhelp->jb, rhelp->old, rhelp->new);
only(u, t, userf);
@@ -90,7 +90,7 @@ void *qt_block(qt_helper_t *hfn, void *old, void *new, qt_t *sp)
rhelp = (struct helpdesc *)pbuf[index];
if (rhelp==0) {
SHIFTSP(sp);
- longjmp((unsigned long*)sp, push_buf((void *)&help));
+ longjmp((void *)sp, push_buf((void *)&help));
}
rhelp->hfn(rhelp->jb, rhelp->old, rhelp->new);
}
@@ -103,5 +103,5 @@ void *qt_abort(qt_helper_t *hfn, void *old, void *new, qt_t *sp)
help.old = old;
help.new = new;
SHIFTSP(sp);
- longjmp((unsigned long*)sp, push_buf((void *)&help));
+ longjmp((void *)sp, push_buf((void *)&help));
}
--
1.7.0.4
>From d215e41be99fb23ace1e66d92ed22afa6ebff022 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:51:19 +0100
Subject: [PATCH 06/23] Fix compiler warnings.
Misplaced returns.
---
src/ck-perf/trace-common.C | 2 +-
src/conv-ccs/conv-ccs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ck-perf/trace-common.C b/src/ck-perf/trace-common.C
index ce749b7..be4051e 100644
--- a/src/ck-perf/trace-common.C
+++ b/src/ck-perf/trace-common.C
@@ -689,8 +689,8 @@ int traceBeginCommOp(char *msg){
CkpvAccess(_traces)->beginExecute(msg);
return 1;
}
- return 0;
#endif
+ return 0;
}
extern "C"
diff --git a/src/conv-ccs/conv-ccs.c b/src/conv-ccs/conv-ccs.c
index 20a4a25..ec9209b 100644
--- a/src/conv-ccs/conv-ccs.c
+++ b/src/conv-ccs/conv-ccs.c
@@ -357,9 +357,9 @@ char *CcsImpl_ccs2converse(const CcsImplHeader *hdr,const void *data,int *ret_le
CmiAbort("Why do we need to buffer messages when node 0 is Convhost?");
#else
CcsBufferMessage(msg);
- return NULL;
#endif
}
+ return NULL;
}
/*Receives reply messages passed up from
--
1.7.0.4
>From e8acfb88e89acfa2f173e9f699416411a45d94f5 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:52:33 +0100
Subject: [PATCH 07/23] Fix missing return values.
---
src/ck-perf/trace-converse.c | 4 ++--
src/libs/ck-libs/pythonCCS/charmdebug-python.C | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/ck-perf/trace-converse.c b/src/ck-perf/trace-converse.c
index 0b0b00a..1913f8d 100644
--- a/src/ck-perf/trace-converse.c
+++ b/src/ck-perf/trace-converse.c
@@ -43,7 +43,7 @@ void traceWriteSts(void) {}
void traceFlushLog(void) {}
int traceAvailable() {return 0;}
-int traceRegisterFunction(const char *name, int idx) {}
+int traceRegisterFunction(const char *name, int idx) { return 0; }
void traceBeginFuncIndexProj(int idx, char* name, int lineNo) {}
void traceEndFuncIndexProj(int idx) {}
void traceBeginFuncProj(char *name,char *file,int line){}
@@ -54,7 +54,7 @@ void traceUserSuppliedBracketedNote(char *note, int eventID, double bt, double e
void traceMemoryUsage() {}
#if CMK_SMP_TRACE_COMMTHREAD
-int traceBeginCommOp(char *msg){}
+int traceBeginCommOp(char *msg){ return 0; }
void traceEndCommOp(char *msg) {}
void traceSendMsgComm(char *msg) {}
void traceChangeLastTimestamp(double ts) {}
diff --git a/src/libs/ck-libs/pythonCCS/charmdebug-python.C b/src/libs/ck-libs/pythonCCS/charmdebug-python.C
index 9eeadad..f0bc4ee 100644
--- a/src/libs/ck-libs/pythonCCS/charmdebug-python.C
+++ b/src/libs/ck-libs/pythonCCS/charmdebug-python.C
@@ -67,6 +67,7 @@ int CpdPythonGroup::buildIterator(PyObject *&data, void *iter) {
if (arriter.elems.size() > 0) {
data = PyLong_FromVoidPtr(arriter.elems[0]);
nextElement = 1;
+ return 1;
} else {
return 0;
}
--
1.7.0.4
>From 5a7168ab84c40fee07183b897d9775094dec1def Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:53:10 +0100
Subject: [PATCH 08/23] Fix double define of MEM_LOCK_AROUND
---
src/conv-core/memory.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/conv-core/memory.c b/src/conv-core/memory.c
index 59e5c3c..bf0c590 100644
--- a/src/conv-core/memory.c
+++ b/src/conv-core/memory.c
@@ -474,7 +474,9 @@ void CmiResetMaxMemory() {}
CMK_TYPEDEF_UINT8 CmiMinMemoryUsage() { return 0; }
void CmiResetMinMemory() {}
+#ifndef MEM_LOCK_AROUND
#define MEM_LOCK_AROUND(code) code
+#endif
#else /* of CMK_MEMORY_BUILD_OS */
--
1.7.0.4
>From 75cfb554ee5bd9c5c05677798074cdc4904d8821 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:53:50 +0100
Subject: [PATCH 09/23] Remove useless line.
---
src/conv-core/isomalloc.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/conv-core/isomalloc.c b/src/conv-core/isomalloc.c
index 375c500..8ebc009 100644
--- a/src/conv-core/isomalloc.c
+++ b/src/conv-core/isomalloc.c
@@ -900,7 +900,6 @@ static void btree_delete_int(slotset *ss, btreenode *node,
/* left child node */
num_left = node->child[index]->num_blocks;
num_right = node->child[index+1]->num_blocks;
- left_pos;
right_pos = 0;
for (left_pos = num_left; left_pos < num_left + num_right; left_pos++) {
node->child[index]->blocks[left_pos].startslot =
--
1.7.0.4
>From 4feab2c0b17b9650a5aab2f30441a98c85751f01 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:54:15 +0100
Subject: [PATCH 10/23] Fix wrong type.
---
src/arch/net/machine.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/arch/net/machine.c b/src/arch/net/machine.c
index 146ca1a..590255b 100644
--- a/src/arch/net/machine.c
+++ b/src/arch/net/machine.c
@@ -2532,7 +2532,7 @@ static void ConverseRunPE(int everReturn)
/* initialize the network progress counter*/
/* Network progress function is used to poll the network when for
messages. This flushes receive buffers on some implementations*/
- CpvInitialize(int , networkProgressCount);
+ CpvInitialize(unsigned , networkProgressCount);
CpvAccess(networkProgressCount) = 0;
/* better to show the status here */
--
1.7.0.4
>From dc0c9b2c99b1cf5d10cb412a831320bfd8a01145 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:55:37 +0100
Subject: [PATCH 11/23] Fix compiler warnings on assign in if/while stmts.
---
src/ck-cp/controlPoints.C | 2 +-
src/ck-ldb/GridCommLB.C | 12 ++++++------
src/ck-ldb/GridCommRefineLB.C | 4 ++--
src/ck-ldb/GridHybridLB.C | 12 ++++++------
src/ck-ldb/GridHybridSeedLB.C | 12 ++++++------
src/ck-ldb/GridMetisLB.C | 8 ++++----
src/conv-core/cpuaffinity.c | 2 +-
src/conv-core/cputopology.C | 2 +-
8 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/src/ck-cp/controlPoints.C b/src/ck-cp/controlPoints.C
index af78dcd..5a783e1 100644
--- a/src/ck-cp/controlPoints.C
+++ b/src/ck-cp/controlPoints.C
@@ -200,7 +200,7 @@ unsigned int randInt(unsigned int num, const char* name, int seed=0){
unsigned int c;
unsigned char * str = (unsigned char*)name;
- while (c = *str++){
+ while ((c = *str++)){
unsigned int c2 = (c+64)%128;
unsigned int c3 = (c2*5953)%127;
hash = c3 + (hash << 6) + (hash << 16) - hash;
diff --git a/src/ck-ldb/GridCommLB.C b/src/ck-ldb/GridCommLB.C
index c44ff84..96b3138 100644
--- a/src/ck-ldb/GridCommLB.C
+++ b/src/ck-ldb/GridCommLB.C
@@ -61,19 +61,19 @@ GridCommLB::GridCommLB (const CkLBOptions &opt) : CentralLB (opt)
CkPrintf ("[%d] GridCommLB created.\n", CkMyPe());
}
- if (value = getenv ("CK_LDB_GRIDCOMMLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMLB_MODE"))) {
CK_LDB_GridCommLB_Mode = atoi (value);
} else {
CK_LDB_GridCommLB_Mode = CK_LDB_GRIDCOMMLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDCOMMLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMLB_BACKGROUND_LOAD"))) {
CK_LDB_GridCommLB_Background_Load = atoi (value);
} else {
CK_LDB_GridCommLB_Background_Load = CK_LDB_GRIDCOMMLB_BACKGROUND_LOAD;
}
- if (value = getenv ("CK_LDB_GRIDCOMMLB_LOAD_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMLB_LOAD_TOLERANCE"))) {
CK_LDB_GridCommLB_Load_Tolerance = atof (value);
} else {
CK_LDB_GridCommLB_Load_Tolerance = CK_LDB_GRIDCOMMLB_LOAD_TOLERANCE;
@@ -94,19 +94,19 @@ GridCommLB::GridCommLB (CkMigrateMessage *msg) : CentralLB (msg)
lbname = (char *) "GridCommLB";
- if (value = getenv ("CK_LDB_GRIDCOMMLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMLB_MODE"))) {
CK_LDB_GridCommLB_Mode = atoi (value);
} else {
CK_LDB_GridCommLB_Mode = CK_LDB_GRIDCOMMLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDCOMMLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMLB_BACKGROUND_LOAD"))) {
CK_LDB_GridCommLB_Background_Load = atoi (value);
} else {
CK_LDB_GridCommLB_Background_Load = CK_LDB_GRIDCOMMLB_BACKGROUND_LOAD;
}
- if (value = getenv ("CK_LDB_GRIDCOMMLB_LOAD_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMLB_LOAD_TOLERANCE"))) {
CK_LDB_GridCommLB_Load_Tolerance = atof (value);
} else {
CK_LDB_GridCommLB_Load_Tolerance = CK_LDB_GRIDCOMMLB_LOAD_TOLERANCE;
diff --git a/src/ck-ldb/GridCommRefineLB.C b/src/ck-ldb/GridCommRefineLB.C
index aba2c6a..bd994fc 100644
--- a/src/ck-ldb/GridCommRefineLB.C
+++ b/src/ck-ldb/GridCommRefineLB.C
@@ -67,7 +67,7 @@ GridCommRefineLB::GridCommRefineLB (const CkLBOptions &opt) : CentralLB (opt)
CkPrintf ("[%d] GridCommRefineLB created.\n", CkMyPe());
}
- if (value = getenv ("CK_LDB_GRIDCOMMREFINELB_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMREFINELB_TOLERANCE"))) {
CK_LDB_GridCommRefineLB_Tolerance = atof (value);
} else {
CK_LDB_GridCommRefineLB_Tolerance = CK_LDB_GRIDCOMMREFINELB_TOLERANCE;
@@ -88,7 +88,7 @@ GridCommRefineLB::GridCommRefineLB (CkMigrateMessage *msg) : CentralLB (msg)
lbname = (char *) "GridCommRefineLB";
- if (value = getenv ("CK_LDB_GRIDCOMMREFINELB_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDCOMMREFINELB_TOLERANCE"))) {
CK_LDB_GridCommRefineLB_Tolerance = atof (value);
} else {
CK_LDB_GridCommRefineLB_Tolerance = CK_LDB_GRIDCOMMREFINELB_TOLERANCE;
diff --git a/src/ck-ldb/GridHybridLB.C b/src/ck-ldb/GridHybridLB.C
index ef01b69..d1fc8a6 100644
--- a/src/ck-ldb/GridHybridLB.C
+++ b/src/ck-ldb/GridHybridLB.C
@@ -29,19 +29,19 @@ GridHybridLB::GridHybridLB (const CkLBOptions &opt) : CentralLB (opt)
CkPrintf ("[%d] GridHybridLB created.\n", CkMyPe());
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDLB_MODE"))) {
CK_LDB_GridHybridLB_Mode = atoi (value);
} else {
CK_LDB_GridHybridLB_Mode = CK_LDB_GRIDHYBRIDLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDLB_BACKGROUND_LOAD"))) {
CK_LDB_GridHybridLB_Background_Load = atoi (value);
} else {
CK_LDB_GridHybridLB_Background_Load = CK_LDB_GRIDHYBRIDLB_BACKGROUND_LOAD;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDLB_LOAD_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDLB_LOAD_TOLERANCE"))) {
CK_LDB_GridHybridLB_Load_Tolerance = atof (value);
} else {
CK_LDB_GridHybridLB_Load_Tolerance = CK_LDB_GRIDHYBRIDLB_LOAD_TOLERANCE;
@@ -62,19 +62,19 @@ GridHybridLB::GridHybridLB (CkMigrateMessage *msg) : CentralLB (msg)
lbname = (char *) "GridHybridLB";
- if (value = getenv ("CK_LDB_GRIDHYBRIDLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDLB_MODE"))) {
CK_LDB_GridHybridLB_Mode = atoi (value);
} else {
CK_LDB_GridHybridLB_Mode = CK_LDB_GRIDHYBRIDLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDLB_BACKGROUND_LOAD"))) {
CK_LDB_GridHybridLB_Background_Load = atoi (value);
} else {
CK_LDB_GridHybridLB_Background_Load = CK_LDB_GRIDHYBRIDLB_BACKGROUND_LOAD;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDLB_LOAD_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDLB_LOAD_TOLERANCE"))) {
CK_LDB_GridHybridLB_Load_Tolerance = atof (value);
} else {
CK_LDB_GridHybridLB_Load_Tolerance = CK_LDB_GRIDHYBRIDLB_LOAD_TOLERANCE;
diff --git a/src/ck-ldb/GridHybridSeedLB.C b/src/ck-ldb/GridHybridSeedLB.C
index e316a1c..62266e9 100644
--- a/src/ck-ldb/GridHybridSeedLB.C
+++ b/src/ck-ldb/GridHybridSeedLB.C
@@ -29,19 +29,19 @@ GridHybridSeedLB::GridHybridSeedLB (const CkLBOptions &opt) : CentralLB (opt)
CkPrintf ("[%d] GridHybridSeedLB created.\n", CkMyPe());
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_MODE"))) {
CK_LDB_GridHybridSeedLB_Mode = atoi (value);
} else {
CK_LDB_GridHybridSeedLB_Mode = CK_LDB_GRIDHYBRIDSEEDLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_BACKGROUND_LOAD"))) {
CK_LDB_GridHybridSeedLB_Background_Load = atoi (value);
} else {
CK_LDB_GridHybridSeedLB_Background_Load = CK_LDB_GRIDHYBRIDSEEDLB_BACKGROUND_LOAD;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_LOAD_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_LOAD_TOLERANCE"))) {
CK_LDB_GridHybridSeedLB_Load_Tolerance = atof (value);
} else {
CK_LDB_GridHybridSeedLB_Load_Tolerance = CK_LDB_GRIDHYBRIDSEEDLB_LOAD_TOLERANCE;
@@ -62,19 +62,19 @@ GridHybridSeedLB::GridHybridSeedLB (CkMigrateMessage *msg) : CentralLB (msg)
lbname = (char *) "GridHybridSeedLB";
- if (value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_MODE"))) {
CK_LDB_GridHybridSeedLB_Mode = atoi (value);
} else {
CK_LDB_GridHybridSeedLB_Mode = CK_LDB_GRIDHYBRIDSEEDLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_BACKGROUND_LOAD"))) {
CK_LDB_GridHybridSeedLB_Background_Load = atoi (value);
} else {
CK_LDB_GridHybridSeedLB_Background_Load = CK_LDB_GRIDHYBRIDSEEDLB_BACKGROUND_LOAD;
}
- if (value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_LOAD_TOLERANCE")) {
+ if ((value = getenv ("CK_LDB_GRIDHYBRIDSEEDLB_LOAD_TOLERANCE"))) {
CK_LDB_GridHybridSeedLB_Load_Tolerance = atof (value);
} else {
CK_LDB_GridHybridSeedLB_Load_Tolerance = CK_LDB_GRIDHYBRIDSEEDLB_LOAD_TOLERANCE;
diff --git a/src/ck-ldb/GridMetisLB.C b/src/ck-ldb/GridMetisLB.C
index 7d66bc4..a20aa98 100644
--- a/src/ck-ldb/GridMetisLB.C
+++ b/src/ck-ldb/GridMetisLB.C
@@ -29,13 +29,13 @@ GridMetisLB::GridMetisLB (const CkLBOptions &opt) : CentralLB (opt)
CkPrintf ("[%d] GridMetisLB created.\n", CkMyPe());
}
- if (value = getenv ("CK_LDB_GRIDMETISLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDMETISLB_MODE"))) {
CK_LDB_GridMetisLB_Mode = atoi (value);
} else {
CK_LDB_GridMetisLB_Mode = CK_LDB_GRIDMETISLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDMETISLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDMETISLB_BACKGROUND_LOAD"))) {
CK_LDB_GridMetisLB_Background_Load = atoi (value);
} else {
CK_LDB_GridMetisLB_Background_Load = CK_LDB_GRIDMETISLB_BACKGROUND_LOAD;
@@ -56,13 +56,13 @@ GridMetisLB::GridMetisLB (CkMigrateMessage *msg) : CentralLB (msg)
lbname = (char *) "GridMetisLB";
- if (value = getenv ("CK_LDB_GRIDMETISLB_MODE")) {
+ if ((value = getenv ("CK_LDB_GRIDMETISLB_MODE"))) {
CK_LDB_GridMetisLB_Mode = atoi (value);
} else {
CK_LDB_GridMetisLB_Mode = CK_LDB_GRIDMETISLB_MODE;
}
- if (value = getenv ("CK_LDB_GRIDMETISLB_BACKGROUND_LOAD")) {
+ if ((value = getenv ("CK_LDB_GRIDMETISLB_BACKGROUND_LOAD"))) {
CK_LDB_GridMetisLB_Background_Load = atoi (value);
} else {
CK_LDB_GridMetisLB_Background_Load = CK_LDB_GRIDMETISLB_BACKGROUND_LOAD;
diff --git a/src/conv-core/cpuaffinity.c b/src/conv-core/cpuaffinity.c
index 138bb75..45d8928 100644
--- a/src/conv-core/cpuaffinity.c
+++ b/src/conv-core/cpuaffinity.c
@@ -365,7 +365,7 @@ static void cpuAffinityHandler(void *m)
if (count == CmiNumPes()) {
/* CmiPrintf("Cpuaffinity> %d unique compute nodes detected! \n", CmmEntries(hostTable)); */
tag = CmmWildCard;
- while (tmpm = CmmGet(hostTable, 1, &tag, &tag1)) CmiFree(tmpm);
+ while ((tmpm = CmmGet(hostTable, 1, &tag, &tag1))) CmiFree(tmpm);
CmmFree(hostTable);
#if 1
/* bubble sort ranks on each node according to the PE number */
diff --git a/src/conv-core/cputopology.C b/src/conv-core/cputopology.C
index 49f439d..c1923f5 100644
--- a/src/conv-core/cputopology.C
+++ b/src/conv-core/cputopology.C
@@ -260,7 +260,7 @@ static void cpuTopoHandler(void *m)
// clean up CmmTable
hostnameMsg *tmpm;
tag = CmmWildCard;
- while (tmpm = (hostnameMsg *)CmmGet(hostTable, 1, &tag, &tag1));
+ while ((tmpm = (hostnameMsg *)CmmGet(hostTable, 1, &tag, &tag1)));
CmmFree(hostTable);
CmiFree(msg);
--
1.7.0.4
>From 39661a40fe890d49bcbbced6b60d274a17d858f1 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:56:24 +0100
Subject: [PATCH 12/23] Fix compiler warnings about && in ||
---
src/ck-core/charmf.C | 2 +-
src/ck-ldb/lbdb.C | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ck-core/charmf.C b/src/ck-core/charmf.C
index e8b6e0f..3849c78 100644
--- a/src/ck-core/charmf.C
+++ b/src/ck-core/charmf.C
@@ -77,7 +77,7 @@ extern "C" void FTN_NAME(CKPRINTF, ckprintf)(const char *format, ...)
ifmt++;
flag=1; break;
default:
- if ((format[ifmt]=='.')&&(format[ifmt]<='9')||(format[ifmt]>='0')) {
+ if (((format[ifmt]=='.')&&(format[ifmt]<='9'))||(format[ifmt]>='0')) {
temp_fmt[temp_len] = format[ifmt];
temp_len++; ifmt++;
}
diff --git a/src/ck-ldb/lbdb.C b/src/ck-ldb/lbdb.C
index abc2343..5b4f4e2 100644
--- a/src/ck-ldb/lbdb.C
+++ b/src/ck-ldb/lbdb.C
@@ -256,7 +256,7 @@ extern "C" void LDObjectStop(const LDObjHandle &_h)
extern "C" void LDSend(const LDOMHandle &destOM, const LDObjid &destid, unsigned int bytes, int destObjProc, int force)
{
LBDB *const db = (LBDB*)(destOM.ldb.handle);
- if (force || db->StatsOn() && _lb_args.traceComm())
+ if (force || (db->StatsOn() && _lb_args.traceComm()))
db->Send(destOM,destid,bytes, destObjProc);
}
--
1.7.0.4
>From 4808b01d96165c67ab476ca0635b8d37e0e7fdef Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 12:59:52 +0100
Subject: [PATCH 13/23] Fix compiler warnings on dangling else.
---
src/ck-ldb/CommLB.C | 3 ++-
src/ck-ldb/GreedyCommLB.C | 6 ++++--
src/ck-ldb/RefinerComm.C | 3 ++-
src/ck-ldb/TopoCentLB.C | 6 ++++--
src/ck-ldb/TopoLB.C | 3 ++-
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/ck-ldb/CommLB.C b/src/ck-ldb/CommLB.C
index 3371a14..99d6775 100644
--- a/src/ck-ldb/CommLB.C
+++ b/src/ck-ldb/CommLB.C
@@ -173,9 +173,10 @@ void CommLB::work(LDStats* stats)
if((!commData.from_proc())&&(commData.recv_type()==LD_OBJ_MSG)){
xcoord = stats->getHash(commData.sender);
ycoord = stats->getHash(commData.receiver.get_destObj());
- if((xcoord == -1)||(ycoord == -1))
+ if((xcoord == -1)||(ycoord == -1)) {
if (_lb_args.ignoreBgLoad()) continue;
else CkAbort("Error in search\n");
+ }
add_graph(xcoord,ycoord,commData.bytes, commData.messages);
}
}
diff --git a/src/ck-ldb/GreedyCommLB.C b/src/ck-ldb/GreedyCommLB.C
index 4f4a1de..e9ab282 100644
--- a/src/ck-ldb/GreedyCommLB.C
+++ b/src/ck-ldb/GreedyCommLB.C
@@ -182,9 +182,10 @@ void GreedyCommLB::work(LDStats* stats)
{
xcoord = stats->getHash(commData.sender);
ycoord = stats->getHash(commData.receiver.get_destObj());
- if((xcoord == -1)||(ycoord == -1))
+ if((xcoord == -1)||(ycoord == -1)) {
if (_lb_args.ignoreBgLoad() || stats->complete_flag==0) continue;
else CkAbort("Error in search\n");
+ }
add_graph(xcoord,ycoord,commData.bytes, commData.messages);
}
else if (commData.recv_type()==LD_OBJLIST_MSG) {
@@ -193,10 +194,11 @@ void GreedyCommLB::work(LDStats* stats)
xcoord = stats->getHash(commData.sender);
for (int i=0; i<nobjs; i++) {
ycoord = stats->getHash(objs[i]);
- if((xcoord == -1)||(ycoord == -1))
+ if((xcoord == -1)||(ycoord == -1)) {
if (_lb_args.migObjOnly()) continue;
else CkAbort("Error in search\n");
//printf("Multicast: %d => %d %d %d\n", xcoord, ycoord, commData.bytes, commData.messages);
+ }
add_graph(xcoord,ycoord,commData.bytes, commData.messages);
}
}
diff --git a/src/ck-ldb/RefinerComm.C b/src/ck-ldb/RefinerComm.C
index 38db4d2..b635ce1 100644
--- a/src/ck-ldb/RefinerComm.C
+++ b/src/ck-ldb/RefinerComm.C
@@ -91,9 +91,10 @@ void RefinerComm::processorCommCost()
LDObjKey *objs = cdata.receiver.get_destObjs(nobjs);
for (i=0; i<nobjs; i++) {
int idx = stats->getHash(objs[i]);
- if(idx == -1)
+ if(idx == -1) {
if (_lb_args.migObjOnly()) continue;
else CkAbort("Error in search\n");
+ }
receiverPE = computes[idx].oldProcessor;
CmiAssert(receiverPE != -1);
if(senderPE != receiverPE)
diff --git a/src/ck-ldb/TopoCentLB.C b/src/ck-ldb/TopoCentLB.C
index 59210fd..a3bc9ab 100644
--- a/src/ck-ldb/TopoCentLB.C
+++ b/src/ck-ldb/TopoCentLB.C
@@ -126,9 +126,10 @@ void TopoCentLB::computePartitions(CentralLB::LDStats *stats,int count,int *newm
int senderID = stats->getHash(cdata.sender);
for (j=0; j<nobjs; j++) {
int recverID = stats->getHash(objs[j]);
- if((senderID == -1)||(recverID == -1))
+ if((senderID == -1)||(recverID == -1)) {
if (_lb_args.migObjOnly()) continue;
else CkAbort("Error in search\n");
+ }
comm[senderID][recverID] += cdata.messages;
comm[recverID][senderID] += cdata.messages;
}
@@ -586,9 +587,10 @@ void TopoCentLB :: work(LDStats *stats)
addedComm[j]=0;
for (j=0; j<nobjs; j++) {
int recverID = stats->getHash(objs[j]);
- if((senderID == -1)||(recverID == -1))
+ if((senderID == -1)||(recverID == -1)) {
if (_lb_args.migObjOnly()) continue;
else CkAbort("Error in search\n");
+ }
if(newmap[senderID]==newmap[recverID])
continue;
diff --git a/src/ck-ldb/TopoLB.C b/src/ck-ldb/TopoLB.C
index 5bc4be4..06a156a 100644
--- a/src/ck-ldb/TopoLB.C
+++ b/src/ck-ldb/TopoLB.C
@@ -167,9 +167,10 @@ void TopoLB::computePartitions(CentralLB::LDStats *stats,int count,int *newmap)
int senderID = stats->getHash(cdata.sender);
for (j=0; j<nobjs; j++) {
int recverID = stats->getHash(objs[j]);
- if((senderID == -1)||(recverID == -1))
+ if((senderID == -1)||(recverID == -1)) {
if (_lb_args.migObjOnly()) continue;
else CkAbort("Error in search\n");
+ }
comm[senderID][recverID] += cdata.messages;
comm[recverID][senderID] += cdata.messages;
}
--
1.7.0.4
>From b6baa8c4b799eb3eb180a7505e1ae61457932f61 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 13:00:17 +0100
Subject: [PATCH 14/23] Fix compiler warning about return stmts.
---
src/ck-ldb/HbmLB.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ck-ldb/HbmLB.h b/src/ck-ldb/HbmLB.h
index 99372f9..1a1aac1 100644
--- a/src/ck-ldb/HbmLB.h
+++ b/src/ck-ldb/HbmLB.h
@@ -153,10 +153,10 @@ protected:
}
int migrationDone() {
//CkPrintf("[%d] checking migrates_expected: %d migrates_completed: %d obj_completed: %d\n", CkMyPe(), migrates_expected, migrates_completed, obj_completed);
- return migrates_expected == 0 || migrates_completed == migrates_expected && obj_completed == migrates_expected;
+ return (migrates_expected == 0 || (migrates_completed == migrates_expected && obj_completed == migrates_expected));
}
int vectorReceived() {
- return vector_expected==0 || vector_expected == vector_completed;
+ return (vector_expected==0 || vector_expected == vector_completed);
}
void clear() {
obj_expected = -1;
--
1.7.0.4
>From 965d6240ec5573f36c8a5909470ca0afbfdf6ff0 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 13:06:29 +0100
Subject: [PATCH 15/23] Fix compiler warnings about missing casts.
---
src/conv-core/conv-conds.c | 8 ++++----
src/libs/ck-libs/pythonCCS/PythonCCS-client.C | 2 +-
src/libs/ck-libs/pythonCCS/PythonCCS-client.h | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/conv-core/conv-conds.c b/src/conv-core/conv-conds.c
index 38e7c33..7a0b2e1 100644
--- a/src/conv-core/conv-conds.c
+++ b/src/conv-core/conv-conds.c
@@ -158,7 +158,7 @@ static void call_cblist_keep(ccd_cblist *l,double curWallTime)
for(i=0, idx=l->first;i<len;i++) {
int old = CmiSwitchToPE(l->elems[idx].cb.pe);
(*(l->elems[idx].cb.fn))(l->elems[idx].cb.arg,curWallTime);
- CmiSwitchToPE(old);
+ (void)CmiSwitchToPE(old);
idx = l->elems[idx].next;
}
}
@@ -183,14 +183,14 @@ static void call_cblist_remove(ccd_cblist *l,double curWallTime)
for(i=0, idx=l->first;i<len;i++) {
int old = CmiSwitchToPE(l->elems[idx].cb.pe);
(*(l->elems[idx].cb.fn))(l->elems[idx].cb.arg,curWallTime);
- CmiSwitchToPE(old);
+ (void)CmiSwitchToPE(old);
idx = l->elems[idx].next;
}
#else
for(i=0, idx=l->last;i<len;i++) {
int old = CmiSwitchToPE(l->elems[idx].cb.pe);
(*(l->elems[idx].cb.fn))(l->elems[idx].cb.arg,curWallTime);
- CmiSwitchToPE(old);
+ (void)CmiSwitchToPE(old);
idx = l->elems[idx].prev;
}
#endif
@@ -394,7 +394,7 @@ static void ccd_heap_update(double curWallTime)
*/
int old = CmiSwitchToPE(e[i].cb.pe);
(*(e[i].cb.fn))(e[i].cb.arg,curWallTime);
- CmiSwitchToPE(old);
+ (void)CmiSwitchToPE(old);
}
}
diff --git a/src/libs/ck-libs/pythonCCS/PythonCCS-client.C b/src/libs/ck-libs/pythonCCS/PythonCCS-client.C
index 41fad2b..0992938 100644
--- a/src/libs/ck-libs/pythonCCS/PythonCCS-client.C
+++ b/src/libs/ck-libs/pythonCCS/PythonCCS-client.C
@@ -103,7 +103,7 @@ char *PythonExecute::pack() {
ptr += methodNameLength+1;
}
if (infoSize) {
- memcpy (ptr, info.info, infoSize);
+ memcpy (ptr, (void *)info.info, infoSize);
}
// transform unsigned integers from host byte order to network byte order
((PythonAbstract*)memory)->magic = htonl(magic);
diff --git a/src/libs/ck-libs/pythonCCS/PythonCCS-client.h b/src/libs/ck-libs/pythonCCS/PythonCCS-client.h
index 1fd85cd..97997b3 100644
--- a/src/libs/ck-libs/pythonCCS/PythonCCS-client.h
+++ b/src/libs/ck-libs/pythonCCS/PythonCCS-client.h
@@ -37,7 +37,7 @@ class PythonIterator {
// be freed automatically. It should not modify the original data.
virtual char *pack() {
void *memory = malloc(size());
- memcpy (memory, this, size());
+ memcpy (memory, (void *)this, size());
return (char *)memory;
};
--
1.7.0.4
>From 38a87c5528775a452ff98a92c87c3e4e00e05dd8 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 13:11:10 +0100
Subject: [PATCH 16/23] Fix compiler warnings about missing/wrong type declarations.
---
src/conv-core/queueing.C | 2 +-
src/xlatcpm/conv-cpm.c | 3 ++-
src/xlatcpm/conv-cpm.flex | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/conv-core/queueing.C b/src/conv-core/queueing.C
index bbd9d65..cd87ea0 100644
--- a/src/conv-core/queueing.C
+++ b/src/conv-core/queueing.C
@@ -627,7 +627,7 @@ int CqsEmpty(Queue q)
void CqsEnqueueGeneral(Queue q, void *data, int strategy,
int priobits,unsigned int *prioptr)
{
- _deq d; int iprio;
+ _deq d; unsigned int iprio;
CmiInt8 lprio0, lprio;
switch (strategy) {
case CQS_QUEUEING_FIFO:
diff --git a/src/xlatcpm/conv-cpm.c b/src/xlatcpm/conv-cpm.c
index 2004f34..bb27b75 100644
--- a/src/xlatcpm/conv-cpm.c
+++ b/src/xlatcpm/conv-cpm.c
@@ -1746,7 +1746,7 @@ int main()
#ifdef yywrap
#undef yywrap
#endif
-yywrap(){ return(1); }
+int yywrap(){ return(1); }
void yytokget()
{
@@ -2148,6 +2148,7 @@ void disclaim(FILE *f, char *src)
fprintf(f,"\n");
}
+int
main(int argc, char **argv)
{
if (argc != 3) usage();
diff --git a/src/xlatcpm/conv-cpm.flex b/src/xlatcpm/conv-cpm.flex
index 94bdb45..7b09cf9 100644
--- a/src/xlatcpm/conv-cpm.flex
+++ b/src/xlatcpm/conv-cpm.flex
@@ -53,7 +53,7 @@ ID [_a-zA-Z][_a-zA-Z0-9]*
#ifdef yywrap
#undef yywrap
#endif
-yywrap(){ return(1); }
+int yywrap(){ return(1); }
void yytokget()
{
@@ -455,6 +455,7 @@ void disclaim(FILE *f, char *src)
fprintf(f,"\n");
}
+int
main(int argc, char **argv)
{
if (argc != 3) usage();
--
1.7.0.4
>From 7e8886151dd334db3d2a4d4b2729cc692b594d99 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 13:11:56 +0100
Subject: [PATCH 17/23] Fix compiler warnings about double ( in if-stmt.
Trim useless double if-check.
---
src/ck-ldb/tm_tree.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ck-ldb/tm_tree.c b/src/ck-ldb/tm_tree.c
index 3b06e87..77d43bc 100644
--- a/src/ck-ldb/tm_tree.c
+++ b/src/ck-ldb/tm_tree.c
@@ -1109,8 +1109,8 @@ tree_t *build_level_topology(tree_t *tab_node,double **com_mat,int N,int arity,i
int completed=0;
double speed; /* communication speed at this level*/
double *new_obj_weight;
- if((depth==0)){
- if((N==1)&&(depth==0))
+ if(depth==0){
+ if(N==1)
return &tab_node[0];
else{
fprintf(stderr,"Error: matrix size: %d and depth:%d (should be 1 and -1 respectively)\n",N,depth);
--
1.7.0.4
>From 1577fbd2866b2c47f5d137efad1cb25dc9656ae0 Mon Sep 17 00:00:00 2001 From: Ake Sandgren <ake AT hpc2n.umu.se> Date: Fri, 30 Nov 2012 13:14:54 +0100 Subject: [PATCH 18/23] Fix missing and misplaced includes. --- src/QuickThreads/md/setjmp64.c | 2 ++ src/conv-core/convcore.c | 1 + src/conv-core/threads.c | 2 +- 3 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/QuickThreads/md/setjmp64.c b/src/QuickThreads/md/setjmp64.c index b5ce134..e7b3e42 100644 --- a/src/QuickThreads/md/setjmp64.c +++ b/src/QuickThreads/md/setjmp64.c @@ -1,6 +1,8 @@ #include "qt.h" #include <setjmp.h> +#include <stdlib.h> +#include <unistd.h> #ifdef ALLOCA_H #include <alloca.h> #endif diff --git a/src/conv-core/convcore.c b/src/conv-core/convcore.c index 8ebcede..40c14e2 100644 --- a/src/conv-core/convcore.c +++ b/src/conv-core/convcore.c @@ -64,6 +64,7 @@ #include "queueing.h" #include "conv-ccs.h" #include "ccs-server.h" +#include "cldb.h" #include "memory-isomalloc.h" #if CMK_PROJECTOR #include "converseEvents.h" /* projector */ diff --git a/src/conv-core/threads.c b/src/conv-core/threads.c index 3449a4c..dd8c9ec 100644 --- a/src/conv-core/threads.c +++ b/src/conv-core/threads.c @@ -94,6 +94,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include "converse.h" #if CMK_MEMORY_PROTECTABLE #if CMK_HAS_MALLOC_H #include <malloc.h> /*<- for memalign*/ @@ -103,7 +104,6 @@ #include "rts.h" /*<- for rts_memory_alias */ #endif -#include "converse.h" #include "qt.h" #include "conv-trace.h" -- 1.7.0.4
>From 08b74109f1ffcbd52f7307f50cb9aaa5b7ec7110 Mon Sep 17 00:00:00 2001 From: Ake Sandgren <ake AT hpc2n.umu.se> Date: Fri, 30 Nov 2012 13:22:23 +0100 Subject: [PATCH 19/23] Fix missing declaration of print_node0. --- src/conv-ccs/ccs-server.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/conv-ccs/ccs-server.h b/src/conv-ccs/ccs-server.h index 1783670..65bef63 100644 --- a/src/conv-ccs/ccs-server.h +++ b/src/conv-ccs/ccs-server.h @@ -91,6 +91,8 @@ Closes it. */ void CcsServer_noReply(CcsImplHeader *hdr); +void print_node0(const char *format, va_list args); + #else /*CCS not available*/ #define CcsServer_new(i,p) /*empty*/ -- 1.7.0.4
>From 86665bc32b2caa490bdabe2324889d18af9de297 Mon Sep 17 00:00:00 2001 From: Ake Sandgren <ake AT hpc2n.umu.se> Date: Fri, 30 Nov 2012 13:22:45 +0100 Subject: [PATCH 20/23] Fix compiler warnings. CmiPoolAllocInit isn't defined unless CONVERSE_POOL is. --- src/conv-core/convcore.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conv-core/convcore.c b/src/conv-core/convcore.c index 40c14e2..5f2979c 100644 --- a/src/conv-core/convcore.c +++ b/src/conv-core/convcore.c @@ -3555,9 +3555,9 @@ void ConverseCommonInit(char **argv) CpvInitialize(int, cmiMyPeIdle); CpvAccess(cmiMyPeIdle) = 0; -/* #if CONVERSE_POOL */ +#if CONVERSE_POOL CmiPoolAllocInit(30); -/* #endif */ +#endif CmiTmpInit(argv); CmiTimerInit(argv); CstatsInit(argv); -- 1.7.0.4
>From e52634c0162ab38ec58a7730bb25041e850f1ee6 Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 14:24:42 +0100
Subject: [PATCH 21/23] Fix type of qt_block
---
src/QuickThreads/md/setjmp64.c | 2 +-
src/QuickThreads/md/setjmp_d.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/QuickThreads/md/setjmp64.c b/src/QuickThreads/md/setjmp64.c
index e7b3e42..3559f3b 100644
--- a/src/QuickThreads/md/setjmp64.c
+++ b/src/QuickThreads/md/setjmp64.c
@@ -79,7 +79,7 @@ qt_t *qt_args(qt_t *sp, void *u, void *t,
return result;
}
-void *qt_block(qt_helper_t *hfn, void *old, void *new, qt_t *sp)
+void qt_block(qt_helper_t *hfn, void *old, void *new, qt_t *sp)
{
struct helpdesc help, *rhelp; char *oldsp; int offs;
jmp_buf jb;
diff --git a/src/QuickThreads/md/setjmp_d.h b/src/QuickThreads/md/setjmp_d.h
index 1b7dfcb..8411c6b 100644
--- a/src/QuickThreads/md/setjmp_d.h
+++ b/src/QuickThreads/md/setjmp_d.h
@@ -30,7 +30,7 @@ typedef void (qt_only_t1)(void *pu, void *pt, qt_userf_t1 *userf);
typedef void *(qt_helper_t1)(qt_t1 *old, void *a0, void *a1);
qt_t1 *qt_args(qt_t1 *,void *,void *,qt_userf_t1 *,qt_only_t1*);
-void *qt_block(qt_helper_t1 *, void *, void *, qt_t1 *);
+void qt_block(qt_helper_t1 *, void *, void *, qt_t1 *);
void *qt_abort(qt_helper_t1 *, void *, void *, qt_t1 *);
#define QT_ARGS(sp,u,t,uf,on) (qt_args(sp,u,t,(qt_userf_t1*)(uf),(qt_only_t1*)(on)))
--
1.7.0.4
>From eb4fbed2d3ef0c4379d866d67df239408deff82a Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 14:29:13 +0100
Subject: [PATCH 22/23] Fix use before initialization.
---
src/ck-ldb/AdaptiveLB.C | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/ck-ldb/AdaptiveLB.C b/src/ck-ldb/AdaptiveLB.C
index 4207876..b697fe5 100644
--- a/src/ck-ldb/AdaptiveLB.C
+++ b/src/ck-ldb/AdaptiveLB.C
@@ -94,10 +94,10 @@ void AdaptiveLB::work(LDStats* stats)
CkPrintf("AdaptiveLB> Total Comm Overhead %E Total Load %E\n", commOverhead, totalLoad);
double tmp;
- double refine_max_avg_ratio, lb_max_avg_ratio;
- double greedy_max_avg_ratio;
- int lb_type;
- double comm_ratio, comm_refine_ratio;
+ double refine_max_avg_ratio = 0.0, lb_max_avg_ratio;
+ double greedy_max_avg_ratio = 0.0;
+ int lb_type = 0;
+ double comm_ratio = 0.0, comm_refine_ratio = 0.0;
// GetPrevLBData(lb_type, lb_max_avg_ratio, tmp);
// GetLBDataForLB(1, refine_max_avg_ratio, tmp);
--
1.7.0.4
>From 8eda8d90bc480586ba189d24836c849898f20f7b Mon Sep 17 00:00:00 2001
From: Ake Sandgren <ake AT hpc2n.umu.se>
Date: Fri, 30 Nov 2012 15:34:38 +0100
Subject: [PATCH 23/23] Protect against bad parameters in pingpong test.
---
tests/charm++/pingpong/pingpong.C | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/tests/charm++/pingpong/pingpong.C b/tests/charm++/pingpong/pingpong.C
index ae247a5..b267dbb 100644
--- a/tests/charm++/pingpong/pingpong.C
+++ b/tests/charm++/pingpong/pingpong.C
@@ -104,10 +104,16 @@ public:
payload=PAYLOAD;
if(m->argc>1)
payload=atoi(m->argv[1]);
+ if (payload <= 0) {
+ payload=PAYLOAD;
+ }
if(m->argc>2)
iterations=atoi(m->argv[2]);
if(m->argc>3)
CkPrintf("Usage: pgm +pN [payload] [iterations]\n Where N [1-2], payload (default %d) is integer >0 iterations (default %d) is integer >0 ", PAYLOAD, NITER);
+ if (iterations <= 0) {
+ iterations=NITER;
+ }
CkPrintf("Pingpong with payload: %d iterations: %d\n", payload,iterations);
mainProxy = thishandle;
gid = CProxy_PingG::ckNew();
--
1.7.0.4
- [charm] Patches to charm++ 6.4.0, Ake Sandgren, 11/30/2012
- Re: [charm] Patches to charm++ 6.4.0, Eric Bohm, 11/30/2012
- Re: [charm] Patches to charm++ 6.4.0, Ake Sandgren, 11/30/2012
- Re: [charm] Patches to charm++ 6.4.0, Eric Bohm, 11/30/2012
Archive powered by MHonArc 2.6.16.