Removed CmiSpanTreeInit from machine.c, and updated the pthreads-version.
authorMilind Bhandarkar <milind@cs.uiuc.edu>
Wed, 24 Feb 1999 16:36:02 +0000 (16:36 +0000)
committerMilind Bhandarkar <milind@cs.uiuc.edu>
Wed, 24 Feb 1999 16:36:02 +0000 (16:36 +0000)
src/arch/origin-pthreads/conv-mach.h
src/arch/origin-pthreads/machine.c
src/arch/origin2000/machine.c

index 8f963384f15ec4b66f707aa35b1481d51a569e8e..28d4f7a5c8fda632562728bdb3f13944a07681ff 100644 (file)
 #define CMK_TIMER_USE_SPECIAL                              0
 #define CMK_TIMER_USE_TIMES                                0
 
-#define CMK_TYPEDEF_INT2 unknown
-#define CMK_TYPEDEF_INT4 unknown
-#define CMK_TYPEDEF_INT8 unknown
-#define CMK_TYPEDEF_UINT2 unknown
-#define CMK_TYPEDEF_UINT4 unknown
-#define CMK_TYPEDEF_UINT8 unknown
-#define CMK_TYPEDEF_FLOAT4 unknown
-#define CMK_TYPEDEF_FLOAT8 unknown
+#define CMK_TYPEDEF_INT2 short
+#define CMK_TYPEDEF_INT4 int
+#define CMK_TYPEDEF_INT8 long
+#define CMK_TYPEDEF_UINT2 unsigned short
+#define CMK_TYPEDEF_UINT4 unsigned int
+#define CMK_TYPEDEF_UINT8 unsigned long
+#define CMK_TYPEDEF_FLOAT4 float
+#define CMK_TYPEDEF_FLOAT8 double
 
 
 #define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
index 951ee7d6e26485824735236b31928b91336f6849..879589c214db6625b8dd907f1237c72faee045f0 100644 (file)
@@ -213,7 +213,6 @@ static void *threadInit(void *arg)
   neighbour_init(CmiMyPe());
   CpvInitialize(void*, CmiLocalQueue);
   CpvAccess(CmiLocalQueue) = (void *) FIFO_Create();
-  CmiSpanTreeInit();
   CmiTimerInit();
   if (Cmi_initret==0) {
     Cmi_startFn(Cmi_argc, usrparam->argv);
index 95fe5273c588e55a99d833635f35f340668b4c39..42fe0b2b95ca540e7f8b97322989b80dc316b9e3 100644 (file)
@@ -171,7 +171,6 @@ static void threadInit(void *arg)
   ConverseCommonInit(usrparam->argv);
   neighbour_init(Cmi_mype);
   CpvAccess(CmiLocalQueue) = (void *) FIFO_Create();
-  CmiSpanTreeInit();
   CmiTimerInit();
   usadd(arena);
   if (usrparam->initret==0) {