Made Node-level sends functionality available to every supported
authorMilind Bhandarkar <milind@cs.uiuc.edu>
Wed, 27 Jan 1999 20:16:51 +0000 (20:16 +0000)
committerMilind Bhandarkar <milind@cs.uiuc.edu>
Wed, 27 Jan 1999 20:16:51 +0000 (20:16 +0000)
architecture. Made Spanning Tree more tuned to Clusters. Added
Node-level spanning tree calls.

50 files changed:
src/arch/exemplar-mpi/conv-mach.h
src/arch/exemplar/conv-mach.h
src/arch/ncube2/conv-mach.h
src/arch/net-aix-ppc/conv-mach.h
src/arch/net-hp-acc/conv-mach.h
src/arch/net-hp-cc/conv-mach.h
src/arch/net-hp/conv-mach.h
src/arch/net-irix-64/conv-mach.h
src/arch/net-irix/conv-mach.h
src/arch/net-linux-kcc/conv-mach.h
src/arch/net-linux-smp/conv-mach.h
src/arch/net-linux/conv-mach.h
src/arch/net-sol-cc/conv-mach.h
src/arch/net-sol-smp/conv-mach.h
src/arch/net-sol/conv-mach.h
src/arch/net-sun/conv-mach.h
src/arch/net/machine.c
src/arch/origin-mpi/conv-mach.h
src/arch/origin-pthreads/conv-mach.h
src/arch/origin2000/conv-mach.h
src/arch/paragon-red/conv-mach.h
src/arch/sim-hp/conv-mach.h
src/arch/sim-irix-64/conv-mach.h
src/arch/sim-irix/conv-mach.h
src/arch/sim-linux/conv-mach.h
src/arch/sim-rs6k/conv-mach.h
src/arch/sim-sol/conv-mach.h
src/arch/sim-sun/conv-mach.h
src/arch/sp3/conv-mach.h
src/arch/t3e/conv-mach.h
src/arch/uth-hp-cc/conv-mach.h
src/arch/uth-hp/conv-mach.h
src/arch/uth-irix-64/conv-mach.h
src/arch/uth-irix/conv-mach.h
src/arch/uth-linux/conv-mach.h
src/arch/uth-rs6k/conv-mach.h
src/arch/uth-sol-cc/conv-mach.h
src/arch/uth-sol/conv-mach.h
src/ck-core/acc.c
src/ck-core/charm.h
src/ck-core/condsend.c
src/ck-core/qd.c
src/ck-core/wrtone.c
src/conv-core/conv-conds.c
src/conv-core/converse.h
src/conv-core/queueing.c
src/conv-core/spantree.c
src/conv-ldb/cldb.spray.c
src/langs/simplemsg/simplemsg.h
src/langs/simplemsg/sm.h

index c6a9fd55f0b9949e58cde7494f11b0266b570f5d..d76d6e0278862e059c3fbf830fe7d81d6887e628 100644 (file)
@@ -7,11 +7,6 @@
 #define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
 #define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -75,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 2c42c7ad40604619dcfb5966c95787cfc53b014a..302f573893f9e62dfdaebb2b66b853198d3ad871 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  0
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -77,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             1
-#define CMK_STATIC_PROTO_WORKS                             0
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 2e479d5faed9bc648122b2271ccd51293114dec9..3cd108345cf1a566a03f445a8d84aefbedab9841 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 2c2bae5c9e23493979222a070be40ed6e5e48bfd..6cfc97d5a7ad515641666cc79ae18fa6745e50cc 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index e3072061c5b244af86506c07587ded8cb88ca915..604571088eaafea10f5a133f5c69d3681aee64d7 100644 (file)
 
 #define CMK_CCS_AVAILABLE                                  1
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -79,9 +73,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 6e0754401622ac93001e14184c2dcba64b283a1b..f081c2206ce265c6a7f1c9cf6e6df75a2757da12 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 0
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_NODELEVEL_SPANTREE_AVAILABLE                   0
-
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 3be35d8aa9e808d828d0dff4d9bbdd6a10c9e86f..5d3b85cf46e13cfbd4d5e5c7773d549bc4dbf521 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  1
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -77,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 12ee4b6d67b90db50539acf0a1bf15eddc30a7c5..46dba48366d05be3e5bee401dc4696a4ba212567 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index d04c67de2b9c7a27f61dfcaf356ba1bef3b8feaa..81ec5368d762879753a2b891ef43e157ad3f15c1 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -75,9 +74,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index c6eac92c1acabd95346d94909c15e31d6f42168d..8572dc1ff880d5a10f4a33e34eeea2a2ee1d3a4c 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  1
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_NODELEVEL_SPANTREE_AVAILABLE                   0
-
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 6e61824dc3dfbb632e91d454e36852057894a9f8..1614df5009e8a1932f88d287fa380acac090b51f 100644 (file)
@@ -1,115 +1,3 @@
-/***************************************************************************
- * RCS INFORMATION:
- *
- *   $RCSfile$
- *   $Author$       $Locker$        $State$
- *   $Revision$     $Date$
- *
- ***************************************************************************
- *
- * $Log$
- * Revision 1.2  1998-12-28 05:56:03  milind
- * Removed spantree.c from each machine directory, and provided
- * a common spantree.c. One can provide machine-specific implementations
- * using appropriate CMK_SPANTREE constant defined in conv-mach.h.
- * Currently, all machines use common code.
- *
- * Revision 1.1  1998/12/18 23:40:49  pramacha
- * Integrated Debugging-Interface-related changes.
- *
- * Revision 1.8  1998/06/15 22:11:16  jyelon
- * changed the way converse headers are done.
- *
- * Revision 1.7  1998/06/15 19:51:26  jyelon
- * Adding new typedef stuff.
- *
- * Revision 1.6  1998/05/22 22:06:59  milind
- * Added Charm-IDL
- *
- * Revision 1.5  1998/04/17 17:17:51  milind
- * Added CMK_CCS_AVAILABLE flag.
- *
- * Revision 1.4  1998/03/16 19:52:53  milind
- * small changes to machine params.
- *
- * Revision 1.3  1998/02/19 08:39:35  jyelon
- * Added multicast code.
- *
- * Revision 1.2  1997/12/22 21:57:53  jyelon
- * Changed LDB initialization scheme.
- *
- * Revision 1.1  1997/08/06 14:57:34  milind
- * Added net-linux and sim-linux versions.
- * Fixed some bugs in Makefile.
- * Fixed a bug in machine.c in common.sim.
- *
- * Revision 2.37  1997/07/28 19:01:07  jyelon
- * *** empty log message ***
- *
- * Revision 2.36  1997/07/26 16:42:02  jyelon
- * *** empty log message ***
- *
- * Revision 2.35  1997/05/05 13:55:29  jyelon
- * Updated for quickthreads
- *
- * Revision 2.34  1997/04/01 08:10:29  jyelon
- * Added CMK_GETPAGESIZE_AVAILABLE
- *
- * Revision 2.33  1997/03/25 23:09:13  milind
- * Got threads to work on 64-bit irix. Had to add JB_TWEAKING_ORIGIN flag to
- * all the conv-mach.h files. Also, _PAGESZ was undefined on irix. Added
- * code to memory.c to make it a static variable.
- *
- * Revision 2.32  1997/03/19 04:58:09  jyelon
- * Removed the CMK_DEFAULT_MAIN_USES_SIMULATOR_CODE flag.
- *
- * Revision 2.31  1997/02/13 09:31:48  jyelon
- * Updated for new main/ConverseInit structure.
- *
- * Revision 2.30  1997/02/08 14:10:23  jyelon
- * Correcting bugs in network version.
- *
- * Revision 2.29  1997/02/07 02:16:42  jyelon
- * Nothing major.
- *
- * Revision 2.28  1997/02/06 20:20:45  jyelon
- * Added BLANK_SPACE bla bla.
- *
- * Revision 2.27  1997/01/17 15:50:28  jyelon
- * Minor adjustments to deal with recent changes to Common code.
- *
- * Revision 2.26  1996/11/23 02:25:40  milind
- * Fixed several subtle bugs in the converse runtime for convex
- * exemplar.
- *
- * Revision 2.25  1996/11/08 22:23:00  brunner
- * Put _main in for HP-UX CC compilation.  It is ignored according to the
- * CMK_USE_HP_MAIN_FIX flag.
- *
- * Revision 2.24  1996/10/24 19:40:27  milind
- * Added CMK_IS_HETERO to all the net-all versions.
- *
- * Revision 2.23  1996/08/08 20:16:53  jyelon
- * *** empty log message ***
- *
- * Revision 2.22  1996/08/08 17:18:28  milind
- * changed to use getrusage instead of times.
- *
- * Revision 2.21  1996/07/24 22:33:01  milind
- * changed CMK_SIZE_T to unsigned long.
- *
- * Revision 2.20  1996/07/16  17:23:37  jyelon
- * Renamed a flag.
- *
- * Revision 2.19  1996/07/16 05:20:41  milind
- * Added CMK_VECTOR_SEND
- *
- * Revision 2.18  1996/07/15  20:58:27  jyelon
- * Flags now use #if, not #ifdef.  Also cleaned up a lot.
- *
- *
- **************************************************************************/
-
 #ifndef _CONV_MACH_H
 #define _CONV_MACH_H
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           1
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index a3beeed96a3877e0f343f9f9e23f158fffc30850..8572dc1ff880d5a10f4a33e34eeea2a2ee1d3a4c 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  1
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -75,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 48911faadffd4e5350fbb4dca9770841fe30d5c9..19d194905959fd70c71800b9dbd111cb8186f50a 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index f0bd123999a66afd4058c1878ff20c8b3cc04981..571f7e10075e37ac39c815fbd193828dfad1c73e 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  1
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           1
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
 #define CMK_SIZE_T                                         unsigned
 
 #define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       0
+#define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
-#define CMK_NODELEVEL_SPANTREE_AVAILABLE                   1
-
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
 
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
index 4526b13bb4856cfb1c6a89bdc76075e568bdf479..0f43ed7aba6e697b6ba60618f14dde4b03d68b8a 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  1
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
 #define CMK_SPANTREE_MAXSPAN                               4
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
-#define CMK_NODELEVEL_SPANTREE_AVAILABLE                   0
-
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
 
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
index a831c8092d1f2f735d84054265a8978b62671c4f..07311f48893c6fc0c259c32c57800d405905eeb6 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -70,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 95e55edbd4bb5cb7a450b0f157859c7b46929e2d..ffa6b3d1d7110858fde094103b3f8548f7616124 100644 (file)
@@ -924,10 +924,8 @@ void CmiStateInit(int pe, int rank, CmiState state)
     CsvInitialize(PCQueue, NodeRecv);
     state->noderecv=PCQueueCreate();
     CsvAccess(NodeRecv)=state->noderecv;
-    CmiNodeBarrier();
   } else {
     CsvInitialize(PCQueue, NodeRecv);
-    CmiNodeBarrier();
     state->noderecv=CsvAccess(NodeRecv);
   }
 #endif
@@ -1385,9 +1383,9 @@ void CmiDestroyLock(CmiNodeLock lk)
 
 void CmiYield() { thr_yield(); }
 
-int barrier;
-cond_t barrier_cond;
-mutex_t barrier_mutex;
+int barrier = 0;
+cond_t barrier_cond = DEFAULTCV;
+mutex_t barrier_mutex = DEFAULTMUTEX;
 
 void CmiNodeBarrier(void)
 {
@@ -2287,12 +2285,9 @@ void AssembleDatagram(OtherNode node, ExplicitDgram dg)
          if (node->asm_rank==DGRAM_NODEMESSAGE) {
           PCQueuePush(CmiGetStateN(0)->noderecv, msg);
          }
-        else {
+        else
 #endif
           PCQueuePush(CmiGetStateN(node->asm_rank)->recv, msg);
-#if CMK_NODE_QUEUE_AVAILABLE
-        }
-#endif
     }
     node->asm_msg = 0;
     myNode->recd_msgs++;
@@ -2580,15 +2575,8 @@ char *CmiGetNonLocalNodeQ()
   void *result = PCQueuePop(cs->noderecv);
   return (char *) result;
 }
-#else
-
-char *CmiGetNonLocalNodeQ()
-{
-}
-
 #endif
 
-
 char *CmiGetNonLocal()
 {
   CmiState cs = CmiGetState();
@@ -2654,11 +2642,6 @@ CmiCommHandle CmiGeneralNodeSend(int pe, int size, int freemode, char *data)
   CmiCommUnlock();
   return (CmiCommHandle)ogm;
 }
-
-#else
-
-#define CmiGeneralNodeSend(p,s,m,d) CmiGeneralSend(p,s,m,d)
-
 #endif
 
 /******************************************************************************
index 4c49f1379da8ddb71e77026a335c8e15d9490292..eaf5db78ab741b25a8ca724a9115a828031c2c94 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  0
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_NODELEVEL_SPANTREE_AVAILABLE                   0
-
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 961d645d7ab002d0b91bf29d00d81355eb948777..8f963384f15ec4b66f707aa35b1481d51a569e8e 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  0
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -80,9 +74,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 210a8716f3c206839733bd8ce8b4d5d81cf62f68..6945ad5aedf05226f404fd76d0a9d4eb38114958 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  0
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -79,9 +73,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index e1dc59dbca42a8b0a708d4a6e73e6c35bd5cedf8..52679477fbdc04de6e4d87c3cbdfe0105c4c1aac 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -70,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 48259626b5234fc07bfc8b309539d49820eaa974..2104f2187acda812842c576a8d4b8dbc4529ac81 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 8dd26898ff0d4093dfb90e6e7d13728f752ef977..c2ca08c6d2b25bb09254d27b5a249c7ee35b0887 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -70,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 72b88fa9ae057f4af6a8e243e504ce2f673a18f9..ed95e6827a02a27aafcba66cfcd693628704b9e6 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -70,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 355bfa7df5b02aeff7a6c0fe135cd3c8160d82b3..40cdcc9506700cb328a735db6865c09111437448 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index fb24e0e25623e2aeb1b365e78ae102f17430cf97..a14b907bf456673d5521fca5b5e76881333c7f52 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index f34eecb6833957cd9214a0da3667ce92d723de80..93516e464872663187cf3b6cbd7cbabceb6f8895 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 35a50270935814f0f20648764fe21cca37365ede..fc8143e921f1aa0244baaa785a4e6aa45fbea103 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 21dd3fe8fc0274d2924410e34abe2069b74bd9c8..6db155c7e21341fb43f0382b7696e1096295e60b 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 49e0a27b30b8e7046d16c41f8cc94cfb3763b6b8..b83a2cc2eb26910cfe5f98fa00b89bf4f48b1fa5 100644 (file)
@@ -9,11 +9,6 @@
 
 #define CMK_CCS_AVAILABLE                                  0
 
-#define CMK_REDUCTION_USES_COMMON_CODE                     1
-#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
 #define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
 #define CMK_CMIDELIVERS_USE_SPECIAL_CODE                   0
 
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 0
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                0
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 1
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_NODELEVEL_SPANTREE_AVAILABLE                   0
-
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 72e140492f83d0be619a9ab702172e5ad8f417db..416a62bbfb26a8f82da54af059f14396fd031e64 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -70,9 +69,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 6641694e25ed247ca54999f5dade2324ca3a2af1..d8ac80a12100ca86750a4c101901635fd599e551 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               0
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 3d5dffbbf4c1b4d929f93d0af277e068a2612506..0f6102169cf6013ad017f4a8f7b830fd98dd1c4a 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -73,9 +72,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index d36b87fc181a68ca3c08fd97897db5dcbd75c9c0..7366e9b97255f91753ffe0fab13421e838ef39d5 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -75,9 +74,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 0ef91c4266e7e4a4c037d4e212f132ae3a9f3646..82b4d8e4b307cd9b354e543d4ac07afce75e289d 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          1
 #define CMK_STRERROR_USE_SYS_ERRLIST                       0
 
index 5850722e3acea37a11f261d48e4c6abe17dcdac3..06fb72926cc7e13cc7f0806325d0b92b6cdc0f8a 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index 2d1eec5cfd463ae893002970953ba3a7c4e58b38..d4fd35ebf56f49d8f2c79301ea7fb014387f11df 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index a22c8b3492012aa2bedac7cfeb22ab10398a2c33..4d4fe798c29d00499459b98da18be616d4df7681 100644 (file)
 #define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
 #define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
 
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION           0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION  1
+#define CMK_NODE_QUEUE_AVAILABLE                           0
 
-#define CMK_PROTOTYPES_FAIL                                0
-#define CMK_PROTOTYPES_WORK                                1
+#define CMK_REDUCTION_USES_COMMON_CODE                     1
+#define CMK_REDUCTION_USES_SPECIAL_CODE                    0
 
 #define CMK_RSH_IS_A_COMMAND                               1
 #define CMK_RSH_NOT_NEEDED                                 0
@@ -72,9 +71,6 @@
 #define CMK_SPANTREE_USE_COMMON_CODE                       1
 #define CMK_SPANTREE_USE_SPECIAL_CODE                      0
 
-#define CMK_STATIC_PROTO_FAILS                             0
-#define CMK_STATIC_PROTO_WORKS                             1
-
 #define CMK_STRERROR_IS_A_BUILTIN                          0
 #define CMK_STRERROR_USE_SYS_ERRLIST                       1
 
index fac7c4f2615de3706077609b1d42b2e6ea3b687a..08c2173e8ee975dda680068bd2d6cfae31fb917f 100644 (file)
@@ -91,7 +91,7 @@ ACC_DATA *mydata;
 
        if (CmiNumSpanTreeChildren(mydata->Penum) == 0)
        {
-               if (mydata->Penum == CmiSpanTreeRoot())
+               if (mydata->Penum == 0)
                        SendMsg(mydata->EP,  GetAccMsgPtr(mydata),
                                &(mydata->CID)); 
                else
@@ -121,7 +121,7 @@ ACC_DATA *mydata;
        mydata->NumChildren--;
        if (mydata->NumChildren <= 0)
        {
-               if (mydata->Penum == CmiSpanTreeRoot())
+               if (mydata->Penum == 0)
                        SendMsg(mydata->EP, GetAccMsgPtr(mydata),
                                &(mydata->CID)); 
                else
index 9cfe738813da0a707dc78f42a8f77131502740fb..d4a7008149174c2fa9cd6ceedd2bde4104d0aa0b 100644 (file)
@@ -388,11 +388,11 @@ typedef unsigned int PVECTOR;
 #define GetEnv_prioend(e) ((unsigned int *)(((char *)(e))+GetEnv_TotalSize(e)))
 #define GetEnv_priobgn(e) ((unsigned int *)(((char *)(e))+GetEnv_TotalSize(e)-GetEnv_priobytes(e)))
 
-extern unsigned int *CkPrioPtrFn       CMK_PROTO((void *));
-extern int           CkPrioSizeBitsFn  CMK_PROTO((void *));
-extern int           CkPrioSizeBytesFn CMK_PROTO((void *));
-extern int           CkPrioSizeWordsFn CMK_PROTO((void *));
-extern void          CkPrioConcatFn    CMK_PROTO((void *,void *,unsigned int));
+extern unsigned int *CkPrioPtrFn(void *);
+extern int           CkPrioSizeBitsFn(void *);
+extern int           CkPrioSizeBytesFn(void *);
+extern int           CkPrioSizeWordsFn(void *);
+extern void          CkPrioConcatFn(void *,void *,unsigned int);
 
 #define CkPrioPtr(msg)       (CkPrioPtrFn((void *)(msg)))
 #define CkPrioSizeBits(msg)  (CkPrioSizeBitsFn((void *)(msg)))
@@ -607,8 +607,8 @@ FUNCTION_PTR _CK_9GetMonoCompareFn();
 #define CkSpanTreeParent        CmiSpanTreeParent
 #define  CSpanTreeParent        CmiSpanTreeParent
 
-#define CkSpanTreeRoot          CmiSpanTreeRoot
-#define  CSpanTreeRoot          CmiSpanTreeRoot
+#define CkSpanTreeRoot          0
+#define  CSpanTreeRoot          0
 
 #define CkSpanTreeChildren      CmiSpanTreeChildren
 #define  CSpanTreeChildren      CmiSpanTreeChildren
@@ -659,7 +659,7 @@ FUNCTION_PTR _CK_9GetMonoCompareFn();
 #define McTotalNumPe() CmiNumPes()   
 #define McSpanTreeInit() CmiSpanTreeInit()
 #define McSpanTreeParent(node) CmiSpanTreeParent(node)
-#define McSpanTreeRoot() CmiSpanTreeRoot()
+#define McSpanTreeRoot() 0
 #define McSpanTreeChild(node, children) CmiSpanTreeChildren(node, children)
 #define McNumSpanTreeChildren(node) CmiNumSpanTreeChildren(node)
 #define McSendToSpanTreeLeaves(size, msg) CmiSendToSpanTreeLeaves(size, msg)
index 6b3f3a74dee6adffc064dc89027b7d15df66def3..96ccaf5831fa7ecf3c8b94b63738cd9327135604 100644 (file)
@@ -12,17 +12,17 @@ typedef struct {
 } CallBocStuff;
 
 /* Function implemented but not to be used .. */
-static void SendMsgIfConditionArises  CMK_PROTO((int condnum, int entry, void *msg, int size, ChareIDType *cid));
+static void SendMsgIfConditionArises(int condnum, int entry, void *msg, int size, ChareIDType *cid);
 
-void CallBocIfConditionArises CMK_PROTO((int condnum, FUNCTION_PTR fnp, int bocNum));
+void CallBocIfConditionArises(int condnum, FUNCTION_PTR fnp, int bocNum);
 
-void SendMsgAfter CMK_PROTO((unsigned int deltaT, int entry, void *msg, int size, ChareIDType *cid));
+void SendMsgAfter(unsigned int deltaT, int entry, void *msg, int size, ChareIDType *cid);
 
-void CallBocAfter CMK_PROTO((FUNCTION_PTR fnp, int bocNum, unsigned int deltaT));
+void CallBocAfter(FUNCTION_PTR fnp, int bocNum, unsigned int deltaT);
 
-void CallBocOnCondition CMK_PROTO((FUNCTION_PTR fnp, int bocNum));
+void CallBocOnCondition(FUNCTION_PTR fnp, int bocNum);
 
-int NoDelayedMsgs CMK_PROTO((void));
+int NoDelayedMsgs(void);
 
 
 CpvStaticDeclare(int, outstanding_sends);
index 78bcb0ad5be3bedccc06cfc9af0fbf7b248aaffd..afff8e91b4327b9b35267f0f1c30a8b5af3d034a 100644 (file)
@@ -159,7 +159,7 @@ void QDBocInit()
     
     CpvAccess(myPe)        = CmiMyPe();
     CpvAccess(mainPe)      = 0;
-    CpvAccess(rootPe)      = CmiSpanTreeRoot();
+    CpvAccess(rootPe)      = 0;
     CpvAccess(numKids)     = CmiNumSpanTreeChildren(CpvAccess(myPe));
     CpvAccess(parentPe)    = (CpvAccess(myPe) == CpvAccess(rootPe)) ? CpvAccess(mainPe) : CmiSpanTreeParent(CpvAccess(myPe));
     CpvAccess(quiescenceStarted) = 0;
index 54a066632f2efd2aed67bf6ef127657b4b9dcb3f..543536e569c2dd910e70d4726fddc82b6f5ff1e0 100644 (file)
@@ -96,7 +96,7 @@ void *msgptr_,*localdataptr_;
                CkMemError(ackMsg);
                ackMsg->wovID = newWovMsg->wovID;
 
-               if(CmiMyPe() == CmiSpanTreeRoot()) {
+               if(CmiMyPe() == 0) {
 TRACE(CmiPrintf("[%d]:: NodeWrtOnceVar...Ack to Host for wovID %d\n",
                                CmiMyPe() ,ackMsg->wovID);)
                        HostReceiveAcknowledge(ackMsg, bocData);
@@ -139,7 +139,7 @@ TRACE(CmiPrintf("[%d]:: NodeRecvAck...wovID = %d, kids left = %d\n",
                CkMemError(ackMsg);
                ackMsg->wovID = theMsg->wovID;
 
-               if(CmiMyPe() == CmiSpanTreeRoot())
+               if(CmiMyPe() == 0)
                            HostReceiveAcknowledge(ackMsg, bocData);
                else
                            GeneralSendMsgBranch(CsvAccess(CkEp_WOV_RcvAck), ackMsg, 
index fc8ac61e70143d429e7aa82e58b164881f54390e..edee6a00dfcb545e41a7b312db4080dd832a50c6 100644 (file)
@@ -2,9 +2,9 @@
 
 #include "converse.h"
 
-static void InsertInHeap     CMK_PROTO((double Time, CcdVoidFn fnp, void *arg));
-static void RemoveFromHeap   CMK_PROTO((int index));
-static void SwapHeapEntries  CMK_PROTO((int index1, int index2));
+static void InsertInHeap(double Time, CcdVoidFn fnp, void *arg);
+static void RemoveFromHeap(int index);
+static void SwapHeapEntries(int index1, int index2);
 
 typedef struct fn_arg {
   CcdVoidFn fn;
@@ -27,8 +27,7 @@ typedef struct {
 #define MAXCONDCHKARRAYELTS       512
 
 /** Note : The heap is only stored in elements 
-                  timerHeap[0] to timerHeap[numHeapEntries] */
-
+    timerHeap[0] to timerHeap[numHeapEntries] */
 
 CpvStaticDeclare(HeapIndexType*, timerHeap); 
 CpvStaticDeclare(CONDS*, CondArr);   
@@ -37,9 +36,9 @@ CpvStaticDeclare(int, numHeapEntries);
 
 CpvDeclare(int, CcdNumChecks);
 
-extern double CmiWallTimer();
+extern double CmiWallTimer(void);
 
-void CcdModuleInit()
+void CcdModuleInit(void)
 {
    int i;
 
@@ -49,15 +48,14 @@ void CcdModuleInit()
    CpvInitialize(int, numHeapEntries);
    CpvInitialize(int, CcdNumChecks);
 
-   CpvAccess(timerHeap) = (HeapIndexType*) CmiAlloc(sizeof(HeapIndexType)*(MAXTIMERHEAPENTRIES + 1));
-   CpvAccess(CondArr) = (CONDS*) CmiAlloc(sizeof(CONDS)*(MAXCONDCHKARRAYELTS));
-  
+   CpvAccess(timerHeap) = 
+     (HeapIndexType*) malloc(sizeof(HeapIndexType)*(MAXTIMERHEAPENTRIES + 1));
+   CpvAccess(CondArr) = (CONDS*) malloc(sizeof(CONDS)*(MAXCONDCHKARRAYELTS));
    CpvAccess(CcdNumChecks) = 0;
    CpvAccess(numHeapEntries) = 0;
-   CpvAccess(PeriodicCalls) = (FN_ARG *) NULL;
-   for(i = 0; i < MAXCONDCHKARRAYELTS; i++) {
-     CpvAccess(CondArr)[i].fn_arg_list = NULL;
-   }
+   CpvAccess(PeriodicCalls) = (FN_ARG *) 0;
+   for(i=0; i<MAXCONDCHKARRAYELTS; i++)
+     CpvAccess(CondArr)[i].fn_arg_list = 0;
 }
 
 
@@ -65,44 +63,23 @@ void CcdModuleInit()
 /*****************************************************************************
   Add a function that will be called when a particular condition is raised
  *****************************************************************************/
-void CcdCallOnCondition(condnum,fnp,arg)
-    int condnum;
-    CcdVoidFn fnp;
-    void *arg;
+void CcdCallOnCondition(int condnum,CcdVoidFn fnp,void *arg)
 {
-  FN_ARG *newEntry;
-  
-  if((newEntry = (FN_ARG *) CmiAlloc(sizeof(FN_ARG))) == NULL) 
-    {
-      CmiError("CallOnCondition: Allocation Failed");
-      return;
-    }
-  else 
-    {
-      newEntry->fn = fnp;  
-      newEntry->arg  = arg;
-      newEntry->next = CpvAccess(CondArr)[condnum].fn_arg_list;
-      CpvAccess(CondArr)[condnum].fn_arg_list =  newEntry;
-    }
+  FN_ARG *newEntry = (FN_ARG *) malloc(sizeof(FN_ARG)); 
+  newEntry->fn = fnp;  
+  newEntry->arg  = arg;
+  newEntry->next = CpvAccess(CondArr)[condnum].fn_arg_list;
+  CpvAccess(CondArr)[condnum].fn_arg_list =  newEntry;
 } 
 
 /*****************************************************************************
-  Add a function that will be called during each call to PeriodicChecks
+  Add a function that will be called during next call to PeriodicChecks
  *****************************************************************************/
-void CcdPeriodicallyCall(fnp, arg)
-    CcdVoidFn fnp;
-    void *arg;
+void CcdPeriodicallyCall(CcdVoidFn fnp, void *arg)
 {
-  FN_ARG *temp;
-  
-  if((temp = (FN_ARG *) CmiAlloc(sizeof(FN_ARG))) == NULL) 
-    {
-      CmiError("PeriodicallyCall: Allocation failed");
-      return;
-    }
+  FN_ARG *temp = (FN_ARG *) malloc(sizeof(FN_ARG)); 
   temp->fn = fnp;
   temp->arg = arg;
-  
   temp->next = CpvAccess(PeriodicCalls);
   CpvAccess(PeriodicCalls) = temp;
   CpvAccess(CcdNumChecks)++;
@@ -111,30 +88,23 @@ void CcdPeriodicallyCall(fnp, arg)
 /*****************************************************************************
   Call all the functions that are waiting for this condition to be raised
  *****************************************************************************/
-void CcdRaiseCondition(condNum)
-     int condNum;
+void CcdRaiseCondition(int condNum)
 {
   FN_ARG *temp, *del;
   temp = CpvAccess(CondArr)[condNum].fn_arg_list;
-  CpvAccess(CondArr)[condNum].fn_arg_list = NULL;
-  while(temp)
-    {
-      (*(temp->fn))(temp->arg); /* Any freeing of the argument structure should
-                                  be done here */
-      del = temp;
-      temp = temp->next;
-      free(del);
-    }
-  /*CpvAccess(CondArr)[condNum].fn_arg_list= NULL; moved up -- sanjay 7/22/97*/
+  CpvAccess(CondArr)[condNum].fn_arg_list = 0;
+  while(temp) {
+    (*(temp->fn))(temp->arg);
+    del = temp;
+    temp = temp->next;
+    free(del);
+  }
 }
 
 /*****************************************************************************
   Call the function with the provided argument after a minimum delay of deltaT
  *****************************************************************************/
-void CcdCallFnAfter(fnp, arg, deltaT)
-    CcdVoidFn fnp;
-    void *arg;
-    unsigned int deltaT;
+void CcdCallFnAfter(CcdVoidFn fnp, void *arg, unsigned int deltaT)
 {
   double tPrime, currT;
   currT  = CmiWallTimer();                /* get current time */
@@ -153,30 +123,23 @@ void CcdCallBacks()
   int i,j;
   FN_ARG *temp, *next;
   
-/* This was formerly TimerChecks() */
   if ( CpvAccess(numHeapEntries) > 0 ) {
     currTime = CmiWallTimer();
-  
-    while ((CpvAccess(numHeapEntries) > 0) && CpvAccess(timerHeap)[1].timeVal < currTime)
+    while ((CpvAccess(numHeapEntries) > 0) && 
+           CpvAccess(timerHeap)[1].timeVal < currTime)
     {
       (*(CpvAccess(timerHeap)[1].fn))(CpvAccess(timerHeap)[1].arg);
       RemoveFromHeap(1);
     }
   }
 
-/* This was formerly PeriodicChecks() */
-/* Call the functions that have been added to the list of periodic functions */
-
   temp = CpvAccess(PeriodicCalls); 
-  CpvAccess(PeriodicCalls) = NULL ;
-
+  CpvAccess(PeriodicCalls) = 0 ;
   for(; temp; temp = next) {
     CpvAccess(CcdNumChecks)--;
-
     (*(temp->fn))(temp->arg);
-
     next = temp->next ;
-    CmiFree(temp) ;
+    free(temp) ;
   }
 } 
 
@@ -184,10 +147,7 @@ void CcdCallBacks()
   These are internal functions
   ****************************************************************************/
 
-static void InsertInHeap(theTime, fnp, arg)
-    double theTime;
-    CcdVoidFn fnp;
-    void *arg;
+static void InsertInHeap(double theTime, CcdVoidFn fnp, void *arg)
 {
   int child, parent;
   
@@ -214,8 +174,7 @@ static void InsertInHeap(theTime, fnp, arg)
     }
 } 
 
-static void RemoveFromHeap(index)
-    int index;
+static void RemoveFromHeap(int index)
 {
   int parent,child;
   
@@ -227,7 +186,7 @@ static void RemoveFromHeap(index)
     } 
   else 
     {
-      CpvAccess(timerHeap)[index].arg = NULL;
+      CpvAccess(timerHeap)[index].arg = 0;
       SwapHeapEntries(index,CpvAccess(numHeapEntries)); /* put deleted value at end 
                                                of heap */
       CpvAccess(numHeapEntries)--;
@@ -250,8 +209,7 @@ static void RemoveFromHeap(index)
     } 
 } 
 
-static void SwapHeapEntries(index1, index2)
-    int index1; int index2;
+static void SwapHeapEntries(int index1, int index2)
 {
   HeapIndexType temp;
   
index da6381ae670613221a548a80143124c877535666..cfb9c95b04148c0c7b5c7187dfabc1483331e342 100644 (file)
@@ -8,44 +8,14 @@
 
 /**** DEAL WITH DIFFERENCES: KERNIGHAN-RITCHIE-C, ANSI-C, AND C++ ****/
 
-#if CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION
-#define CMK_CONCAT(x,y) y
-#endif
-
-#if CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION
 #define CMK_CONCAT(x,y) x##y
-#endif
 
 /* the following flags denote properties of the C compiler,  */
 /* not the C++ compiler.  If this is C++, ignore them.       */
 #ifdef __cplusplus
-#undef CMK_PROTOTYPES_FAIL
-#undef CMK_PROTOTYPES_WORK
-#define CMK_PROTOTYPES_FAIL 0
-#define CMK_PROTOTYPES_WORK 1
-#undef CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION
-#undef CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION
-#define CMK_PREPROCESSOR_CANNOT_DO_CONCATENATION 0
-#define CMK_PREPROCESSOR_USES_ANSI_STANDARD_CONCATENATION 1
 extern "C" {
 #endif
 
-#if CMK_PROTOTYPES_WORK
-#define CMK_PROTO(x) x
-#endif
-
-#if CMK_PROTOTYPES_FAIL
-#define CMK_PROTO(x) ()
-#endif
-
-#if CMK_STATIC_PROTO_WORKS
-#define CMK_STATIC_PROTO static
-#endif
-
-#if CMK_STATIC_PROTO_FAILS
-#define CMK_STATIC_PROTO extern
-#endif
-
 /******************************************************************************
  *
  * Deal with Shared Memory
@@ -137,8 +107,8 @@ extern int Cmi_mynodesize;
 
 extern void CmiMemLock();
 extern void CmiMemUnlock();
-extern void CmiNodeBarrier CMK_PROTO((void));
-extern void *CmiSvAlloc CMK_PROTO((int));
+extern void CmiNodeBarrier(void);
+extern void *CmiSvAlloc(int);
 
 typedef cps_mutex_t *CmiNodeLock;
 extern CmiNodeLock CmiCreateLock(void);
@@ -188,7 +158,7 @@ extern int CmiRankOf(int pe);
 
 extern void CmiMemLock();
 extern void CmiMemUnlock();
-extern void CmiNodeBarrier CMK_PROTO((void));
+extern void CmiNodeBarrier(void);
 #define CmiSvAlloc CmiAlloc
 
 
@@ -241,7 +211,7 @@ extern int CmiRankOf(int pe);
 
 extern void CmiMemLock();
 extern void CmiMemUnlock();
-extern void CmiNodeBarrier CMK_PROTO((void));
+extern void CmiNodeBarrier(void);
 #define CmiSvAlloc CmiAlloc
 
 
@@ -389,10 +359,10 @@ CpvExtern(CmiHandler,  CsdNotifyIdle);
 CpvExtern(CmiHandler,  CsdNotifyBusy);
 CpvExtern(int,         CsdStopNotifyFlag);
 
-extern int CmiRegisterHandler CMK_PROTO((CmiHandler));
-extern int CmiRegisterHandlerLocal CMK_PROTO((CmiHandler));
-extern int CmiRegisterHandlerGlobal CMK_PROTO((CmiHandler));
-extern void CmiNumberHandler CMK_PROTO((int, CmiHandler));
+extern int CmiRegisterHandler(CmiHandler);
+extern int CmiRegisterHandlerLocal(CmiHandler);
+extern int CmiRegisterHandlerGlobal(CmiHandler);
+extern void CmiNumberHandler(int, CmiHandler);
 
 /*
  * I'm planning on doing the byte-order conversion slightly differently
@@ -452,30 +422,51 @@ extern void CmiNumberHandler CMK_PROTO((int, CmiHandler));
 #define CmiHandlerToFunction(n) (CpvAccess(CmiHandlerTable)[n])
 #define CmiGetHandlerFunction(env) (CmiHandlerToFunction(CmiGetHandler(env)))
 
-void    *CmiAlloc  CMK_PROTO((int size));
-int      CmiSize   CMK_PROTO((void *));
-void     CmiFree   CMK_PROTO((void *));
+void    *CmiAlloc(int size);
+int      CmiSize(void *);
+void     CmiFree(void *);
 
-double   CmiTimer      CMK_PROTO(());
-double   CmiWallTimer  CMK_PROTO(());
-double   CmiCpuTimer   CMK_PROTO(());
+double   CmiTimer();
+double   CmiWallTimer();
+double   CmiCpuTimer();
 
 #if CMK_NODE_QUEUE_AVAILABLE
 
-#define CsdNodeEnqueueGeneral(x,s,i,p) {CmiLock(CsvAccess(NodeQueueLock));\
-    CqsEnqueueGeneral(CsvAccess(CsdNodeQueue),(x),(s),(i),(p)); \
-    CmiUnlock(CsvAccess(NodeQueueLock));}
-#define CsdNodeEnqueue(x)     {CmiLock(CsvAccess(NodeQueueLock));\
-                              CqsEnqueueFifo(CsvAccess(CsdNodeQueue),(x));\
-                              CmiUnlock(CsvAccess(NodeQueueLock));}
+#define CsdNodeEnqueueGeneral(x,s,i,p) { \
+          CmiLock(CsvAccess(NodeQueueLock));\
+          CqsEnqueueGeneral(CsvAccess(CsdNodeQueue),(x),(s),(i),(p)); \
+          CmiUnlock(CsvAccess(NodeQueueLock)); \
+        }
+#define CsdNodeEnqueueFifo(x)     { \
+          CmiLock(CsvAccess(NodeQueueLock));\
+          CqsEnqueueFifo(CsvAccess(CsdNodeQueue),(x)); \
+          CmiUnlock(CsvAccess(NodeQueueLock)); \
+        }
+#define CsdNodeEnqueueLifo(x)     { \
+          CqsEnqueueLifo(CsvAccess(CsdNodeQueue),(x))); \
+          CmiUnlock(CsvAccess(NodeQueueLock)); \
+        }
+#define CsdNodeEnqueue(x)     { \
+          CmiLock(CsvAccess(NodeQueueLock));\
+          CqsEnqueueFifo(CsvAccess(CsdNodeQueue),(x));\
+          CmiUnlock(CsvAccess(NodeQueueLock)); \
+        }
+
+#define CsdNodeEmpty()            (CqsEmpty(CpvAccess(CsdNodeQueue)))
+#define CsdNodeLength()           (CqsLength(CpvAccess(CsdNodeQueue)))
 
 #else
 
-#define CsdNodeEnqueueGeneral(x,s,i,p)  CsdEnqueueGeneral(x,s,i,p)
-#define CsdNodeEnqueue(x)              CsdEnqueue(x)
+#define CsdNodeEnqueueGeneral(x,s,i,p)  (CsdEnqueueGeneral(x,s,i,p))
+#define CsdNodeEnqueueFifo(x)     (CqsEnqueueFifo(CpvAccess(CsdSchedQueue),(x)))
+#define CsdNodeEnqueueLifo(x)     (CqsEnqueueLifo(CpvAccess(CsdSchedQueue),(x)))
+#define CsdNodeEnqueue(x)         (CsdEnqueue(x))
+#define CsdNodeEmpty()            (CqsEmpty(CpvAccess(CsdSchedQueue)))
+#define CsdNodeLength()           (CqsLength(CpvAccess(CsdSchedQueue)))
 
 #endif
 
+extern int CqsEmpty(void *);
 
 #define CsdEnqueueGeneral(x,s,i,p)\
     (CqsEnqueueGeneral(CpvAccess(CsdSchedQueue),(x),(s),(i),(p)))
@@ -486,9 +477,9 @@ double   CmiCpuTimer   CMK_PROTO(());
 #define CsdLength()           (CqsLength(CpvAccess(CsdSchedQueue)))
 
 #if CMK_CMIPRINTF_IS_A_BUILTIN
-void  CmiPrintf CMK_PROTO((char *, ...));
-void  CmiError  CMK_PROTO((char *, ...));
-int   CmiScanf  CMK_PROTO((char *, ...));
+void  CmiPrintf(char *, ...);
+void  CmiError(char *, ...);
+int   CmiScanf(char *, ...);
 #endif
 
 #if CMK_CMIPRINTF_IS_JUST_PRINTF
@@ -499,35 +490,72 @@ int   CmiScanf  CMK_PROTO((char *, ...));
 #define CmiScanf  scanf
 #endif
 
-typedef void (*CmiStartFn) CMK_PROTO((int argc, char **argv));
+typedef void (*CmiStartFn)(int argc, char **argv);
 
 /********* CSD - THE SCHEDULER ********/
 
-extern  int CsdScheduler CMK_PROTO((int));
+extern  int CsdScheduler(int);
 #define CsdSetNotifyIdle(f1,f2) {CpvAccess(CsdNotifyIdle)=(f1);\
                                  CpvAccess(CsdNotifyBusy)=(f2);}
 #define CsdStartNotifyIdle() (CpvAccess(CsdStopNotifyFlag)=0)
 #define CsdStopNotifyIdle() (CpvAccess(CsdStopNotifyFlag)=1)
 
 #if CMK_CSDEXITSCHEDULER_IS_A_FUNCTION
-extern void CsdExitScheduler CMK_PROTO((void));
+extern void CsdExitScheduler(void);
 #endif 
 
 #if CMK_CSDEXITSCHEDULER_SET_CSDSTOPFLAG
 #define CsdExitScheduler()  (CpvAccess(CsdStopFlag)++)
 #endif
 
-void     CmiGrabBuffer           CMK_PROTO((void **ppbuf));
-int      CmiSpanTreeRoot         CMK_PROTO(()) ;
-int      CmiNumSpanTreeChildren  CMK_PROTO((int)) ;
-int      CmiSpanTreeParent       CMK_PROTO((int)) ;
-void     CmiSpanTreeChildren     CMK_PROTO((int node, int *children)) ;
+void     CmiGrabBuffer(void **ppbuf);
+
+#if CMK_SPANTREE_USE_COMMON_CODE
+
+#define W  (CMK_SPANTREE_MAXSPAN)
+#define NN (CmiNumNodes())
+#define CmiNodeSpanTreeParent(n) ((n)?(((n)-1)/W):(-1))
+#define CmiNodeSpanTreeChildren(n,c) {\
+          int _i; \
+          for(_i=0; _i<W; _i++) { \
+            int _x = (n)*W+_i+1; \
+            if(_x<NN) (c)[_i]=_x; \
+          }\
+        }
+#define CmiNumNodeSpanTreeChildren(n) ((((n)+1)*W<NN)? W : \
+          ((((n)*W+1)>=NN)?0:((NN-1)-(n)*W)))
+#define R(p) (CmiRankOf(p))
+#define NF(n) (CmiNodeFirst(n))
+#define SP(n) (CmiNodeSpanTreeParent(n))
+#define ND(p) (CmiNodeOf(p))
+#define NS(p) (CmiNodeSize(ND(p)))
+#define CmiSpanTreeParent(p) ((p)?(R(p)?(NF(ND(p))+R(p)/W):NF(SP(ND(p)))):(-1))
+#define C(p) (((R(p)+1)*W<NS(p))?W:(((R(p)*W+1)>=NS(p))?0:((NS(p)-1)-R(p)*W)))
+#define SC(p) (CmiNumNodeSpanTreeChildren(ND(p)))
+#define CmiNumSpanTreeChildren(p) (R(p)?C(p):(SC(p)+C(p)))
+#define CmiSpanTreeChildren(p,c) {\
+          int _i,_c=0; \
+          if(R(p)==0) { \
+            for(_i=0;_i<W;_i++) { \
+              int _x = ND(p)*W+_i+1; \
+              if(_x<NN) (c)[_c++]=NF(_x); \
+            }\
+          } \
+          for(_i=0;_i<W;_i++) { \
+            int _x = R(p)*W+_i+1; \
+            if(_x<NS(p)) (c)[_c++]=NF(ND(p))+_x; \
+          }\
+        }
+#endif
 
-/******** Node level Trees *********************/
-int      CmiNodeSpanTreeRoot         CMK_PROTO(()) ;
-int      CmiNumNodeSpanTreeChildren  CMK_PROTO((int)) ;
-int      CmiNodeSpanTreeParent       CMK_PROTO((int)) ;
-void     CmiNodeSpanTreeChildren     CMK_PROTO((int node, int *children)) ;
+#if CMK_SPANTREE_USE_SPECIAL_CODE
+int      CmiSpanTreeNumChildren(int) ;
+int      CmiSpanTreeParent(int) ;
+void     CmiSpanTreeChildren(int node, int *children);
+int      CmiNodeSpanTreeNumChildren(int);
+int      CmiNodeSpanTreeParent(int) ;
+void     CmiNodeSpanTreeChildren(int node, int *children) ;
+#endif
 
 /****** MULTICAST GROUPS ******/
 
@@ -538,43 +566,29 @@ void     CmiLookupGroup(CmiGroup grp, int *npes, int **pes);
 
 /****** CMI MESSAGE TRANSMISSION ******/
 
-void          CmiSyncSendFn             CMK_PROTO((int, int, char *));
-CmiCommHandle CmiAsyncSendFn            CMK_PROTO((int, int, char *));
-void          CmiFreeSendFn             CMK_PROTO((int, int, char *));
-
-void          CmiSyncBroadcastFn        CMK_PROTO((int, char *));
-CmiCommHandle CmiAsyncBroadcastFn       CMK_PROTO((int, char *));
-void          CmiFreeBroadcastFn        CMK_PROTO((int, char *));
-
-void          CmiSyncBroadcastAllFn     CMK_PROTO((int, char *));
-CmiCommHandle CmiAsyncBroadcastAllFn    CMK_PROTO((int, char *));
-void          CmiFreeBroadcastAllFn     CMK_PROTO((int, char *));
+void          CmiSyncSendFn(int, int, char *);
+CmiCommHandle CmiAsyncSendFn(int, int, char *);
+void          CmiFreeSendFn(int, int, char *);
 
-void          CmiSyncListSendFn         CMK_PROTO((int, int *, int, char*));
-CmiCommHandle CmiAsyncListSendFn        CMK_PROTO((int, int *, int, char*));
-void          CmiFreeListSendFn         CMK_PROTO((int, int *, int, char*));
+void          CmiSyncBroadcastFn(int, char *);
+CmiCommHandle CmiAsyncBroadcastFn(int, char *);
+void          CmiFreeBroadcastFn(int, char *);
 
-void          CmiSyncMulticastFn        CMK_PROTO((CmiGroup, int, char*));
-CmiCommHandle CmiAsyncMulticastFn       CMK_PROTO((CmiGroup, int, char*));
-void          CmiFreeMulticastFn        CMK_PROTO((CmiGroup, int, char*));
+void          CmiSyncBroadcastAllFn(int, char *);
+CmiCommHandle CmiAsyncBroadcastAllFn(int, char *);
+void          CmiFreeBroadcastAllFn(int, char *);
 
-void          CmiSyncVectorSend         CMK_PROTO((int, int, int *, char **));
-CmiCommHandle CmiAsyncVectorSend        CMK_PROTO((int, int, int *, char **));
-void          CmiSyncVectorSendAndFree  CMK_PROTO((int, int, int *, char **));
+void          CmiSyncListSendFn(int, int *, int, char*);
+CmiCommHandle CmiAsyncListSendFn(int, int *, int, char*);
+void          CmiFreeListSendFn(int, int *, int, char*);
 
-#if CMK_NODE_QUEUE_AVAILABLE
-void          CmiSyncNodeSendFn             CMK_PROTO((int, int, char *));
-CmiCommHandle CmiAsyncNodeSendFn            CMK_PROTO((int, int, char *));
-void          CmiFreeNodeSendFn             CMK_PROTO((int, int, char *));
-
-void          CmiSyncNodeBroadcastFn        CMK_PROTO((int, char *));
-CmiCommHandle CmiAsyncNodeBroadcastFn       CMK_PROTO((int, char *));
-void          CmiFreeNodeBroadcastFn        CMK_PROTO((int, char *));
+void          CmiSyncMulticastFn(CmiGroup, int, char*);
+CmiCommHandle CmiAsyncMulticastFn(CmiGroup, int, char*);
+void          CmiFreeMulticastFn(CmiGroup, int, char*);
 
-void          CmiSyncNodeBroadcastAllFn     CMK_PROTO((int, char *));
-CmiCommHandle CmiAsyncNodeBroadcastAllFn    CMK_PROTO((int, char *));
-void          CmiFreeNodeBroadcastAllFn     CMK_PROTO((int, char *));
-#endif
+void          CmiSyncVectorSend(int, int, int *, char **);
+CmiCommHandle CmiAsyncVectorSend(int, int, int *, char **);
+void          CmiSyncVectorSendAndFree(int, int, int *, char **);
 
 #define CmiSyncSend(p,s,m)              (CmiSyncSendFn((p),(s),(char *)(m)))
 #define CmiAsyncSend(p,s,m)             (CmiAsyncSendFn((p),(s),(char *)(m)))
@@ -588,6 +602,28 @@ void          CmiFreeNodeBroadcastAllFn     CMK_PROTO((int, char *));
 #define CmiAsyncBroadcastAll(s,m)       (CmiAsyncBroadcastAllFn((s),(char *)(m)))
 #define CmiSyncBroadcastAllAndFree(s,m) (CmiFreeBroadcastAllFn((s),(char *)(m)))
 
+#define CmiSyncListSend(n,l,s,m)        (CmiSyncListSendFn((n),(l),(s),(char *)(m)))
+#define CmiAsyncListSend(n,l,s,m)       (CmiAsyncListSendFn((n),(l),(s),(char *)(m)))
+#define CmiSyncListSendAndFree(n,l,s,m) (CmiFreeListSendFn((n),(l),(s),(char *)(m)))
+
+#define CmiSyncMulticast(g,s,m)         (CmiSyncMulticastFn((g),(s),(char*)(m)))
+#define CmiAsyncMulticast(g,s,m)        (CmiAsyncMulticastFn((g),(s),(char*)(m)))
+#define CmiSyncMulticastAndFree(g,s,m)  (CmiFreeMulticastFn((g),(s),(char*)(m)))
+
+#if CMK_NODE_QUEUE_AVAILABLE
+void          CmiSyncNodeSendFn(int, int, char *);
+CmiCommHandle CmiAsyncNodeSendFn(int, int, char *);
+void          CmiFreeNodeSendFn(int, int, char *);
+
+void          CmiSyncNodeBroadcastFn(int, char *);
+CmiCommHandle CmiAsyncNodeBroadcastFn(int, char *);
+void          CmiFreeNodeBroadcastFn(int, char *);
+
+void          CmiSyncNodeBroadcastAllFn(int, char *);
+CmiCommHandle CmiAsyncNodeBroadcastAllFn(int, char *);
+void          CmiFreeNodeBroadcastAllFn(int, char *);
+#endif
+
 #if CMK_NODE_QUEUE_AVAILABLE
 #define CmiSyncNodeSend(p,s,m)          (CmiSyncNodeSendFn((p),(s),(char *)(m)))
 #define CmiAsyncNodeSend(p,s,m)             (CmiAsyncNodeSendFn((p),(s),(char *)(m)))
@@ -599,30 +635,36 @@ void          CmiFreeNodeBroadcastAllFn     CMK_PROTO((int, char *));
 #define CmiAsyncNodeBroadcastAll(s,m)       (CmiAsyncNodeBroadcastAllFn((s),(char *)(m)))
 #define CmiSyncNodeBroadcastAllAndFree(s,m) (CmiFreeNodeBroadcastAllFn((s),(char *)(m)))
 #else
-#define CmiSyncNodeSend                CmiSyncSend
-#define CmiAsyncNodeSend               CmiAsyncSend
-#define CmiSyncNodeSendAndFree         CmiSyncNodeSendAndFree
-#define CmiSyncNodeBroadcast           CmiSyncNodeBroadcast
-#define CmiAsyncNodeBroadcast          CmiAsyncNodeBroadcast
-#define CmiSyncNodeBroadcastAndFree    CmiSyncNodeBroadcastAndFree
-#define CmiSyncNodeBroadcastAll        CmiSyncNodeBroadcastAll
-#define CmiAsyncNodeBroadcastAll       CmiAsyncNodeBroadcastAll
-#define CmiSyncNodeBroadcastAllAndFree CmiSyncNodeBroadcastAllAndFree
+#define CmiSyncNodeSend(n,s,m)        CmiSyncSend(CmiNodeFirst(n),s,m)
+#define CmiAsyncNodeSend(n,s,m)       CmiAsyncSend(CmiNodeFirst(n),s,m)
+#define CmiSyncNodeSendAndFree(n,s,m) CmiSyncSendAndFree(CmiNodeFirst(n),s,m)
+#define CmiSyncNodeBroadcast(s,m)           { \
+          int _i; \
+          for(_i=0; _i<CmiNumNodes(); _i++) \
+            if(_i != CmiMyNode()) \
+              CmiSyncSend(CmiNodeFirst(_i),s,m); \
+        }
+#define CmiAsyncNodeBroadcast(s,m)          CmiSyncNodeBroadcast(s,m)
+#define CmiSyncNodeBroadcastAndFree(s,m)    { \
+          CmiSyncNodeBroadcast(s,m); \
+          CmiFree(m); \
+        }
+#define CmiSyncNodeBroadcastAll(s,m)           { \
+          int _i; \
+          for(_i=0; _i<CmiNumNodes(); _i++) \
+            CmiSyncSend(CmiNodeFirst(_i),s,m); \
+        }
+#define CmiAsyncNodeBroadcastAll(s,m)       CmiSyncNodeBroadcastAll(s,m)
+#define CmiSyncNodeBroadcastAllAndFree(s,m) { \
+          CmiSyncNodeBroadcastAll(s,m); \
+          CmiFree(m); \
+        }
 #endif
 
-#define CmiSyncListSend(n,l,s,m)        (CmiSyncListSendFn((n),(l),(s),(char *)(m)))
-#define CmiAsyncListSend(n,l,s,m)       (CmiAsyncListSendFn((n),(l),(s),(char *)(m)))
-#define CmiSyncListSendAndFree(n,l,s,m) (CmiFreeListSendFn((n),(l),(s),(char *)(m)))
-
-#define CmiSyncMulticast(g,s,m)         (CmiSyncMulticastFn((g),(s),(char*)(m)))
-#define CmiAsyncMulticast(g,s,m)        (CmiAsyncMulticastFn((g),(s),(char*)(m)))
-#define CmiSyncMulticastAndFree(g,s,m)  (CmiFreeMulticastFn((g),(s),(char*)(m)))
-
-
 /******** CMI MESSAGE RECEPTION ********/
 
-int    CmiDeliverMsgs          CMK_PROTO((int maxmsgs));
-void   CmiDeliverSpecificMsg   CMK_PROTO((int handler));
+int    CmiDeliverMsgs(int maxmsgs);
+void   CmiDeliverSpecificMsg(int handler);
 
 /******** CQS: THE QUEUEING SYSTEM ********/
 
@@ -640,26 +682,26 @@ typedef struct CthThreadStruct *CthThread;
 typedef void        (*CthVoidFn)();
 typedef CthThread   (*CthThFn)();
 
-int        CthImplemented  CMK_PROTO((void));
+int        CthImplemented(void);
 
-CthThread  CthSelf     CMK_PROTO((void));
-CthThread  CthCreate   CMK_PROTO((CthVoidFn, void *, int));
-void       CthResume   CMK_PROTO((CthThread));
-void       CthFree     CMK_PROTO((CthThread));
+CthThread  CthSelf(void);
+CthThread  CthCreate(CthVoidFn, void *, int);
+void       CthResume(CthThread);
+void       CthFree(CthThread);
 
-void       CthSuspend             CMK_PROTO((void));
-void       CthAwaken              CMK_PROTO((CthThread));
-void       CthSetStrategy         CMK_PROTO((CthThread, CthVoidFn, CthThFn));
-void       CthSetStrategyDefault  CMK_PROTO((CthThread));
-void       CthYield               CMK_PROTO((void));
+void       CthSuspend(void);
+void       CthAwaken(CthThread);
+void       CthSetStrategy(CthThread, CthVoidFn, CthThFn);
+void       CthSetStrategyDefault(CthThread);
+void       CthYield(void);
 
-void       CthSetNext CMK_PROTO((CthThread t, CthThread next));
-CthThread  CthGetNext CMK_PROTO((CthThread t));
+void       CthSetNext(CthThread t, CthThread next);
+CthThread  CthGetNext(CthThread t);
 
-void       CthAutoYield           CMK_PROTO((CthThread t, int flag));
-double     CthAutoYieldFreq       CMK_PROTO((CthThread t));
-void       CthAutoYieldBlock      CMK_PROTO((void));
-void       CthAutoYieldUnblock    CMK_PROTO((void));
+void       CthAutoYield(CthThread t, int flag);
+double     CthAutoYieldFreq(CthThread t);
+void       CthAutoYieldBlock(void);
+void       CthAutoYieldUnblock(void);
 
 /****** CTH: THREAD-PRIVATE VARIABLES ******/
 
@@ -682,7 +724,7 @@ void       CthAutoYieldUnblock    CMK_PROTO((void));
 #endif
 
 CthCpvExtern(char *,CthData);
-extern int CthRegister CMK_PROTO((int));
+extern int CthRegister(int);
 #define CtvDeclare(t,v)         typedef t CtvType##v; CsvDeclare(int,CtvOffs##v);
 #define CtvStaticDeclare(t,v)   typedef t CtvType##v; CsvStaticDeclare(int,CtvOffs##v);
 #define CtvExtern(t,v)          typedef t CtvType##v; CsvExtern(int,CtvOffs##v);
@@ -701,7 +743,7 @@ extern int CthRegister CMK_PROTO((int));
 
 typedef struct CpmDestinationStruct *CpmDestination;
 
-typedef void *(*CpmSender) CMK_PROTO((CpmDestination, int, void *));
+typedef void *(*CpmSender)(CpmDestination, int, void *);
 
 struct CpmDestinationStruct
 {
@@ -713,16 +755,16 @@ struct CpmDestinationStruct
 #define CpmALL (-1)
 #define CpmOTHERS (-2)
 
-CpmDestination CpmSend CMK_PROTO((int pe));
-CpmDestination CpmMakeThread CMK_PROTO((int pe));
-CpmDestination CpmMakeThreadSize CMK_PROTO((int pe, int size));
-CpmDestination CpmEnqueueFIFO CMK_PROTO((int pe));
-CpmDestination CpmEnqueueLIFO CMK_PROTO((int pe));
-CpmDestination CpmEnqueueIFIFO CMK_PROTO((int pe, int prio));
-CpmDestination CpmEnqueueILIFO CMK_PROTO((int pe, int prio));
-CpmDestination CpmEnqueueBFIFO CMK_PROTO((int pe, int priobits, int *prioptr));
-CpmDestination CpmEnqueueBLIFO CMK_PROTO((int pe, int priobits, int *prioptr));
-CpmDestination CpmEnqueue CMK_PROTO((int pe,int qs,int priobits,int *prioptr));
+CpmDestination CpmSend(int pe);
+CpmDestination CpmMakeThread(int pe);
+CpmDestination CpmMakeThreadSize(int pe, int size);
+CpmDestination CpmEnqueueFIFO(int pe);
+CpmDestination CpmEnqueueLIFO(int pe);
+CpmDestination CpmEnqueueIFIFO(int pe, int prio);
+CpmDestination CpmEnqueueILIFO(int pe, int prio);
+CpmDestination CpmEnqueueBFIFO(int pe, int priobits, int *prioptr);
+CpmDestination CpmEnqueueBLIFO(int pe, int priobits, int *prioptr);
+CpmDestination CpmEnqueue(int pe,int qs,int priobits,int *prioptr);
 
 /***********************************************************************
  *
@@ -837,11 +879,11 @@ void CfutureInit();
 typedef void (*CldPackFn)(void *msg);
 
 typedef void (*CldInfoFn)(void *msg, 
-                         CldPackFn *packer,
-                         int *len,
-                         int *queueing,
-                         int *priobits, 
-                         unsigned int **prioptr);
+                          CldPackFn *packer,
+                          int *len,
+                          int *queueing,
+                          int *priobits, 
+                          unsigned int **prioptr);
 
 int CldRegisterInfoFn(CldInfoFn fn);
 int CldRegisterPackFn(CldPackFn fn);
@@ -855,16 +897,16 @@ typedef struct CmmTableStruct *CmmTable;
 #define CmmWildCard (-1)
 
 CmmTable   CmmNew();
-void       CmmFree CMK_PROTO((CmmTable t));
-void       CmmPut CMK_PROTO((CmmTable t, int ntags, int *tags, void *msg));
-void      *CmmFind CMK_PROTO((CmmTable t, int ntags, int *tags, int *returntags, int del));
+void       CmmFree(CmmTable t);
+void       CmmPut(CmmTable t, int ntags, int *tags, void *msg);
+void      *CmmFind(CmmTable t, int ntags, int *tags, int *returntags, int del);
 #define    CmmGet(t,nt,tg,rt)   (CmmFind((t),(nt),(tg),(rt),1))
 #define    CmmProbe(t,nt,tg,rt) (CmmFind((t),(nt),(tg),(rt),0))
 
 /******** ConverseInit and ConverseExit ********/
 
-void ConverseInit CMK_PROTO((int, char**, CmiStartFn, int, int));
-void ConverseExit CMK_PROTO((void));
+void ConverseInit(int, char**, CmiStartFn, int, int);
+void ConverseExit(void);
 
 void CmiAbort(char *);
 
@@ -922,11 +964,11 @@ typedef void (*CcdVoidFn)();
 
 #define CcdPROCESSORIDLE 1
 
-void CcdCallFnAfter CMK_PROTO((CcdVoidFn fnp, void *arg, unsigned int msecs));
-void CcdPeriodicallyCall CMK_PROTO((CcdVoidFn fnp, void *arg));
+void CcdCallFnAfter(CcdVoidFn fnp, void *arg, unsigned int msecs);
+void CcdPeriodicallyCall(CcdVoidFn fnp, void *arg);
 
-void CcdRaiseCondition CMK_PROTO((int condnum));
-void CcdCallOnCondition CMK_PROTO((int condnum, CcdVoidFn fnp, void *arg));
+void CcdRaiseCondition(int condnum);
+void CcdCallOnCondition(int condnum, CcdVoidFn fnp, void *arg);
 
 void CcdCallBacks();
 
@@ -936,9 +978,9 @@ void CcdCallBacks();
 
 CpvExtern(void *, debugQueue);
 
-void CpdInit CMK_PROTO((void));
-void CpdFreeze CMK_PROTO((void));
-void CpdUnFreeze CMK_PROTO((void));
+void CpdInit(void);
+void CpdFreeze(void);
+void CpdUnFreeze(void);
 
 void CpdInitializeObjectTable();
 void CpdInitializeHandlerArray();
@@ -971,7 +1013,7 @@ char* getMsgContentsDebug(int index);
 #endif
 
 #if CMK_WEB_MODE
-void CWebInit CMK_PROTO((void));
+void CWebInit(void);
 #endif
 
 #if CMK_CMIDELIVERS_USE_COMMON_CODE
@@ -982,12 +1024,12 @@ CpvExtern(void*, CmiLocalQueue);
 /******* Converse Client Server *****/
 
 #if CMK_CCS_AVAILABLE
-void CcsUseHandler CMK_PROTO((char *id, int hdlr));
-int CcsRegisterHandler CMK_PROTO((char *id, CmiHandler fn));
-int CcsEnabled CMK_PROTO((void));
-int CcsIsRemoteRequest CMK_PROTO((void));
-void CcsCallerId CMK_PROTO((unsigned int *pip, unsigned int *pport));
-void CcsSendReply CMK_PROTO((unsigned int ip, unsigned int port, int size, void *reply));
+void CcsUseHandler(char *id, int hdlr);
+int CcsRegisterHandler(char *id, CmiHandler fn);
+int CcsEnabled(void);
+int CcsIsRemoteRequest(void);
+void CcsCallerId(unsigned int *pip, unsigned int *pport);
+void CcsSendReply(unsigned int ip, unsigned int port, int size, void *reply);
 #else
 #define CcsInit()
 #define CcsUseHandler(x,y)
index 064aa0a278984fde9feff59b86353aea66031ca7..0e3559b7fbce3140778e71a230e44425eb6bab92 100644 (file)
@@ -243,9 +243,9 @@ Queue q;
   return q->maxlen;
 }
 
-int CqsEmpty(q)
-Queue q;
+int CqsEmpty(void *_q)
 {
+  Queue q = (Queue) _q;;
   return (q->length == 0);
 }
 
index 677c5b9cb6b14ac54efa1935485e1f7aedbdd804..6ffdcb0c30e48466ae62040244986522d8202f51 100644 (file)
@@ -1,261 +1,8 @@
 #include <converse.h>
 
 #if CMK_SPANTREE_USE_COMMON_CODE
-/*************************************
- * This is used if the node level 
- * spanning tree is not available
- **************************************/
-void 
-CmiSpanTreeInit(void) 
-{
-  return;
-}
 
-
-int
-CmiSpanTreeParent(int node)
-{
-  return (node ? ((node-1)/CMK_SPANTREE_MAXSPAN) : (-1));
-}
-
-
-int
-CmiSpanTreeRoot(void) 
-{ 
-  return 0; 
-}
-
-
-void 
-CmiSpanTreeChildren(int node, int *children)
-{
-  int i;
-
-  for (i=1; i<=CMK_SPANTREE_MAXSPAN; i++)
-    if (CMK_SPANTREE_MAXSPAN*node+i < CmiNumPes())
-      children[i-1] = node*CMK_SPANTREE_MAXSPAN+i;
-    else 
-      children[i-1] = (-1);
-}
-
-
-int
-CmiNumSpanTreeChildren(int node)
-{
-    if ((node+1)*CMK_SPANTREE_MAXSPAN < CmiNumPes()) 
-      return CMK_SPANTREE_MAXSPAN;
-    else if (node*CMK_SPANTREE_MAXSPAN+1 >= CmiNumPes()) 
-           return 0;
-         else 
-           return ((CmiNumPes()-1)-node*CMK_SPANTREE_MAXSPAN);
-}
-
-
-void
-CmiSendToSpanTreeLeaves(int size, char *msg)
-{
-  int node;
-
-  for (node=(CmiNumPes()-2)/CMK_SPANTREE_MAXSPAN;node<CmiNumPes();node++)
-    CmiSyncSend(node,size,msg);
-}
-
-
-void
-PrintSpanTree(void)
-{
-  int i,j;
-  int children[CMK_SPANTREE_MAXSPAN];
-  for (i=0; i<CmiNumPes(); i++) {
-    CmiPrintf("node: %d, parent: %d, numchildren: %d, children: ",
-      i, CmiSpanTreeParent(i), CmiNumSpanTreeChildren(i));
-    CmiSpanTreeChildren(i, children);
-    for (j=0; j<CmiNumSpanTreeChildren(i); j++)
-      CmiPrintf("%d ", children[j]);
-    CmiPrintf("\n");
-  }
-}
-
-#endif
-
-
-#if CMK_NODELEVEL_SPANTREE_AVAILABLE
-
-/******************************
- * Node level spanning tree
- *****************************/
-
-void 
-CmiNodeSpanTreeInit(void) 
-{
-  return;
-}
-
-
-int
-CmiNodeSpanTreeParent(int node)
-{
-  return (node ? ((node-1)/CMK_SPANTREE_MAXSPAN) : (-1));
-}
-
-
-int
-CmiNodeSpanTreeRoot(void) 
-{ 
-  return 0; 
-}
-
-
-void 
-CmiNodeSpanTreeChildren(int node, int *children)
-{
-  int i;
-
-  for (i=1; i<=CMK_SPANTREE_MAXSPAN; i++)
-    if (CMK_SPANTREE_MAXSPAN*node+i < CmiNumNodes())
-      children[i-1] = node*CMK_SPANTREE_MAXSPAN+i;
-    else 
-      children[i-1] = (-1);
-}
-
-
-int
-CmiNumNodeSpanTreeChildren(int node)
-{
-    if ((node+1)*CMK_SPANTREE_MAXSPAN < CmiNumNodes()) 
-      return CMK_SPANTREE_MAXSPAN;
-    else if (node*CMK_SPANTREE_MAXSPAN+1 >= CmiNumNodes()) 
-           return 0;
-         else 
-           return ((CmiNumNodes()-1)-node*CMK_SPANTREE_MAXSPAN);
-}
-
-
-void
-CmiSendToNodeSpanTreeLeaves(int size, char *msg)
-{
-  int node;
-
-  for (node=(CmiNumNodes()-2)/CMK_SPANTREE_MAXSPAN;node<CmiNumNodes();node++)
-    CmiSyncSend(node,size,msg);
-}
-
-
-void
-PrintNodeSpanTree(void)
-{
-  int i,j;
-  int children[CMK_SPANTREE_MAXSPAN];
-  for (i=0; i<CmiNumNodes(); i++) {
-    CmiPrintf("node: %d, parent: %d, numchildren: %d, children: ",
-      i, CmiNodeSpanTreeParent(i), CmiNumSpanTreeChildren(i));
-    CmiNodeSpanTreeChildren(i, children);
-    for (j=0; j<CmiNumNodeSpanTreeChildren(i); j++)
-      CmiPrintf("%d ", children[j]);
-    CmiPrintf("\n");
-  }
-}
-
-/***********************************************
- * Processor level spanning tree based on the 
- * node-level tree
- ***********************************************/
-void 
-CmiSpanTreeInit(void) 
-{
-  return;
-}
-
-
-int
-CmiSpanTreeParent(int pe)
-{
-  int node=CmiNodeOf(pe);
-  int peparent=((CmiNodeSpanTreeParent(node)==-1) ? -1 : CmiNodeFirst(CmiNodeSpanTreeParent(node))); 
-  return(CmiRankOf(pe) ? CmiNodeFirst(node) : peparent);
-}
-
-
-int
-CmiSpanTreeRoot(void) 
-{ 
-  return 0; 
-}
-
-/***********************************************
- * Notice that the size of the array children, varies
- * depending on the node size. The user should scan the
- * array untl he encounters a -1
- **********************************************/
-void 
-CmiSpanTreeChildren(int pe, int *children)
-{
-  int i, j;
-  int node=CmiNodeOf(pe);
-  for (j=1;j<CmiNodeSize(node);j++) {
-    if (CmiRankOf(pe)) {
-       children[i-1]=(-1);
-       continue;
-    }
-    else {
-       children[j-1]=pe+1;
-    }
-  }
-
-  for (i=j-1; i<=CMK_SPANTREE_MAXSPAN; i++) {
-    if (CmiRankOf(pe)) {
-       children[i-1]=(-1);
-       continue;
-    }
-    if (CMK_SPANTREE_MAXSPAN*node+i < CmiNumNodes())
-      children[i-1] = node*CMK_SPANTREE_MAXSPAN+i;
-    else 
-      children[i-1] = (-1);
-  }
-}
-
-
-int
-CmiNumSpanTreeChildren(int pe)
-{
-    int node=CmiNodeOf(pe);
-    if (CmiRankOf(pe)) return 0;
-
-/* Code duplication - eliminates a function call */
-
-    if ((node+1)*CMK_SPANTREE_MAXSPAN < CmiNumNodes()) 
-      return(CmiNodeSize(node)-1+CMK_SPANTREE_MAXSPAN);
-    else if (node*CMK_SPANTREE_MAXSPAN+1 >= CmiNumNodes()) 
-           return(CmiNodeSize(node)-1+0);
-         else 
-           return ((CmiNumNodes()-1)-node*CMK_SPANTREE_MAXSPAN+CmiNodeSize(node)-1);
-}
-
-
-void
-CmiSendToSpanTreeLeaves(int size, char *msg)
-{
-  int node;
-
-  for (node=(CmiNumPes()-2)/CMK_SPANTREE_MAXSPAN;node<CmiNumPes();node++)
-    CmiSyncSend(node,size,msg);
-}
-
-
-void
-PrintSpanTree(void)
-{
-  int i,j;
-  int children[CMK_SPANTREE_MAXSPAN+4];
-  for (i=0; i<CmiNumPes(); i++) {
-    CmiPrintf("node: %d, parent: %d, numchildren: %d, children: ",
-      i, CmiSpanTreeParent(i), CmiNumSpanTreeChildren(i));
-    CmiSpanTreeChildren(i, children);
-    for (j=0; j<CmiNumSpanTreeChildren(i); j++)
-      CmiPrintf("%d ", children[j]);
-    CmiPrintf("\n");
-  }
-}
+/* Node-level Spanning Tree functions have been made macros in converse.h */
 
 #endif
 
index 54b78f64904dc69c40649672eebd414eb1a41270..9b63a78f7486db423e1f8a75d69ec4571b848a6b 100644 (file)
@@ -159,7 +159,7 @@ void CldModuleInit()
   pinf->load_count = 0;
   pinf->spantree_children = CmiNumSpanTreeChildren(CmiMyPe());
   pinf->spantree_parent = CmiSpanTreeParent(CmiMyPe());
-  pinf->spantree_root = CmiSpanTreeRoot();
+  pinf->spantree_root = 0;
   pinf->rebalance = 0;
   CldModuleGeneralInit();
   CldInitiateReduction();
index 045b1ec0565755ee8fa063191f974770882457c8..a86a58afd68e2c90a42a0ea4a7bdadbf85c85fb4 100644 (file)
@@ -1,11 +1,9 @@
 
 #define CsmWildCard CmmWildCard
 
-void CsmTVSend
-  CMK_PROTO((int pe, int ntags, int *tags, void *buf, int buflen));
+void CsmTVSend(int pe, int ntags, int *tags, void *buf, int buflen);
 
-void CsmTVRecv
-  CMK_PROTO((int ntags, int *tags, void *buf, int buflen, int *rtags));
+void CsmTVRecv (int ntags, int *tags, void *buf, int buflen, int *rtags);
 
 #define CsmTSend(pe, tag, buf, buflen)\
   { int CsmTag=(tag); CsmTVSend(pe, 1, &CsmTag, buf, buflen); }
index dd9b3a6a1a5f919d68aab2c1cedffb6812ee1782..aa479beff355ef221dc866c52917926325ede31f 100644 (file)
@@ -1,8 +1,8 @@
 #define SMWildCard CmmWildCard
 
-void send CMK_PROTO((int pe, int ntags, int *tags, void *buf, int buflen));
+void send(int pe, int ntags, int *tags, void *buf, int buflen);
 
-void recv CMK_PROTO((int ntags, int *tags, void *buf, int buflen, int *rtags));
+void recv(int ntags, int *tags, void *buf, int buflen, int *rtags);
 
 #define send1(pe, tag, buf, buflen)\
   { int CsmTag=(tag); send(pe, 1, &CsmTag, buf, buflen); }