Remove muddy bootprints
authorPhil Miller <mille121@illinois.edu>
Thu, 30 Jun 2011 03:09:05 +0000 (20:09 -0700)
committerPhil Miller <mille121@illinois.edu>
Thu, 30 Jun 2011 03:09:05 +0000 (20:09 -0700)
src/ck-core/ckcallback.C
src/ck-core/ckcallback.h

index 0288be1dc6bc984466b8fdc4fe41aafd4ed12888..c6e5ab5b7ac98433c5fab7a08c124f83c4703f66 100644 (file)
@@ -247,12 +247,10 @@ void CkCallback::send(void *msg) const
                if (!msg) msg=CkAllocSysMsg();
                CkBroadcastMsgArray(d.array.ep,msg,d.array.id);
                break;
-       /* Xiang begin*/
        case bcastSection:
                if(!msg)msg=CkAllocSysMsg();
                CkBroadcastMsgSection(d.section.ep,msg,secID);
                break;
-       /* Xiang end */
        case replyCCS: { /* Send CkDataMsg as a CCS reply */
                void *data=NULL;
                int length=0;
@@ -273,14 +271,13 @@ void CkCallback::send(void *msg) const
                break;
        };
 }
-/* Xiang begin */
 CkCallback::CkCallback(int ep, CkSectionID &id)
        {
                type=bcastSection;
                d.section.ep=ep;
                secID=id;
        }
-/* Xiang end */
+
 void CkCallback::pup(PUP::er &p) {
   //p((char*)this, sizeof(CkCallback));
   int t = (int)type;
index 8a30d244d5eb3dbdc4881d7ff4daa4c01450f075..cf97296e35b9bb2788b5f5e0ccf327085d54374d 100644 (file)
@@ -46,9 +46,7 @@ public:
        bcastGroup, //Broadcast to a group (d.group)
        bcastNodeGroup, //Broadcast to a nodegroup (d.group)
        bcastArray, //Broadcast to an array (d.array)
-       /* Xiang Ni begin*/
        bcastSection,//Broadcast to a section(d.section)
-       /* Xiang Ni end*/
        replyCCS // Reply to a CCS message (d.ccsReply)
        } callbackType;
 private:
@@ -81,11 +79,9 @@ private:
                CkGroupID id; //Array ID to call it on
                CkArrayIndexBase idx; //Index to send to (if any)
        } array;
-       /* Xiang begin*/
        struct s_section{
                int ep;
        } section;
-       /* Xiang end*/
 
        struct s_ccsReply {
                CcsDelayedReply reply;
@@ -192,11 +188,9 @@ public:
     // Bcast to array
        CkCallback(int ep,const CProxyElement_ArrayBase &arrElt,CmiBool doInline=CmiFalse);
        
-       /* Xiang begin*/
        //Bcast to section
        CkCallback(int ep,CProxySection_ArrayBase &sectElt,CmiBool doInline=CmiFalse);
        CkCallback(int ep, CkSectionID &sid);
-    /* Xiang end*/
        
        // Send to chare
        CkCallback(Chare *p, int ep, CmiBool doInline=CmiFalse);