Removed CMK_ASYNC constants from machines where they were not
authorMilind Bhandarkar <milind@cs.uiuc.edu>
Thu, 1 Mar 2001 08:22:27 +0000 (08:22 +0000)
committerMilind Bhandarkar <milind@cs.uiuc.edu>
Thu, 1 Mar 2001 08:22:27 +0000 (08:22 +0000)
needed. Moved related function from convcore.c to Common.net/machine.c.

18 files changed:
src/arch/exemplar/conv-mach.h
src/arch/mpi-axp-cc/conv-mach.h
src/arch/mpi-exemplar/conv-mach.h
src/arch/mpi-linux-vmi/conv-mach.h
src/arch/mpi-linux/conv-mach.h
src/arch/mpi-origin/conv-mach.h
src/arch/mpi-sp/conv-mach.h
src/arch/ncube2/conv-mach.h
src/arch/net/machine.c
src/arch/origin-pthreads/conv-mach.h
src/arch/origin2000/conv-mach.h
src/arch/paragon-red/conv-mach.h
src/arch/sim-linux/conv-mach.h
src/arch/sp3/conv-mach.h
src/arch/t3e/conv-mach.h
src/arch/uth-linux/conv-mach.h
src/arch/uth-win32/conv-mach.h
src/conv-core/convcore.c

index afe243b86ab15781324df17c48243ca7fe6236b1..67ac619d0de4f1f3c7b26437f369cfef80d0fec3 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index b3fbaf01b7a190b81ebadf1c348a7637d777f371..c3457071c367ae70ac473e3cf57cd570ebeb3416 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
 #define NODE_0_IS_CONVHOST                                 1
 #define CMK_CCS_AVAILABLE                                  1
 #define CMK_WEB_MODE                                       1
index 8ad5027a9bfb5711f8589710ec31b443c296e545..e6041491bd08c929d89876aff6ad27bbd9343297 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
index 26cef5dd933ebc9ff105bcbff4702f077d603aa2..25520c072de1249324a9c3c53314d91efd60b6aa 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 26cef5dd933ebc9ff105bcbff4702f077d603aa2..25520c072de1249324a9c3c53314d91efd60b6aa 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index eb62fd01135627ee7dc0bd2877b41c719c8d260f..97ac3a31c06bdf0fa019a6dde7a2390e914e3eb1 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
 #define CMK_CCS_AVAILABLE                                  1
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 83cbbec32fbe25165fa721b74c134f4c10c2fe1d..971a2e716fc4405fa73201461e6d3c4db375f0c7 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index c6b1f471d3e8ad24a609bfb8ff46c13b2e44c0dd..161cf44cd830991ccbc027ff3f99b10fefbfcf88 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 43937b93ad6911b482110e0e1cba93afce27c90f..3a56b04b5addfbe90ac459058c6dc8bddf8a4ee1 100644 (file)
@@ -467,6 +467,91 @@ void CmiAbort(const char *message)
 }
 
 
+/******************************************************************************
+ *
+ * CmiEnableAsyncIO
+ *
+ * The net and tcp versions use a bunch of unix processes talking to each
+ * other via file descriptors.  We need for a signal SIGIO to be generated
+ * each time a message arrives, making it possible to write a signal
+ * handler to handle the messages.  The vast majority of unixes can,
+ * in fact, do this.  However, there isn't any standard for how this is
+ * supposed to be done, so each version of UNIX has a different set of
+ * calls to turn this signal on.  So, there is like one version here for
+ * every major brand of UNIX.
+ *
+ *****************************************************************************/
+
+#if CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN
+#include <sys/filio.h>
+void CmiEnableAsyncIO(fd)
+int fd;
+{
+  int pid = getpid();
+  int async = 1;
+  if ( ioctl(fd, FIOSETOWN, &pid) < 0  ) {
+    CmiError("setting socket owner: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+  if ( ioctl(fd, FIOASYNC, &async) < 0 ) {
+    CmiError("setting socket async: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+}
+#endif
+
+#if CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP
+#include <sys/filio.h>
+void CmiEnableAsyncIO(fd)
+int fd;
+{
+  int pid = -getpid();
+  int async = 1;
+  if ( ioctl(fd, SIOCSPGRP, &pid) < 0  ) {
+    CmiError("setting socket owner: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+  if ( ioctl(fd, FIOASYNC, &async) < 0 ) {
+    CmiError("setting socket async: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+}
+#endif
+
+#if CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN
+#include <sys/ioctl.h>
+void CmiEnableAsyncIO(fd)
+int fd;
+{
+  int pid = getpid();
+  int async = 1;
+  if ( ioctl(fd, FIOSSAIOOWN, &pid) < 0  ) {
+    CmiError("setting socket owner: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+  if ( ioctl(fd, FIOSSAIOSTAT, &async) < 0 ) {
+    CmiError("setting socket async: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+}
+#endif
+
+#if CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN
+#include <fcntl.h>
+void CmiEnableAsyncIO(fd)
+int fd;
+{
+  if ( fcntl(fd, F_SETOWN, getpid()) < 0 ) {
+    CmiError("setting socket owner: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+  if ( fcntl(fd, F_SETFL, FASYNC) < 0 ) {
+    CmiError("setting socket async: %s\n", strerror(errno)) ;
+    exit(1);
+  }
+}
+#endif
+
 /*****************************************************************************
  *
  * Communication Structures
index 3e09747725be8df1865fafd0254fd5d20b878214..7aedee8c939835e794b59704ab3242728d3315ea 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 690befb2a3875ef29cbf7684dc55a719c5fae204..f05d4dbff9e25d87e3ae37ecf109d12b4426590d 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
 #define CMK_CCS_AVAILABLE                                  1
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index eb12d18f1e6fef6c07504b52e6c34a6102f2458f..b380eb3cb924e54dbf26bd503b51263610d05b61 100644 (file)
 
 #define CMK_NO_SOCKETS                                     1
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
index 5892485c4a562f73ee9bf2308a21fc6b1eed8d41..bdf76dbe49ae4b59b16e820a603358603104053e 100644 (file)
 
 #define CMK_OPTIMIZE 1
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    0
index 83cbbec32fbe25165fa721b74c134f4c10c2fe1d..971a2e716fc4405fa73201461e6d3c4db375f0c7 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 1d6e51f4c4b8be4a649f7b5c066d3cbafc3626fd..a93066d67b10c9f0f7d20c9e6b07c332e7da528c 100644 (file)
@@ -8,14 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
-#define FASYNC O_ASYNC
-
 #define CMK_CCS_AVAILABLE                                  1
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 9bbee47c9218b952f2573c3b313e6d8a2933609d..6c38ff02bf874f3b8b7d54f5f51bd3d62f3dd20a 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 430b3c40be05c67bad8b5e72fecfd595536e52ba..cc7ff5d9699c74a1611175b80541be62400a03fa 100644 (file)
@@ -8,12 +8,6 @@
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
 #define CMK_CCS_AVAILABLE                                  0
 
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
index 9e40a34f096044e358bb5edf849878668bf90df0..2f16829e69a60310b5d520edba71cb69e31a7156 100644 (file)
@@ -523,91 +523,6 @@ double CmiTimer()
 
 #endif
 
-/******************************************************************************
- *
- * CmiEnableAsyncIO
- *
- * The net and tcp versions use a bunch of unix processes talking to each
- * other via file descriptors.  We need for a signal SIGIO to be generated
- * each time a message arrives, making it possible to write a signal
- * handler to handle the messages.  The vast majority of unixes can,
- * in fact, do this.  However, there isn't any standard for how this is
- * supposed to be done, so each version of UNIX has a different set of
- * calls to turn this signal on.  So, there is like one version here for
- * every major brand of UNIX.
- *
- *****************************************************************************/
-
-#if CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN
-#include <sys/filio.h>
-void CmiEnableAsyncIO(fd)
-int fd;
-{
-  int pid = getpid();
-  int async = 1;
-  if ( ioctl(fd, FIOSETOWN, &pid) < 0  ) {
-    CmiError("setting socket owner: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-  if ( ioctl(fd, FIOASYNC, &async) < 0 ) {
-    CmiError("setting socket async: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-}
-#endif
-
-#if CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP
-#include <sys/filio.h>
-void CmiEnableAsyncIO(fd)
-int fd;
-{
-  int pid = -getpid();
-  int async = 1;
-  if ( ioctl(fd, SIOCSPGRP, &pid) < 0  ) {
-    CmiError("setting socket owner: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-  if ( ioctl(fd, FIOASYNC, &async) < 0 ) {
-    CmiError("setting socket async: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-}
-#endif
-
-#if CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN
-#include <sys/ioctl.h>
-void CmiEnableAsyncIO(fd)
-int fd;
-{
-  int pid = getpid();
-  int async = 1;
-  if ( ioctl(fd, FIOSSAIOOWN, &pid) < 0  ) {
-    CmiError("setting socket owner: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-  if ( ioctl(fd, FIOSSAIOSTAT, &async) < 0 ) {
-    CmiError("setting socket async: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-}
-#endif
-
-#if CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN
-#include <fcntl.h>
-void CmiEnableAsyncIO(fd)
-int fd;
-{
-  if ( fcntl(fd, F_SETOWN, getpid()) < 0 ) {
-    CmiError("setting socket owner: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-  if ( fcntl(fd, F_SETFL, FASYNC) < 0 ) {
-    CmiError("setting socket async: %s\n", strerror(errno)) ;
-    exit(1);
-  }
-}
-#endif
-
 #if CMK_SIGNAL_USE_SIGACTION
 #include <signal.h>
 void CmiSignal(sig1, sig2, sig3, handler)