*** empty log message ***
authorJosh Yelon <jyelon@uiuc.edu>
Fri, 19 Jul 1996 17:07:37 +0000 (17:07 +0000)
committerJosh Yelon <jyelon@uiuc.edu>
Fri, 19 Jul 1996 17:07:37 +0000 (17:07 +0000)
src/arch/net-aix-ppc/conv-mach.h
src/arch/net-hp/conv-mach.h
src/arch/sim-hp/conv-mach.h
src/arch/sim-rs6k/conv-mach.h
src/arch/tcp-hp/conv-mach.h
src/arch/uth-hp/conv-mach.h
src/arch/uth-rs6k/conv-mach.h
src/arch/uth/machine.c
src/conv-core/fifo.c

index 32e541bae4c7d4b8378b26409284eb0239eb8faf..a1b3dbc094f77536383f5f3e82ab9c343db62563 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.19  1996-07-16 17:23:37  jyelon
+ * Revision 1.20  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.19  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 1.18  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           0
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         long
+#define CMK_SIZE_T                                         long unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
 #define CMK_TIMER_USE_SPECIAL                              0
 #define CMK_TIMER_USE_TIMES                                1
 
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        0
-#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                        1
+#define CMK_VECTOR_SEND_USES_COMMON_CODE                   0
+#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                  1
 
 #define CMK_WAIT_NOT_NEEDED                                0
 #define CMK_WAIT_USES_SYS_WAIT_H                           1
index af296054fb57fbb4ad66fb2c7b4ae12711bf27e9..e21a90d92f978f8c831d6df2c05b5ca30b00a817 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.23  1996-07-16 17:23:37  jyelon
+ * Revision 2.24  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.23  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 2.22  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           1
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         unsigned
+#define CMK_SIZE_T                                         unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
index 6539700cd58ae36254fb276c1e58f53f7bfbb7ad..303b4321b60e25d09b510b7ec1d6da829d13174c 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.9  1996-07-16 17:23:37  jyelon
+ * Revision 1.10  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.9  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 1.8  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           0
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         unsigned
+#define CMK_SIZE_T                                         unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
index fce67bed33a52656aec4503203392ff39ba791e0..ff31816a87cb5b8e0a481e25dbfd9841267479c6 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.8  1996-07-16 17:23:37  jyelon
+ * Revision 1.9  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.8  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 1.7  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           0
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         long
+#define CMK_SIZE_T                                         long unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
 #define CMK_TIMER_USE_SPECIAL                              0
 #define CMK_TIMER_USE_TIMES                                1
 
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        1
-#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                        0
+#define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
+#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                  0
 
 #define CMK_WAIT_NOT_NEEDED                                0
 #define CMK_WAIT_USES_SYS_WAIT_H                           1
index a66fd62489415ddae68e0d73be1bfa23489d7bf8..9babdd5b10052edbe3c5850227ce83912373d624 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.23  1996-07-16 17:23:37  jyelon
+ * Revision 2.24  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.23  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 2.22  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           1
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         unsigned
+#define CMK_SIZE_T                                         unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
index 96565c4f0c5981d5fb91ffb847cfe86b9e9f639f..d46d1b3b5314d4753b6e9cef83be5a2fb954d864 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.12  1996-07-16 17:23:37  jyelon
+ * Revision 1.13  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.12  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 1.11  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           1
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         unsigned
+#define CMK_SIZE_T                                         unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
index cbf1135c14c108b180173677dd29483bb1b5d48e..aa41d5c3eda76836c3babb8a7466cf2c9c86eaee 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.14  1996-07-16 17:23:37  jyelon
+ * Revision 1.15  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.14  1996/07/16 17:23:37  jyelon
  * Renamed a flag.
  *
  * Revision 1.13  1996/07/16 05:20:41  milind
@@ -87,7 +90,7 @@
 #define CMK_SIGNAL_USE_SIGACTION                           0
 #define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
 
-#define CMK_SIZE_T                                         long
+#define CMK_SIZE_T                                         long unsigned int
 
 #define CMK_STATIC_PROTO_FAILS                             0
 #define CMK_STATIC_PROTO_WORKS                             1
 #define CMK_TIMER_USE_SPECIAL                              0
 #define CMK_TIMER_USE_TIMES                                1
 
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        1
-#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                        0
+#define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
+#define CMK_VECTOR_SEND_USES_SPECIAL_CODE                  0
 
 #define CMK_WAIT_NOT_NEEDED                                0
 #define CMK_WAIT_USES_SYS_WAIT_H                           1
index 2b6ce672ef7ff6b1677ea5925b2b0a892262d04f..5af730a60296a0552790109f928e57f66665f9ac 100644 (file)
  * REVISION HISTORY:
  *
  * $Log$
- * Revision 1.15  1996-07-15 20:59:22  jyelon
+ * Revision 1.16  1996-07-19 17:07:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.15  1996/07/15 20:59:22  jyelon
  * Moved much timer, signal, etc code into common.
  *
  * Revision 1.14  1996/07/02 21:25:22  jyelon
@@ -374,24 +377,23 @@ int maxmsgs;
 void CmiDeliverSpecificMsg(handler)
 int handler;
 {
-  void *tmpqueue = FIFO_Create(); int *msg;
+  void *tmpqueue = FIFO_Create(); int *msg, *msg1;
   
   while (1) {
     FIFO_DeQueue(CpvAccess(CmiLocalQueue), &msg);
     if (msg == 0) { CmiYield(); continue; }
-    if (CmiGetHandler(msg)==handler) {
-      CpvAccess(CmiBufferGrabbed)=0;
-      (CmiGetHandlerFunction(msg))(msg);
-      if (!CpvAccess(CmiBufferGrabbed)) CmiFree(msg);
-      break;
-    } else FIFO_EnQueue(tmpqueue, msg);
+    if (CmiGetHandler(msg)==handler) break;
+    FIFO_EnQueue(tmpqueue, msg);
   }
   while (1) {
-    FIFO_DeQueue(tmpqueue, &msg);
-    if (msg==0) break;
-    FIFO_EnQueue(CpvAccess(CmiLocalQueue), msg);
+    FIFO_DeQueue(tmpqueue, &msg1);
+    if (msg1==0) break;
+    FIFO_EnQueue(CpvAccess(CmiLocalQueue), msg1);
   }
   FIFO_Destroy(tmpqueue);
+  CpvAccess(CmiBufferGrabbed)=0;
+  (CmiGetHandlerFunction(msg))(msg);
+  if (!CpvAccess(CmiBufferGrabbed)) CmiFree(msg);
 }
 
 /********************* MESSAGE SEND FUNCTIONS ******************/
index 63135c45b72985d80813749571328db3b377915c..9dfd3742a3e51a11570ca6839c7f7b5301943185 100644 (file)
@@ -17,8 +17,8 @@ void           *
 FIFO_Create()
 {
        FIFO_QUEUE     *queue;
-       queue = (FIFO_QUEUE *)CmiAlloc(sizeof(FIFO_QUEUE));
-       queue->block = (void **) CmiAlloc(BLK_LEN * sizeof(void *));
+       queue = (FIFO_QUEUE *)malloc(sizeof(FIFO_QUEUE));
+       queue->block = (void **) malloc(BLK_LEN * sizeof(void *));
        queue->block_len = BLK_LEN;
        queue->first = queue->avail = 0;
        queue->length = 0;
@@ -52,7 +52,7 @@ void           *element;
                {
                        void          **blk = queue->block;
                        int             i, j;
-                       queue->block = (void **) CmiAlloc(sizeof(void *) * (queue->
+                       queue->block = (void **) malloc(sizeof(void *) * (queue->
                                                             block_len) *3);
                        for (i = queue->first, j = 0; i < queue->block_len; i++, j++)
                                queue->block[j] = blk[i];
@@ -63,7 +63,7 @@ void           *element;
                        queue->first = 0;
                        queue->avail = j;
                        queue->length++;
-                       CmiFree(blk);
+                       free(blk);
                }
                else
                {