Changes due to the new type for ChareType struct.
authorEsteban Meneses <emenese2@illinois.edu>
Thu, 29 Oct 2009 14:56:45 +0000 (14:56 +0000)
committerEsteban Meneses <emenese2@illinois.edu>
Thu, 29 Oct 2009 14:56:45 +0000 (14:56 +0000)
src/ck-core/ckmessagelogging.C

index e08fb3ca2651af40d5c8d17cdff0ea46dd2bd489..262f008417119344953efe0cf4af8426c62ec161 100644 (file)
@@ -1246,6 +1246,8 @@ bool fault_aware(CkObjID &recver){
        switch(recver.type){
                case TypeChare:
                        return false;
+               case TypeMainChare:
+                       return false;
                case TypeGroup:
                case TypeNodeGroup:
                case TypeArray:
@@ -3385,8 +3387,9 @@ void _messageLoggingExit(){
 void* CkObjID::getObject(){
        
                switch(type){
-                       case TypeChare:
-       
+                       case TypeChare: 
+                               return CkLocalChare(&data.chare.id);
+                       case TypeMainChare:
                                return CkLocalChare(&data.chare.id);
                        case TypeGroup:
        
@@ -3423,6 +3426,7 @@ void* CkObjID::getObject(){
 int CkObjID::guessPE(){
                switch(type){
                        case TypeChare:
+                       case TypeMainChare:
                                return data.chare.id.onPE;
                        case TypeGroup:
                        case TypeNodeGroup:
@@ -3446,6 +3450,9 @@ char *CkObjID::toString(char *buf) const {
                case TypeChare:
                        sprintf(buf,"Chare %p PE %d \0",data.chare.id.objPtr,data.chare.id.onPE);
                        break;
+               case TypeMainChare:
+                       sprintf(buf,"Chare %p PE %d \0",data.chare.id.objPtr,data.chare.id.onPE);       
+                       break;
                case TypeGroup:
                        sprintf(buf,"Group %d   PE %d \0",data.group.id.idx,data.group.onPE);
                        break;
@@ -3493,6 +3500,7 @@ void CkObjID::updatePosition(int PE){
 
                        break;
                case TypeChare:
+               case TypeMainChare:
                        CkAssert(data.chare.id.onPE == PE);
                        break;
                case TypeGroup: