*** empty log message ***
authorJosh Yelon <jyelon@uiuc.edu>
Mon, 28 Jul 1997 19:00:39 +0000 (19:00 +0000)
committerJosh Yelon <jyelon@uiuc.edu>
Mon, 28 Jul 1997 19:00:39 +0000 (19:00 +0000)
37 files changed:
src/arch/cm5/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-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-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/origin2000/conv-mach.h
src/arch/paragon-osf/conv-mach.h
src/arch/paragon-sunmos/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-rs6k/conv-mach.h
src/arch/sim-sol/conv-mach.h
src/arch/sim-sun/conv-mach.h
src/arch/sp1/conv-mach.h
src/arch/sp3/conv-mach.h
src/arch/t3d/conv-mach.h
src/arch/t3e/conv-mach.h
src/arch/tcp-hp/conv-mach.h
src/arch/tcp-sol/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-rs6k/conv-mach.h
src/arch/uth-sol-cc/conv-mach.h
src/arch/uth-sol/conv-mach.h
src/arch/uth-sun/conv-mach.h
src/conv-core/converse.h

index 0cbf197da81a5b79d217b647f9ca587ce390df92..9d742e6035f5a3a620ecb31014eaba28d5ed622c 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.33  1997-07-26 16:41:43  jyelon
+ * Revision 2.34  1997-07-28 19:00:46  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.33  1997/07/26 16:41:43  jyelon
  * *** empty log message ***
  *
  * Revision 2.32  1997/05/05 13:52:12  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 305050bcb39e2405730ac63a4d9e68b3a3d22d3d..b656704a43aa2f0534dfebf9deeb0e06f3790c13 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.32  1997-07-26 16:41:44  jyelon
+ * Revision 2.33  1997-07-28 19:00:48  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.32  1997/07/26 16:41:44  jyelon
  * *** empty log message ***
  *
  * Revision 2.31  1997/05/05 13:52:17  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               1
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 29a410d428020bb293103702f02e46b94d0275f9..4ee23a3724008f7c72a633c6273dbfbcf7851448 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.32  1997-07-26 16:41:46  jyelon
+ * Revision 2.33  1997-07-28 19:00:50  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.32  1997/07/26 16:41:46  jyelon
  * *** empty log message ***
  *
  * Revision 2.31  1997/05/05 13:52:25  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 486c44ca254c20559aa0c29328364b53e342b5a8..8d3c65e4b2e816d7be7225b588b649effdc81f14 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.33  1997-07-26 16:41:55  jyelon
+ * Revision 1.34  1997-07-28 19:01:00  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.33  1997/07/26 16:41:55  jyelon
  * *** empty log message ***
  *
  * Revision 1.32  1997/05/05 13:53:08  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index 917c2d6693c6f4c72a0e238001b2ac49ed4c7e93..0bcc33f9fe90914692254b49b3d1d31914b4934f 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.22  1997-07-26 16:41:50  jyelon
+ * Revision 1.23  1997-07-28 19:00:54  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.22  1997/07/26 16:41:50  jyelon
  * *** empty log message ***
  *
  * Revision 1.21  1997/05/05 13:52:41  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index 427031e41d9e750461bc3a9048919a378d9c1eba..82a0b15680d3d8e358948130ba5c2a5bb31f92f5 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.37  1997-07-26 16:41:48  jyelon
+ * Revision 2.38  1997-07-28 19:00:52  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.37  1997/07/26 16:41:48  jyelon
  * *** empty log message ***
  *
  * Revision 2.36  1997/05/05 13:52:31  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index d537e05128b271542a8faca8a410e33e69636b07..7a8550d7c6a6303a6d4709c63971e845eed53459 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.3  1997-07-26 16:41:53  jyelon
+ * Revision 1.4  1997-07-28 19:00:58  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.3  1997/07/26 16:41:53  jyelon
  * *** empty log message ***
  *
  * Revision 1.2  1997/03/25 23:09:09  milind
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index e3c453ce9954fed0dbafbfa13d1b483abc14cf55..8ff868606551c523ce9b23d018b1488d32e2dc6b 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.12  1997-07-26 16:41:52  jyelon
+ * Revision 1.13  1997-07-28 19:00:56  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.12  1997/07/26 16:41:52  jyelon
  * *** empty log message ***
  *
  * Revision 1.11  1997/05/05 13:53:03  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index 8b5db3a9a6e0451b963b1fac9821dc51a1174e1a..10c24f15c35e8b7dd2ec4b30a2b3b2a26e021058 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.13  1997-07-26 16:41:59  jyelon
+ * Revision 1.14  1997-07-28 19:01:04  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.13  1997/07/26 16:41:59  jyelon
  * *** empty log message ***
  *
  * Revision 1.12  1997/05/05 13:53:49  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index f1a270a9d0d6a4ccb685ee3c7848c8f0b04d68bc..bc201d77250562b5981a40b1de527d5fcf79531d 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.9  1997-07-26 16:42:00  jyelon
+ * Revision 1.10  1997-07-28 19:01:05  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.9  1997/07/26 16:42:00  jyelon
  * *** empty log message ***
  *
  * Revision 1.8  1997/05/05 13:54:28  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               1
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index 187e6038a1c7b4793fb3efa1be0082e50d9e3c51..c109c57c3374042929630beacaf929299b9e9727 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.38  1997-07-26 16:41:56  jyelon
+ * Revision 2.39  1997-07-28 19:01:02  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.38  1997/07/26 16:41:56  jyelon
  * *** empty log message ***
  *
  * Revision 2.37  1997/05/05 13:53:43  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index e89c132d26fef797b07b56939e8d8473e7665a14..ebf393e4f7caa5739847304dea3a2f2019b59209 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.36  1997-07-26 16:42:02  jyelon
+ * 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
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                         16
 #define CMK_MSG_HEADER_BLANK_SPACE                        12
 
index 589ec097c3f9b8cee7b2496538a532e328311fb2..2f51c9ab1a4b35cd36e66739adca3d9c3d5a48f8 100644 (file)
@@ -880,9 +880,9 @@ static OutgoingMsg   Cmi_freelist_outgoing;
 
 
 int               Cmi_numpes;    /* Total number of processors */
-int               Cmi_nodesize;  /* Number of processors in my address space */
+int               Cmi_mynodesize;/* Number of processors in my address space */
+static int        Cmi_mynode;    /* Which address space am I */
 static int        Cmi_numnodes;  /* Total number of address spaces */
-static int        Cmi_nodenum;   /* Which address space am I */
 static int        Cmi_nodestart; /* First processor in this address space */
 static CmiStartFn Cmi_startfn;   /* The start function */
 static int        Cmi_usrsched;  /* Continue after start function finishes? */
@@ -930,8 +930,8 @@ static void parse_netstart()
   ns = getenv("NETSTART");
   if (ns==0) goto abort;
   nread = sscanf(ns, "%d%d%d%d%d%d%d%d",
-                &Cmi_numnodes, &Cmi_nodenum,
-                &Cmi_nodestart, &Cmi_nodesize, &Cmi_numpes,
+                &Cmi_numnodes, &Cmi_mynode,
+                &Cmi_nodestart, &Cmi_mynodesize, &Cmi_numpes,
                 &Cmi_self_IP, &Cmi_host_IP, &Cmi_host_port, &Cmi_host_pid);
   if (nread!=8) goto abort;
   sprintf(Cmi_self_IP_str,"%d.%d.%d.%d",
@@ -1001,7 +1001,7 @@ static void log_init()
 static void log_done()
 {
   char logname[100]; FILE *f; int i, size;
-  sprintf(logname, "log.%d", Cmi_nodenum);
+  sprintf(logname, "log.%d", Cmi_mynode);
   f = fopen(logname, "w");
   if (f==0) { perror("fopen"); exit(1); }
   if (log_wrap) size = 50000; else size=log_pos;
@@ -1042,23 +1042,6 @@ static CmiMutex   Cmi_scanf_mutex;
 static char      *Cmi_scanf_data;
 static double     Cmi_clock;
 
-/******************************************************************************
- *
- * Node Numbers
- *
- *****************************************************************************/
-
-#if CMK_MEMORY_CLUSTERED
-
-int CmiMyNode()            { return Cmi_nodenum; }
-int CmiNumNodes()          { return Cmi_numnodes; }
-int CmiNodeFirst(int node) { return nodes[pe].nodestart; }
-int CmiNodeSize(int node)  { return nodes[pe].nodesize; }
-int CmiNodeOf(int pe)      { return (nodes_by_pe[pe] - nodes); }
-int CmiRankOf(int pe)      { return pe - (nodes_by_pe[pe].nodestart); }
-
-#endif
-
 /****************************************************************************
  *                                                                          
  * CheckSocketsReady
@@ -1190,6 +1173,11 @@ int CmiMyRank()
   return result->rank;
 }
 
+int CmiNodeFirst(int node) { return nodes[pe].nodestart; }
+int CmiNodeSize(int node)  { return nodes[pe].nodesize; }
+int CmiNodeOf(int pe)      { return (nodes_by_pe[pe] - nodes); }
+int CmiRankOf(int pe)      { return pe - (nodes_by_pe[pe].nodestart); }
+
 #define CmiGetStateN(n) (Cmi_state_vector+(n))
 
 static mutex_t comm_mutex;
@@ -1230,10 +1218,10 @@ static void CmiStartThreads()
   
   thr_keycreate(&Cmi_state_key, 0);
   Cmi_state_vector =
-    (CmiState)calloc(Cmi_nodesize, sizeof(struct CmiStateStruct));
-  for (i=0; i<Cmi_nodesize; i++)
+    (CmiState)calloc(Cmi_mynodesize, sizeof(struct CmiStateStruct));
+  for (i=0; i<Cmi_mynodesize; i++)
     CmiStateInit(i+Cmi_nodestart, i, CmiGetStateN(i));
-  for (i=1; i<Cmi_nodesize; i++) {
+  for (i=1; i<Cmi_mynodesize; i++) {
     ok = thr_create(0, 256000, call_startfn, (void *)i,
                    THR_DETACHED|THR_BOUND, &pid);
     if (ok<0) { perror("thr_create"); exit(1); }
@@ -1273,7 +1261,7 @@ static void CmiStartThreads()
 {
   struct itimerval i;
   
-  if ((Cmi_numpes != Cmi_numnodes) || (Cmi_nodesize != 1))
+  if ((Cmi_numpes != Cmi_numnodes) || (Cmi_mynodesize != 1))
     KillEveryone
       ("Multiple cpus unavailable, don't use cpus directive in nodesfile.\n");
   
@@ -1481,8 +1469,8 @@ static void ctrl_getone()
 static void node_addresses_obtain()
 {
   ctrl_sendone(120, "aset addr %d %s.%d.%d.%d.%d\n",
-              Cmi_nodenum, Cmi_self_IP_str, ctrlport, dataport,
-              Cmi_nodestart, Cmi_nodesize);
+              Cmi_mynode, Cmi_self_IP_str, ctrlport, dataport,
+              Cmi_nodestart, Cmi_mynodesize);
   ctrl_sendone(120, "aget %s %d addr 0 %d\n",
               Cmi_self_IP_str,ctrlport,Cmi_numnodes-1);
   while (nodes == 0) {
@@ -1809,18 +1797,18 @@ void DeliverOutgoingMessage(OutgoingMsg ogm)
   dst = ogm->dst;
   switch (dst) {
   case PE_BROADCAST_ALL:
-    for (rank = 0; rank<Cmi_nodesize; rank++)
+    for (rank = 0; rank<Cmi_mynodesize; rank++)
       PCQueuePush(CmiGetStateN(rank)->recv,CopyMsg(ogm->data,ogm->size));
     for (i=0; i<Cmi_numnodes; i++)
-      if (i!=Cmi_nodenum)
+      if (i!=Cmi_mynode)
        DeliverViaNetwork(ogm, nodes + i, DGRAM_BROADCAST);
     break;
   case PE_BROADCAST_OTHERS:
-    for (rank = 0; rank<Cmi_nodesize; rank++)
+    for (rank = 0; rank<Cmi_mynodesize; rank++)
       if (rank + Cmi_nodestart != ogm->src)
        PCQueuePush(CmiGetStateN(rank)->recv,CopyMsg(ogm->data,ogm->size));
     for (i = 0; i<Cmi_numnodes; i++)
-      if (i!=Cmi_nodenum)
+      if (i!=Cmi_mynode)
        DeliverViaNetwork(ogm, nodes + i, DGRAM_BROADCAST);
     break;
   default:
@@ -1862,7 +1850,7 @@ void AssembleDatagram(OtherNode node, ExplicitDgram dg)
   if (node->asm_fill == node->asm_total) {
     if (node->asm_rank == DGRAM_BROADCAST) {
       int len = node->asm_total;
-      for (i=1; i<Cmi_nodesize; i++)
+      for (i=1; i<Cmi_mynodesize; i++)
        PCQueuePush(CmiGetStateN(i)->recv, CopyMsg(msg, len));
       PCQueuePush(CmiGetStateN(0)->recv, msg);
     } else PCQueuePush(CmiGetStateN(node->asm_rank)->recv, msg);
index 15cb85131452507feb0fb1d29a589eeb13dcfd3f..1117e4439f1f42d1f30fed04a23bbe1382a650c8 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.3  1997-07-26 16:42:03  jyelon
+ * Revision 1.4  1997-07-28 19:01:08  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.3  1997/07/26 16:42:03  jyelon
  * *** empty log message ***
  *
  * Revision 1.2  1997/07/07 22:13:50  milind
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               1
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 714d7ee5f14fba66a5297d1b2e14e2b89a231c75..7346ce33fd465d8523e6b0aa8fdffbddb8005b47 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.19  1997-07-26 16:42:05  jyelon
+ * Revision 1.20  1997-07-28 19:01:10  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.19  1997/07/26 16:42:05  jyelon
  * *** empty log message ***
  *
  * Revision 1.18  1997/05/05 13:55:37  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 661e6a919dc19cbe080005767a7c5107763d36c7..3a8d805683437bfe445ba1c207454518437d857e 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.19  1997-07-26 16:42:06  jyelon
+ * Revision 1.20  1997-07-28 19:01:12  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.19  1997/07/26 16:42:06  jyelon
  * *** empty log message ***
  *
  * Revision 1.18  1997/05/05 13:55:43  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 5daad90b4b3a82ae33645b3a2a7588100a4741c5..f9e19df337b6f5a6213ef7f5929f212c78bf3d19 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.24  1997-07-26 16:42:08  jyelon
+ * Revision 1.25  1997-07-28 19:01:13  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.24  1997/07/26 16:42:08  jyelon
  * *** empty log message ***
  *
  * Revision 1.23  1997/05/05 13:55:49  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 9f6fd68fc84a88c3172bd61520242c829aa84cdc..24dbe1dacd83c08673d39d9e00c142779512eee7 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.3  1997-07-26 16:42:11  jyelon
+ * Revision 1.4  1997-07-28 19:01:16  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.3  1997/07/26 16:42:11  jyelon
  * *** empty log message ***
  *
  * Revision 1.2  1997/03/25 23:09:17  milind
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 84b2d799b79e35f8cd42c45eb0816a57b06aafc0..10fa318699716e93370197210f49e22bf8c125fa 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.3  1997-07-26 16:42:09  jyelon
+ * Revision 1.4  1997-07-28 19:01:15  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.3  1997/07/26 16:42:09  jyelon
  * *** empty log message ***
  *
  * Revision 1.2  1997/03/25 23:09:16  milind
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index b8da794a731e7e672a8b5566032dd59b84622e9d..ab1836e0add80c7f5a32b58f17df5e8de6bb0e22 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.23  1997-07-26 16:42:12  jyelon
+ * Revision 1.24  1997-07-28 19:01:18  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.23  1997/07/26 16:42:12  jyelon
  * *** empty log message ***
  *
  * Revision 1.22  1997/05/05 13:55:55  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 325f9f07564afeb8fb8fc1b4c703b944a8f7f60a..c039f537025b1fe7e008f138ffe77b370aa02294 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.23  1997-07-26 16:42:14  jyelon
+ * Revision 1.24  1997-07-28 19:01:19  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.23  1997/07/26 16:42:14  jyelon
  * *** empty log message ***
  *
  * Revision 1.22  1997/05/05 13:56:00  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 1315d40c7ef1453b687de9eb22a1802a1948898c..9c1b814ff3d282d60330e0b868e745c7dd60e52a 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.22  1997-07-26 16:42:15  jyelon
+ * Revision 1.23  1997-07-28 19:01:21  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.22  1997/07/26 16:42:15  jyelon
  * *** empty log message ***
  *
  * Revision 1.21  1997/05/05 13:56:05  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index f70d60e8119544dc22b308d32350fd3b6e32fa40..d4872eb7cd459c1563928417c2740e16edb9d8d3 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.31  1997-07-26 16:42:17  jyelon
+ * Revision 2.32  1997-07-28 19:01:24  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.31  1997/07/26 16:42:17  jyelon
  * *** empty log message ***
  *
  * Revision 2.30  1997/05/05 13:56:10  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 547f782e05560ff144a77a924e980cbf95e5a9cf..ce7aa5710653cd2858dcadd383755aeab1911bba 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.2  1997-07-26 16:42:18  jyelon
+ * Revision 1.3  1997-07-28 19:01:26  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.2  1997/07/26 16:42:18  jyelon
  * *** empty log message ***
  *
  * Revision 1.1  1997/07/08 22:10:55  milind
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 344af6e83cfbe8cde450cd7a248a0c719778c296..f1d099384296f18a2e68de89c61f2c6f7fcca42c 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.20  1997-07-26 16:42:20  jyelon
+ * Revision 1.21  1997-07-28 19:01:27  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.20  1997/07/26 16:42:20  jyelon
  * *** empty log message ***
  *
  * Revision 1.19  1997/05/05 13:56:14  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          8
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 4f27422ff8f436230294302175148482d19e7b8f..d1e5fb74595db9c07669843bbdac6668fc652013 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.2  1997-07-26 16:42:21  jyelon
+ * Revision 1.3  1997-07-28 19:01:29  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.2  1997/07/26 16:42:21  jyelon
  * *** empty log message ***
  *
  * Revision 1.1  1997/07/07 22:57:18  rbrunner
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          40
 #define CMK_MSG_HEADER_BLANK_SPACE                         32
 
index 009f9644c4090a02c36708fb6c9a5dc68e0e009c..6296a6c2c09c93b989414d4e4faa50b7194936e9 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.38  1997-07-26 16:42:23  jyelon
+ * Revision 2.39  1997-07-28 19:01:31  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.38  1997/07/26 16:42:23  jyelon
  * *** empty log message ***
  *
  * Revision 2.37  1997/05/05 13:56:33  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          8
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 340e001e14d846b3f77aa1f911993b685b821ae0..6b69129b8f75d33a6492e0db18938c2d7d691a64 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 2.37  1997-07-26 16:42:25  jyelon
+ * Revision 2.38  1997-07-28 19:01:32  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.37  1997/07/26 16:42:25  jyelon
  * *** empty log message ***
  *
  * Revision 2.36  1997/05/05 13:56:44  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             1
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  0
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          8
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index ba81bb4f2ae601ce1d68393767d5ef45045c9143..cf97180a78317cad633c685696341b6543617a22 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.13  1997-07-26 16:42:28  jyelon
+ * Revision 1.14  1997-07-28 19:01:36  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.13  1997/07/26 16:42:28  jyelon
  * *** empty log message ***
  *
  * Revision 1.12  1997/05/05 13:57:00  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          1
 #define CMK_MALLOC_USE_OS_BUILTIN                          0
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index ccffe9c5beb3d9d3ac8cab3c167404507d81e1d3..b620ec00cd74843fc554638d099c0117ab638c97 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.26  1997-07-26 16:42:26  jyelon
+ * Revision 1.27  1997-07-28 19:01:34  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.26  1997/07/26 16:42:26  jyelon
  * *** empty log message ***
  *
  * Revision 1.25  1997/05/05 13:56:52  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 76a4723dd9c46faded1e80c449349eee03d6a84f..a4ebf882ca287e89e1fb494d68475f2337ac0ca1 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.2  1997-07-26 16:42:32  jyelon
+ * Revision 1.3  1997-07-28 19:01:39  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.2  1997/07/26 16:42:32  jyelon
  * *** empty log message ***
  *
  * Revision 1.1  1997/03/25 23:09:29  milind
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index a963bc8462df068cd712a96973ddc37e325c22e6..bd9d25ff7d9a634f3fe89daa2e7222e9dad34a00 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.7  1997-07-26 16:42:30  jyelon
+ * Revision 1.8  1997-07-28 19:01:37  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.7  1997/07/26 16:42:30  jyelon
  * *** empty log message ***
  *
  * Revision 1.6  1997/05/05 13:57:04  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index e45a1ddd51b4712adc58a2103b7d23b67cc3fb66..a7bcb91a6a2db2416e7cde12e189ddca53a1ec21 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.28  1997-07-26 16:42:33  jyelon
+ * Revision 1.29  1997-07-28 19:01:40  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.28  1997/07/26 16:42:33  jyelon
  * *** empty log message ***
  *
  * Revision 1.27  1997/05/05 13:57:08  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index a801942193db8c3386789dc731f225c247d9f9d9..9c5f62c4e0e322e717d5fe184c697cf4d2c41b5a 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.13  1997-07-26 16:42:37  jyelon
+ * Revision 1.14  1997-07-28 19:01:43  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.13  1997/07/26 16:42:37  jyelon
  * *** empty log message ***
  *
  * Revision 1.12  1997/05/05 13:57:16  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 12ceda40fca94003a1149090ca30d2adb2ec938a..bd7678b0759e1494ee92748f43bdd9f20abacb5d 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.28  1997-07-26 16:42:35  jyelon
+ * Revision 1.29  1997-07-28 19:01:42  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.28  1997/07/26 16:42:35  jyelon
  * *** empty log message ***
  *
  * Revision 1.27  1997/05/05 13:57:12  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 6099641b8ac12b28ab44aad2cc29b901d5ebefc2..895166183cc5f1d579ff9fffa242b978b9f7a980 100644 (file)
@@ -8,7 +8,10 @@
  ***************************************************************************
  *
  * $Log$
- * Revision 1.29  1997-07-26 16:42:38  jyelon
+ * Revision 1.30  1997-07-28 19:01:45  jyelon
+ * *** empty log message ***
+ *
+ * Revision 1.29  1997/07/26 16:42:38  jyelon
  * *** empty log message ***
  *
  * Revision 1.28  1997/05/05 13:57:20  jyelon
 #define CMK_MALLOC_USE_GNU_MALLOC                          0
 #define CMK_MALLOC_USE_OS_BUILTIN                          1
 
-#define CMK_MEMORY_DISTRIBUTED                             0
-#define CMK_MEMORY_CLUSTERED                               0
-#define CMK_MEMORY_SHARED                                  1
-
 #define CMK_MSG_HEADER_SIZE_BYTES                          4
 #define CMK_MSG_HEADER_BLANK_SPACE                         0
 
index 739746ea9a7f33d57ddf63a3abfb8dde0afcfa6d..ce92e56059e60eb11c97604db679677732059afb 100644 (file)
  * REVISION HISTORY:
  *
  * $Log$
- * Revision 2.68  1997-07-26 16:41:16  jyelon
+ * Revision 2.69  1997-07-28 19:00:39  jyelon
+ * *** empty log message ***
+ *
+ * Revision 2.68  1997/07/26 16:41:16  jyelon
  * *** empty log message ***
  *
  * Revision 2.67  1997/07/24 18:32:12  jyelon
@@ -283,14 +286,18 @@ extern "C" {
 #if CMK_SHARED_VARS_UNAVAILABLE
 
 extern int Cmi_mype;
-extern int Cmi_myrank;
 extern int Cmi_numpes;
-extern int Cmi_nodesize;
 
-#define CmiMyPe() Cmi_mype
-#define CmiMyRank() Cmi_myrank
-#define CmiNumPes() Cmi_numpes
-#define CmiNodeSize() Cmi_nodesize
+#define CmiMyPe()           Cmi_mype
+#define CmiMyRank()         0
+#define CmiNumPes()         Cmi_numpes
+#define CmiMyNodeSize()     1
+#define CmiMyNode()         Cmi_mype
+#define CmiNumNodes()       Cmi_numpes
+#define CmiNodeFirst(node)  (node)
+#define CmiNodeSize(node)   1
+#define CmiNodeOf(pe)       (pe)
+#define CmiRankOf(pe)       0
 
 #define SHARED_DECL
 #define CpvDeclare(t,v) t CMK_CONCAT(Cpv_Var_,v)
@@ -320,12 +327,18 @@ typedef int CmiMutex;
 #include <spp_prog_model.h>
 
 extern int Cmi_numpes;
-extern int Cmi_nodesize;
-
-#define CmiMyPe() my_thread()
-#define CmiMyRank() my_thread()
-#define CmiNumPes() Cmi_numpes
-#define CmiNodeSize() Cmi_nodesize
+extern int Cmi_mynodesize;
+
+#define CmiMyPe()           (my_thread())
+#define CmiMyRank()         (my_thread())
+#define CmiNumPes()         Cmi_numpes
+#define CmiMyNodeSize()     Cmi_mynodesize
+#define CmiMyNode()         ?
+#define CmiNumNodes()       ?
+#define CmiNodeFirst(node)  ?
+#define CmiNodeSize(node)   ?
+#define CmiNodeOf(pe)       ?
+#define CmiRankOf(pe)       ?
 
 #define SHARED_DECL
 #define CpvDeclare(t,v) t* CMK_CONCAT(Cpv_Var_,v)
@@ -333,7 +346,7 @@ extern int Cmi_nodesize;
 #define CpvStaticDeclare(t,v) static t* CMK_CONCAT(Cpv_Var_,v)
 #define CpvInitialize(t,v)\
     { if (CmiMyRank()) while (CMK_CONCAT(Cpv_Var_,v)==0);\
-    else { CMK_CONCAT(Cpv_Var_,v)=(t*)malloc(sizeof(t)*CmiNodeSize()); }}
+    else { CMK_CONCAT(Cpv_Var_,v)=(t*)malloc(sizeof(t)*CmiMyNodeSize()); }}
 #define CpvAccess(v) CMK_CONCAT(Cpv_Var_,v)[CmiMyRank()]
 
 #define CsvDeclare(t,v) t CMK_CONCAT(Csv_Var_,v)
@@ -355,12 +368,20 @@ extern void *CmiSvAlloc CMK_PROTO((int));
 #include <thread.h>
 
 extern int Cmi_numpes;
-extern int Cmi_nodesize;
+extern int Cmi_mynodesize;
+extern int Cmi_mynode;
+extern int Cmi_numnodes;
 
 extern int CmiMyPe();
 extern int CmiMyRank();
-#define CmiNumPes() Cmi_numpes
-#define CmiNodeSize() Cmi_nodesize
+#define CmiNumPes()         Cmi_numpes
+#define CmiMyNodeSize()     Cmi_mynodesize
+#define CmiMyNode()         Cmi_mynode
+#define CmiNumNodes()       Cmi_numnodes
+extern int CmiNodeFirst(int node);
+extern int CmiNodeSize(int node);
+extern int CmiNodeOf(int pe);
+extern int CmiRankOf(int pe);
 
 #define SHARED_DECL
 
@@ -369,7 +390,7 @@ extern int CmiMyRank();
 #define CpvStaticDeclare(t,v) static t* CMK_CONCAT(Cpv_Var_,v)
 #define CpvInitialize(t,v)\
   { if (CmiMyRank()) while (CMK_CONCAT(Cpv_Var_,v)==0);\
-    else { CMK_CONCAT(Cpv_Var_,v)=(t*)malloc(sizeof(t)*CmiNodeSize()); }}
+    else { CMK_CONCAT(Cpv_Var_,v)=(t*)malloc(sizeof(t)*CmiMyNodeSize()); }}
 #define CpvAccess(v) CMK_CONCAT(Cpv_Var_,v)[CmiMyRank()]
 
 #define CsvDeclare(t,v) t CMK_CONCAT(Csv_Var_,v)
@@ -393,10 +414,16 @@ typedef mutex_t CmiMutex;
 extern int Cmi_mype;
 extern int Cmi_numpes;
 
-#define CmiMyPe() Cmi_mype
-#define CmiMyRank() Cmi_mype
-#define CmiNumPes() Cmi_numpes
-#define CmiNodeSize() Cmi_numpes
+#define CmiMyPe()              Cmi_mype
+#define CmiMyRank()            Cmi_mype
+#define CmiNumPes()            Cmi_numpes
+#define CmiMyNodeSize()        Cmi_numpes
+#define CmiMyNode()            0
+#define CmiNumNodes()          1
+#define CmiNodeFirst(node)     0
+#define CmiNodeSize(node)      Cmi_numpes
+#define CmiNodeOf(pe)          0
+#define CmiRankOf(pe)          (pe)
 
 #define SHARED_DECL
 
@@ -851,32 +878,6 @@ void CcdCallOnCondition CMK_PROTO((int condnum, CcdVoidFn fnp, void *arg));
 
 void CcdCallBacks();
 
-/******** NODE NUMBERING *********/
-
-#if CMK_MEMORY_DISTRIBUTED
-
-#define CmiMyNode()         (CmiMyPe())
-#define CmiNumNodes()       (CmiNumPes())
-#define CmiNodeFirst(node)  (node)
-#define CmiNodeSize(node)   1
-#define CmiNodeOf(pe)       (pe)
-#define CmiRankOf(pe)       0
-
-#endif
-
-#if CMK_MEMORY_SHARED
-
-#define CmiMyNode()         0
-#define CmiNumNodes()       1
-#define CmiNodeFirst(node)  0
-#define CmiNodeSize(node)   (CmiNumPes())
-#define CmiNodeOf(pe)       0
-#define CmiRankOf(pe)       (pe)
-
-#endif
-
-/* (note: if cmk_memory_clustered, see machine.c for these fns) */
-
 /**** DEAL WITH DIFFERENCES: KERNIGHAN-RITCHIE-C, ANSI-C, AND C++ ****/
 
 #if defined(__cplusplus)