reverting to previous version
authorLukasz Wesolowski <wesolwsk@illinois.edu>
Wed, 4 Jun 2008 23:55:37 +0000 (23:55 +0000)
committerLukasz Wesolowski <wesolwsk@illinois.edu>
Wed, 4 Jun 2008 23:55:37 +0000 (23:55 +0000)
examples/converse/pingpong/Makefile
examples/converse/pingpong/pingpong.C
tests/charm++/pingpong/Makefile

index 87422190f2b70e7b4cd0c64a0e4a0c753e9369b3..a08c1fe4ec2764ebdf71ac0147f1d81bedd79044 100644 (file)
@@ -3,10 +3,10 @@ CHARMC=../../../bin/charmc $(OPTS)
 all: pingpong
 
 pingpong: pingpong.o
 all: pingpong
 
 pingpong: pingpong.o
-       $(CHARMC) -language converse++ -pg -o pingpong pingpong.o
+       $(CHARMC) -language converse++ -o pingpong pingpong.o
 
 pingpong.o: pingpong.C
 
 pingpong.o: pingpong.C
-       $(CHARMC) -language converse++ -pg -c pingpong.C
+       $(CHARMC) -language converse++ -c pingpong.C
 
 test: pingpong
        ./charmrun ./pingpong +p2 $(TESTOPTS)
 
 test: pingpong
        ./charmrun ./pingpong +p2 $(TESTOPTS)
index a56b5011d24f6aa6a6ec2140ce5da3c9d2e0fe5f..e7977296f70006d9c0c00ba7d9ca0925306630dc 100644 (file)
@@ -82,7 +82,7 @@ CmiHandler node0HandlerFunc(char *msg)
         CmiSetHandler(msg,CpvAccess(node1Handler));
         *((int *)(msg+CmiMsgHeaderSizeBytes)) = CpvAccess(msgSize);
         
         CmiSetHandler(msg,CpvAccess(node1Handler));
         *((int *)(msg+CmiMsgHeaderSizeBytes)) = CpvAccess(msgSize);
         
-        CmiSyncSendAndFree(0,CpvAccess(msgSize),msg);
+        CmiSyncSendAndFree(1,CpvAccess(msgSize),msg);
     }
     return 0;
 }
     }
     return 0;
 }
index e5570e90489cbea713a026bdd39880c7aa732a1b..a19b018f4afeb82f6987c12d41321aa71c8cc396 100644 (file)
@@ -6,7 +6,7 @@ OBJS = pingpong.o
 all:   cifiles pgm
 
 pgm: $(OBJS)
 all:   cifiles pgm
 
 pgm: $(OBJS)
-       $(CHARMC) -language charm++ -pg -o pgm $(OBJS)
+       $(CHARMC) -language charm++ -o pgm $(OBJS)
 
 cifiles: pingpong.ci
        $(CHARMC)  pingpong.ci
 
 cifiles: pingpong.ci
        $(CHARMC)  pingpong.ci
@@ -15,11 +15,7 @@ clean:
        rm -f *.decl.h *.def.h conv-host *.o pgm charmrun
 
 pingpong.o: pingpong.C
        rm -f *.decl.h *.def.h conv-host *.o pgm charmrun
 
 pingpong.o: pingpong.C
-<<<<<<< Makefile
-       $(CHARMC) -pg -c pingpong.C
-=======
        $(CHARMC) -I$(SRC)/conv-core pingpong.C
        $(CHARMC) -I$(SRC)/conv-core pingpong.C
->>>>>>> 1.4
 
 test: all
        @echo "Intra-processor Pingpong.."
 
 test: all
        @echo "Intra-processor Pingpong.."