Cleanup: progress towards compiling with -Wall

Author: stwhite91

src/arch/netlrts/machine-eth.C

@@ -304,9 +304,8 @@ int TransmitDatagram(void)
 void EnqueueOutgoingDgram
         (OutgoingMsg ogm, char *ptr, int len, OtherNode node, int rank, int broot)
 {
-  int seqno, dst, src; ImplicitDgram dg;
+  int seqno, src; ImplicitDgram dg;
   src = ogm->src;
-  dst = ogm->dst;
   seqno = node->send_next;
   node->send_next = ((seqno+1)&DGRAM_SEQNO_MASK);
   MallocImplicitDgram(dg);
@@ -377,7 +376,6 @@ void DeliverViaNetwork(OutgoingMsg ogm, OtherNode node, int rank, unsigned int b
  ***********************************************************************/
 void AssembleDatagram(OtherNode node, ExplicitDgram dg)
 {
-  int i;
   unsigned int size; char *msg;
   OtherNode myNode = nodes+CmiMyNodeGlobal();
 
@@ -552,7 +550,6 @@ void IntegrateAckDatagram(ExplicitDgram dg)
   OtherNode node; DgramAck *ack; ImplicitDgram idg;
   int i; unsigned int slot, rxing, dgseqno, seqno, ackseqno;
   int diff;
-  unsigned int tmp;
 
   node = nodes_by_pe[dg->srcpe];
   ack = ((DgramAck*)(dg->data));
@@ -564,7 +561,6 @@ void IntegrateAckDatagram(ExplicitDgram dg)
   node->stat_recv_ack++;
   LOG(Cmi_clock, Cmi_nodestartGlobal, 'R', node->nodestart, dg->seqno);
 
-  tmp = node->recv_ack_seqno;
   /* check that the ack being received is actually appropriate */
   if ( !((node->recv_ack_seqno >= 
 	  ((DGRAM_SEQNO_MASK >> 1) + (DGRAM_SEQNO_MASK >> 2))) &&

src/arch/netlrts/machine.C

@@ -1617,7 +1617,7 @@ static void node_addresses_obtain(char **argv)
  ***********************************************************************/
 int DeliverOutgoingMessage(OutgoingMsg ogm)
 {
-  int i, rank, dst; OtherNode node;
+  int rank, dst; OtherNode node;
 
   int network = 1;
 
@@ -1630,7 +1630,6 @@ int DeliverOutgoingMessage(OutgoingMsg ogm)
 #endif
     node = nodes_by_pe[dst];
     rank = dst - node->nodestart;
-    int acqLock = 0;
     if (node->nodestart != Cmi_nodestartGlobal) {
         DeliverViaNetwork(ogm, node, rank, DGRAM_ROOTPE_MASK, 0);
     }
@@ -1789,9 +1788,7 @@ void LrtsBarrier(void)
 
 int CmiBarrierZero(void)
 {
-  int i;
   int numnodes = CmiNumNodesGlobal();
-  ChMessage msg;
 
   if (Cmi_charmrun_fd == -1) return 0;                // standalone
   if (numnodes == 1) {
@@ -2135,7 +2132,6 @@ static int net_default_skt_abort(SOCKET skt,int code,const char *msg)
 
 void LrtsInit(int *argc, char ***argv, int *numNodes, int *myNodeID)
 {
-  int i;
   Cmi_netpoll = 0;
 #if CMK_NETPOLL
   Cmi_netpoll = 1;

src/arch/util/machine-broadcast.C

@@ -135,7 +135,7 @@ static void SendSpanningChildren(int size, char *msg, int rankToAssign, int star
 #if CMK_BROADCAST_SPANNING_TREE
     // copying is deferred via _copyMsgOrRef in case no sends are generated
     char* copy = nullptr;
-    int i, oldRank;
+    int i;
 
     /* first send msgs to other nodes */
     CmiAssert(startNode >=0 &&  startNode<CmiNumNodes());
@@ -184,7 +184,7 @@ static void SendHyperCube(int size,  char *msg, int rankToAssign, int startNode)
 #if CMK_BROADCAST_HYPERCUBE
     // copying is deferred via _copyMsgOrRef in case no sends are generated
     char* copy = nullptr;
-    int i, cnt, tmp, relDist, oldRank;
+    int i, cnt, tmp, relDist;
     const int dims=CmiNodesDim;
 
     /* first send msgs to other nodes */
@@ -271,7 +271,6 @@ static void SendHyperCubeNode(int size, char *msg) {
 #if USE_COMMON_SYNC_BCAST
 /* Functions regarding broadcat op that sends to every one else except me */
 void CmiSyncBroadcastFn1(int size, char *msg) {
-    int i, mype;
 
 #if CMI_QD
     CQdCreate(CpvAccess(cQdState), CmiNumPes()-1);
@@ -286,11 +285,11 @@ void CmiSyncBroadcastFn1(int size, char *msg) {
     CMI_SET_BROADCAST_ROOT(msg, CmiMyNode()+1);
     SendHyperCubeProc(size, msg);
 #else
-    mype = CmiMyPe();
+    int mype = CmiMyPe();
     #if CMK_SMP
     /* In SMP, this function may be called from comm thread with a larger pe */
     if(mype >= _Cmi_numpes){
-	for(i=0; i<_Cmi_numpes; i++)
+	for(int i=0; i<_Cmi_numpes; i++)
 		CmiSyncSendFn(i, size, msg);
 	return;
     }
@@ -302,8 +301,6 @@ void CmiSyncBroadcastFn1(int size, char *msg) {
     for ( i=0; i<mype; i++ )
         CmiSyncSendFn(i, size, msg) ;
 #endif
-
-    /*CmiPrintf("In  SyncBroadcast broadcast\n");*/
 }
 
 void CmiSyncBroadcastFn(int size, char *msg) {
@@ -348,8 +345,6 @@ CmiCommHandle CmiAsyncBroadcastAllFn(int size, char *msg) {
 #if CMK_NODE_QUEUE_AVAILABLE
 #if USE_COMMON_SYNC_BCAST
 void CmiSyncNodeBroadcastFn(int size, char *msg) {
-    int mynode = CmiMyNode();
-    int i;
 #if CMI_QD
     CQdCreate(CpvAccess(cQdState), CmiNumNodes()-1);
 #endif
@@ -360,9 +355,10 @@ void CmiSyncNodeBroadcastFn(int size, char *msg) {
     CMI_SET_BROADCAST_ROOT(msg, -CmiMyNode()-1);
     SendHyperCubeNode(size, msg);
 #else
-    for (i=mynode+1; i<CmiNumNodes(); i++)
+    int mynode = CmiMyNode();
+    for (int i=mynode+1; i<CmiNumNodes(); i++)
         CmiSyncNodeSendFn(i, size, msg);
-    for (i=0; i<mynode; i++)
+    for (int i=0; i<mynode; i++)
         CmiSyncNodeSendFn(i, size, msg);
 #endif
 }

src/arch/util/machine-common-core.C

@@ -641,7 +641,6 @@ INLINE_KEYWORD CmiCommHandle CmiSendNetworkFunc(int destPE, int size, char *msg,
 //the generic function that replaces the older one
 CmiCommHandle CmiInterSendNetworkFunc(int destPE, int partition, int size, char *msg, int mode)
 {
-        int rank;
         int destLocalNode = CmiNodeOf(destPE); 
         int destNode = CmiGetNodeGlobal(destLocalNode,partition); 
 
@@ -715,9 +714,9 @@ void CmiInterFreeSendFn(int destPE, int partition, int size, char *msg) {
 #endif
     } 
     else {
-        int destNode = CmiNodeOf(destPE);
         int destRank = CmiRankOf(destPE);
 #if CMK_SMP
+        int destNode = CmiNodeOf(destPE);
         if (CmiMyNode()==destNode && partition == CmiMyPartition()) {
             CmiPushPE(destRank, msg);
 #if CMK_PERSISTENT_COMM
@@ -950,7 +949,7 @@ void CmiSetCustomPartitioning(void) {
 static void create_partition_map( char **argv)
 {
   char* token, *tptr;
-  int i, flag;
+  int i;
 
   _partitionInfo.numPartitions = 1; 
   _partitionInfo.type = PARTITION_DEFAULT;
@@ -1205,8 +1204,6 @@ void check_and_set_queue_parameters()
 
 /* ##### Beginning of Functions Related with Machine Startup ##### */
 void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret) {
-    int _ii;
-    int tmp;
     //handle output to files for partition if requested
     char *stdoutbase,*stdoutpath;
 
@@ -1346,7 +1343,7 @@ void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
 #if CMK_WITH_STATS
 if (  MSG_STATISTIC)
 {
-    for(_ii=0; _ii<22; _ii++)
+    for(int _ii=0; _ii<22; _ii++)
         msg_histogram[_ii] = 0;
 }
 #endif
@@ -1497,7 +1494,7 @@ if (  MSG_STATISTIC)
     /* CmiTimerInit(); */
 #if CMK_BROADCAST_HYPERCUBE
     /* CmiNodesDim = ceil(log2(CmiNumNodes)) except when #nodes is 1*/
-    tmp = CmiNumNodes()-1;
+    int tmp = CmiNumNodes()-1;
     CmiNodesDim = 0;
     while (tmp>0) {
         CmiNodesDim++;
@@ -1619,7 +1616,6 @@ static void ConverseRunPE(int everReturn) {
 
 /* ##### Beginning of Functions Related with Machine Running ##### */
 static INLINE_KEYWORD void AdvanceCommunication(int whenidle) {
-    int doProcessBcast = 1;
 
 #if CMK_USE_PXSHM
     CommunicationServerPxshm();
@@ -1638,6 +1634,7 @@ static INLINE_KEYWORD void AdvanceCommunication(int whenidle) {
     LrtsAdvanceCommunication(whenidle);
 
 #if CMK_OFFLOAD_BCAST_PROCESS
+    int doProcessBcast = 1;
 #if CMK_SMP_NO_COMMTHD
     /*FIXME: only asks rank 0 to process bcast msgs, so perf may suffer*/
     if (CmiMyRank()) doProcessBcast = 0;
@@ -1688,7 +1685,6 @@ void CommunicationServerThread(int sleepTime) {
 }
 
 void ConverseExit(int exitcode) {
-    int i;
     if (quietModeRequested) quietMode = 1;
 #if !CMK_SMP || CMK_SMP_NO_COMMTHD
     LrtsDrainResources();
@@ -1703,7 +1699,7 @@ void ConverseExit(int exitcode) {
 #if CMK_WITH_STATS
 if (MSG_STATISTIC)
 {
-    for(i=0; i<22; i++)
+    for(int i=0; i<22; i++)
     {
         CmiPrintf("[MSG PE:%d]", CmiMyPe());
         if(msg_histogram[i] >0)

src/arch/util/machine-smp.C

@@ -508,7 +508,7 @@ public:
   Barrier& operator=(const Barrier&) = delete;
 
   explicit Barrier(unsigned int count)
-      : curCount(count), barrierCount(count), curSense(true)
+      : curSense(true), curCount(count), barrierCount(count)
   {
   }
 

src/arch/util/mempool.C

@@ -450,7 +450,7 @@ void mempool_free(mempool_type* mptr, void* ptr_free)
 
   if (to_free->status == -1)
   {
-    large_block_header* largeblockhead = (large_block_header*)to_free->block_ptr, *temp;
+    large_block_header* largeblockhead = (large_block_header*)to_free->block_ptr;
     if (mptr->large_blocks == ((char*)largeblockhead - (char*)mptr))
     {
       mptr->large_blocks = largeblockhead->block_next;

src/ck-core/ck.C

@@ -870,7 +870,6 @@ void _createGroup(CkGroupID groupID, envelope *env)
   _CHECK_USED(env);
   _SET_USED(env, 1);
   int epIdx = env->getEpIdx();
-  int gIdx = _entryTable[epIdx]->chareIdx;
   env->setGroupNum(groupID);
   env->setSrcPe(CkMyPe());
   env->setGroupEpoch(CkpvAccess(_charmEpoch));
@@ -1175,10 +1174,6 @@ IrrGroup *lookupGroupAndBufferIfNotThere(CkCoreState *ck,envelope *env,const CkG
 
 static inline void _deliverForBocMsg(CkCoreState *ck,int epIdx,envelope *env,IrrGroup *obj)
 {
-#if CMK_SMP
-  unsigned short int msgType = CMI_ZC_MSGTYPE(env); // store msgType as msg could be freed
-#endif
-
   _invokeEntry(epIdx,env,obj);
 
   _STATS_RECORD_PROCESS_BRANCH_1();
@@ -1188,7 +1183,6 @@ static inline void _processForBocMsg(CkCoreState *ck,envelope *env)
 {
   if(isGroupDepUnsatisfied(ck, env))
     return;
-  CkGroupID groupID =  env->getGroupNum();
   IrrGroup *obj = _lookupGroupAndBufferIfNotThere(ck,env,env->getGroupNum());
   if(obj) {
     ck->process(); // ck->process() updates mProcessed count used in QD
@@ -1279,7 +1273,6 @@ static void _processArrayEltMsg(CkCoreState *ck,envelope *env) {
     // First see if we already have a direct pointer to the object
     _SET_USED(env, 0);
     ck->process(); // ck->process() updates mProcessed count used in QD
-    int opts = 0;
     if (msg->array_hops()>1) {
       CProxy_ArrayBase(env->getArrayMgr()).ckLocMgr()->multiHop(msg);
     }
@@ -1813,7 +1806,7 @@ static inline envelope *_prepareImmediateMsgBranch(int eIdx,void *msg,CkGroupID
 static inline void _sendMsgBranch(int eIdx, void *msg, CkGroupID gID,
                   int pe=CLD_BROADCAST_ALL, int opts = 0)
 {
-  int numPes;
+  int numPes = 1;
   envelope *env;
     if (opts & CK_MSG_IMMEDIATE) {
         env = _prepareImmediateMsgBranch(eIdx,msg,gID,ForBocMsg);
@@ -1879,7 +1872,7 @@ void CkSendMsgBranchImmediate(int eIdx, void *msg, int destPE, CkGroupID gID)
   }
   //Can't inline-- send the usual way
   envelope *env = UsrToEnv(msg);
-  int numPes;
+  int numPes = 1;
   _TRACE_ONLY(numPes = (destPE==CLD_BROADCAST_ALL?CkNumPes():1));
   env = _prepareImmediateMsgBranch(eIdx,msg,gID,ForBocMsg);
   _TRACE_CREATION_N(env, numPes);
@@ -2034,7 +2027,7 @@ void CkSendMsgNodeBranchImmediate(int eIdx, void *msg, int node, CkGroupID gID)
   }
   //Can't inline-- send the usual way
   envelope *env = UsrToEnv(msg);
-  int numPes;
+  int numPes = 1;
   _TRACE_ONLY(numPes = (node==CLD_BROADCAST_ALL?CkNumNodes():1));
   env = _prepareImmediateMsgBranch(eIdx,msg,gID,ForNodeBocMsg);
   _TRACE_CREATION_N(env, numPes);
@@ -2164,10 +2157,8 @@ void CkArrayManagerDeliver(int pe,void *msg, int opts) {
 }
 
 class ElementDestroyer : public CkLocIterator {
-private:
-        CkLocMgr *locMgr;
 public:
-        ElementDestroyer(CkLocMgr* mgr_):locMgr(mgr_){};
+        ElementDestroyer(CkLocMgr* mgr_){}
         void addLocation(CkLocation &loc) {
 	  loc.destroyAll();
         }

src/ck-core/ckarray.C

@@ -801,8 +801,9 @@ void CProxySection_ArrayBase::pup(PUP::er& p)
  * ensures that up to the limit of available bits, array IDs can be represented
  * as part of a compound fixed-size ID for their elements.
  */
-struct CkCreateArrayAsyncMsg : public CMessage_CkCreateArrayAsyncMsg
+class CkCreateArrayAsyncMsg : public CMessage_CkCreateArrayAsyncMsg
 {
+ public:
   int ctor;
   CkCallback cb;
   CkArrayOptions opts;

src/ck-core/ckcheckpoint.C

@@ -722,7 +722,6 @@ void CkPupProcessorData(PUP::er &p)
 // called only on pe 0
 static bool checkpointOne(const char* dirname, CkCallback& cb, bool requestStatus){
 	CmiAssert(CkMyPe()==0);
-	char filename[1024];
 
 	// save readonlys, and callback BTW
 	FILE* fRO = openCheckpointFile(dirname, "RO", "wb", -1);
@@ -818,7 +817,6 @@ void CkStartCheckpoint(const char* dirname, const CkCallback& cb, bool requestSt
 CkCallback globalCb;
 void CkRestartMain(const char* dirname, CkArgMsg *args){
 	int i;
-	char filename[1024];
 
         if (CmiMyRank() == 0) {
           _inrestart = true;

src/ck-core/ckfutures.C

@@ -50,7 +50,7 @@ class MultiToThread: public FutureRequest {
  public:
   std::vector<void*> values;
 
-  MultiToThread(CthThread th_, const std::vector<CkFutureID>& ids_) : ids(ids_), th(th_), nRecvd(0) {
+  MultiToThread(CthThread th_, const std::vector<CkFutureID>& ids_) : th(th_), ids(ids_), nRecvd(0) {
     values.resize(ids.size());
 
     std::fill(values.begin(), values.end(), nullptr);