Delete obsolete machine layers
authorPhil Miller <mille121@illinois.edu>
Mon, 9 May 2011 19:31:32 +0000 (14:31 -0500)
committerPhil Miller <mille121@illinois.edu>
Mon, 9 May 2011 19:35:42 +0000 (14:35 -0500)
The following machine types (interconnect, OS, or architecture) are
believe to no longer have even possible users:

t3e
crayx1
hp
axp
exemplar
sp3
ncube2
origin
irix
sun

76 files changed:
src/arch/elan-axp/conv-mach.h [deleted file]
src/arch/elan-axp/conv-mach.sh [deleted file]
src/arch/exemplar/conv-mach.h [deleted file]
src/arch/exemplar/conv-mach.sh [deleted file]
src/arch/exemplar/machine.c [deleted file]
src/arch/mpi-axp/conv-mach-elan.h [deleted file]
src/arch/mpi-axp/conv-mach-elan.sh [deleted file]
src/arch/mpi-axp/conv-mach-smp.h [deleted file]
src/arch/mpi-axp/conv-mach-smp.sh [deleted file]
src/arch/mpi-axp/conv-mach.h [deleted file]
src/arch/mpi-axp/conv-mach.sh [deleted file]
src/arch/mpi-crayx1/conv-mach-smp.h [deleted file]
src/arch/mpi-crayx1/conv-mach-smp.sh [deleted file]
src/arch/mpi-crayx1/conv-mach.h [deleted file]
src/arch/mpi-crayx1/conv-mach.sh [deleted file]
src/arch/mpi-exemplar/conv-mach.h [deleted file]
src/arch/mpi-exemplar/conv-mach.sh [deleted file]
src/arch/mpi-hp-ia64/conv-mach.h [deleted file]
src/arch/mpi-hp-ia64/conv-mach.sh [deleted file]
src/arch/mpi-linux-axp/cc-cxx.h [deleted file]
src/arch/mpi-linux-axp/cc-cxx.sh [deleted file]
src/arch/mpi-linux-axp/conv-mach.h [deleted file]
src/arch/mpi-linux-axp/conv-mach.sh [deleted file]
src/arch/mpi-origin/conv-mach-smp.h [deleted file]
src/arch/mpi-origin/conv-mach-smp.sh [deleted file]
src/arch/mpi-origin/conv-mach.h [deleted file]
src/arch/mpi-origin/conv-mach.sh [deleted file]
src/arch/ncube2/conv-mach.h [deleted file]
src/arch/ncube2/conv-mach.sh [deleted file]
src/arch/ncube2/machine.c [deleted file]
src/arch/net-axp/conv-mach.h [deleted file]
src/arch/net-axp/conv-mach.sh [deleted file]
src/arch/net-hp-ia64/cc-acc.h [deleted file]
src/arch/net-hp-ia64/cc-acc.sh [deleted file]
src/arch/net-hp-ia64/conv-mach-gm.h [deleted file]
src/arch/net-hp-ia64/conv-mach-gm.sh [deleted file]
src/arch/net-hp-ia64/conv-mach.h [deleted file]
src/arch/net-hp-ia64/conv-mach.sh [deleted file]
src/arch/net-hp/cc-acc.h [deleted file]
src/arch/net-hp/cc-acc.sh [deleted file]
src/arch/net-hp/cc-cc.h [deleted file]
src/arch/net-hp/cc-cc.sh [deleted file]
src/arch/net-hp/conv-mach.h [deleted file]
src/arch/net-hp/conv-mach.sh [deleted file]
src/arch/net-irix/cc-cc.h [deleted file]
src/arch/net-irix/cc-cc.sh [deleted file]
src/arch/net-irix/cc-cc64.h [deleted file]
src/arch/net-irix/cc-cc64.sh [deleted file]
src/arch/net-irix/conv-mach.h [deleted file]
src/arch/net-irix/conv-mach.sh [deleted file]
src/arch/net-linux-axp/cc-cxx.h [deleted file]
src/arch/net-linux-axp/cc-cxx.sh [deleted file]
src/arch/net-linux-axp/conv-mach-scyld.h [deleted file]
src/arch/net-linux-axp/conv-mach-scyld.sh [deleted file]
src/arch/net-linux-axp/conv-mach.h [deleted file]
src/arch/net-linux-axp/conv-mach.sh [deleted file]
src/arch/net-sun/conv-mach.h [deleted file]
src/arch/net-sun/conv-mach.sh [deleted file]
src/arch/origin-pthreads/charmrun [deleted file]
src/arch/origin-pthreads/conv-mach.h [deleted file]
src/arch/origin-pthreads/conv-mach.sh [deleted file]
src/arch/origin-pthreads/machine.c [deleted file]
src/arch/origin2000/charmrun [deleted file]
src/arch/origin2000/conv-mach.h [deleted file]
src/arch/origin2000/conv-mach.sh [deleted file]
src/arch/origin2000/machine.c [deleted file]
src/arch/shmem-axp/charmrun [deleted file]
src/arch/shmem-axp/conv-mach.h [deleted file]
src/arch/shmem-axp/conv-mach.sh [deleted file]
src/arch/sp3/conv-mach.h [deleted file]
src/arch/sp3/conv-mach.sh [deleted file]
src/arch/sp3/machine.c [deleted file]
src/arch/t3e/charmrun [deleted file]
src/arch/t3e/conv-mach.h [deleted file]
src/arch/t3e/conv-mach.sh [deleted file]
src/arch/t3e/machine.c [deleted file]

diff --git a/src/arch/elan-axp/conv-mach.h b/src/arch/elan-axp/conv-mach.h
deleted file mode 100644 (file)
index d2e3171..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_DLL_CC   "g++ -shared -O3 -o "
-
-#define CMK_FIX_HP_CONNECT_BUG                             0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_USE_CONTEXT                            0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_64BIT    1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-#define CMK_COMPILEMODE_ORIG                               0
-#define CMK_COMPILEMODE_ANSI                               1
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_LBDB_ON                                       1
-
-
-#endif
-
diff --git a/src/arch/elan-axp/conv-mach.sh b/src/arch/elan-axp/conv-mach.sh
deleted file mode 100644 (file)
index 9e7e712..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc -D_REENTRANT -I/usr/opt/rms/include '
-CMK_CXX='g++ -D_REENTRANT -I/usr/opt/rms/include '
-CMK_CXXPP="$CMK_CXX -x c++ -E  "
-CMK_LD="eval $CMK_CC "
-CMK_CF77='f77 -automatic'
-CMK_CF90='f90 -automatic'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt -lelan'
-CMK_LD_LIBRARY_PATH="-rpath $CHARMLIBSO/"
-CMK_QT='axp-gcc'
-CMK_XIOPTS='-ansi'
-CMK_F90LIBS="-lUfor -lfor -lFutil"
-CMK_F77LIBS="$CMK_F90LIBS"
-CMK_MOD_EXT="mod"
diff --git a/src/arch/exemplar/conv-mach.h b/src/arch/exemplar/conv-mach.h
deleted file mode 100644 (file)
index 4d11a7b..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_CCS_AVAILABLE                                  0
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-#define CMK_IS_HETERO                                      0
-
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 hdl,xhdl,info,padding; }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           1
-#define CMK_SHARED_VARS_UNAVAILABLE                        0
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              1
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                1
-
-#define CMK_TYPEDEF_INT2 unknown
-#define CMK_TYPEDEF_INT4 unknown
-#define CMK_TYPEDEF_INT8 unknown
-#define CMK_TYPEDEF_UINT2 unknown
-#define CMK_TYPEDEF_UINT4 unknown
-#define CMK_TYPEDEF_UINT8 unknown
-#define CMK_TYPEDEF_FLOAT4 unknown
-#define CMK_TYPEDEF_FLOAT8 unknown
-
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-#define CMK_LBDB_ON                                       0
-
-
-#endif
-
diff --git a/src/arch/exemplar/conv-mach.sh b/src/arch/exemplar/conv-mach.sh
deleted file mode 100644 (file)
index 433b6ba..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='cc -E '
-CMK_CXXPP='CC -E '
-CMK_CC='cc -Ae '
-CMK_CXX='CC '
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_C_DEBUG='-g +O0 '
-CMK_C_OPTIMIZE='+O2'
-CMK_LD='cc -Wl,+parallel '
-CMK_LDXX='CC -Wl,+parallel '
-CMK_RANLIB='true'
-CMK_LIBS='-lckqt -lpthread -lcps -lpthread -lail '
-CMK_NATIVE_LD='cc'
-CMK_NATIVE_LDXX='CC'
-CMK_QT='convex'
-CMK_XIOPTS=''
-
diff --git a/src/arch/exemplar/machine.c b/src/arch/exemplar/machine.c
deleted file mode 100644 (file)
index d0de8b5..0000000
+++ /dev/null
@@ -1,373 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/** @file
- * Exemplar machine layer
- * @ingroup Machine
- */
-/*@{*/
-
-#include <spp_prog_model.h>
-#include <memory.h>
-#include <cps.h>
-#include <math.h>
-#include "converse.h"
-
-
-#define BLK_LEN                512
-typedef struct {
-  mem_sema_t sema;
-  void     **blk;
-  unsigned int blk_len;
-  unsigned int first;
-  unsigned int len;
-  unsigned int maxlen;
-} McQueue;
-
-static McQueue *McQueueCreate(void);
-static void McQueueAddToBack(McQueue *queue, void *element);
-static void *McQueueRemoveFromFront(McQueue *queue);
-static McQueue **MsgQueue;
-#define g_malloc(s)  memory_class_malloc(s,NEAR_SHARED_MEM)
-
-
-CpvDeclare(void*, CmiLocalQueue);
-node_private int _Cmi_numpes;
-
-static node_private barrier_t barrier;
-
-static void threadInit();
-
-/***********************************************************************
- *
- * Abort function:
- *
- ************************************************************************/
-
-void CmiAbort(const char *message)
-{
-  CmiError(message);
-  exit(1);
-}
-
-
-
-void *CmiSvAlloc(size)
-int size;
-{
-  char *res;
-  res = (char *) memory_class_malloc(size+2*sizeof(int),NEAR_SHARED_MEM);
-  if (res==0) CmiAbort("Memory allocation failed.");
-  ((int *)res)[0]=size;
-  ((int *)res)[1]=(-1);
-  return (void *)(res+2*sizeof(int));
-}
-
-void CmiSvFree(blk)
-char *blk;
-{
-  free(blk-2*sizeof(int));
-}
-
-
-
-CmiNotifyIdle()
-{
-}
-
-CmiNodeLock CmiCreateLock(void)
-{
-  CmiNodeLock *plock = (CmiNodeLock *)malloc(sizeof(CmiNodeLock));
-  cps_mutex_alloc(*plock);
-  return *plock;
-}
-
-int CmiProbeLock(CmiNodeLock lock)
-{
-  if(cps_mutex_trylock(lock) == 0){
-    cps_mutex_unlock(lock);
-    return 1;
-  } else {
-    return 0;
-  }
-}
-
-
-int CmiAsyncMsgSent(msgid)
-CmiCommHandle msgid;
-{
-   return 1;
-}
-
-typedef struct {
-   CmiStartFn fn;
-   int usched;
-} USER_PARAMETERS;
-
-
-static node_private int Cmi_argc;
-static node_private char** Cmi_argv;
-static node_private USER_PARAMETERS Cmi_param;
-static node_private CmiStartFn Cmi_fn;
-static node_private int Cmi_usched;
-static node_private int Cmi_initret;
-
-void ConverseInit(int argc, char** argv, CmiStartFn fn, int usched, int initret)
-{
-    int i;
-    spawn_sym_t request;
-
-    /* figure out number of processors required */
-    i =  0;
-    _Cmi_numpes = 0; 
-    CmiGetArgInt(argv,"+p",&_Cmi_numpes);
-    if (_Cmi_numpes <= 0)
-      CmiAbort("Invalid number of processors\n");
-
-    Cmi_argc = argc;
-    Cmi_argv = argv;
-    Cmi_fn = fn;
-    Cmi_usched = usched;
-    Cmi_initret = initret;
-
-    request.node = CPS_SAME_NODE;
-    request.min  = _Cmi_numpes;
-    request.max  = _Cmi_numpes;
-    request.threadscope = CPS_THREAD_PARALLEL;
-   
-    if(cps_barrier_alloc(&barrier)!=0)
-      CmiAbort("Cannot Alocate Barrier\n");
-
-    MsgQueue=(McQueue **)g_malloc(_Cmi_numpes*sizeof(McQueue *));
-    if (MsgQueue == (McQueue **)0) {
-       CmiAbort("Cannot Allocate Memory...\n");
-    }
-    for(i=0; i<_Cmi_numpes; i++) MsgQueue[i] = McQueueCreate();
-
-    if (cps_ppcall(&request, threadInit ,(void *) 0) < 0) {
-       CmiAbort("Cannot create threads...\n");
-    } 
-    cps_barrier_free(&barrier);
-
-}
-
-void ConverseExit(void)
-{
-   ConverseCommonExit();
-   cps_barrier(&barrier,&_Cmi_numpes);
-}
-
-static void threadInit(arg)
-void *arg;
-{
-    char **argv=CmiCopyArgs(Cmi_argv);
-    CpvInitialize(void*, CmiLocalQueue);
-
-    ConverseCommonInit(argv);
-    neighbour_init(CmiMyPe());
-    CpvAccess(CmiLocalQueue) = CdsFifo_Create();
-    CmiSpanTreeInit();
-    CmiTimerInit();
-    if (Cmi_initret==0) {
-      Cmi_fn(CmiGetArgc(argv), argv);
-      if (Cmi_usched==0) CsdScheduler(-1);
-      ConverseExit();
-    }
-}
-
-void *CmiGetNonLocal(void)
-{
-     int *buf, *msg;
-     int size;
-     msg = McQueueRemoveFromFront(MsgQueue[CmiMyPe()]);
-     if(msg==0)
-       return 0;
-     size = *(msg-1);
-     if((buf = (int *) CmiAlloc(size))==0)
-       CmiAbort("Cannot allocate memory!\n");
-     memcpy(buf, msg, size);
-     free(msg-1);
-     return buf;
-}
-
-
-void CmiSyncSendFn(int destPE, int size, char *msg)
-{
-   int *buf;
-
-   buf=(int *)g_malloc(size+sizeof(int));
-   if(buf==(void *)0) {
-     CmiAbort("Cannot allocate memory!\n");
-   }
-   *buf++ = size;
-   memcpy((char *)buf,(char *)msg,size);
-   McQueueAddToBack(MsgQueue[destPE],buf); 
-   CQdCreate(CpvAccess(cQdState), 1);
-}
-
-
-CmiCommHandle CmiAsyncSendFn(int destPE, int size, char *msg)
-{
-    CmiSyncSendFn(destPE, size, msg); 
-    return 0;
-}
-
-
-void CmiFreeSendFn(int destPE, int size, char *msg)
-{
-  if (CmiMyPe()==destPE) {
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-    CQdCreate(CpvAccess(cQdState), 1);
-  } else {
-    CmiSyncSendFn(destPE, size, msg);
-    CmiFree(msg);
-  }
-}
-
-void CmiSyncBroadcastFn(int size, char *msg)
-{
-       int i;
-       for(i=0; i<CmiNumPes(); i++)
-         if (CmiMyPe() != i) CmiSyncSendFn(i,size,msg);
-}
-
-CmiCommHandle CmiAsyncBroadcastFn(int size, char *msg)
-{
-    CmiSyncBroadcastFn(size, msg);
-    return 0;
-}
-
-void CmiFreeBroadcastFn(int size, char *msg)
-{
-    CmiSyncBroadcastFn(size,msg);
-    CmiFree(msg);
-}
-
-void CmiSyncBroadcastAllFn(int size, char *msg)
-{
-    int i;
-    for(i=0; i<CmiNumPes(); i++) CmiSyncSendFn(i,size,msg);
-}
-
-
-CmiCommHandle CmiAsyncBroadcastAllFn(int size, char *msg)
-{
-    CmiSyncBroadcastAllFn(size, msg);
-    return 0; 
-}
-
-
-void CmiFreeBroadcastAllFn(int size, char *msg)
-{
-    int i;
-    for(i=0; i<CmiNumPes(); i++)
-       if (CmiMyPe() != i) CmiSyncSendFn(i,size,msg);
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-    CQdCreate(CpvAccess(cQdState), 1);
-}
-
-
-
-void CmiNodeBarrier()
-{
-   if(cps_barrier(&barrier,&_Cmi_numpes)!=0)
-     CmiAbort("Error in Barrier\n");
-}
-
-
-
-
-
-/* ****************************************************************** */
-/*    The following internal functions implements FIFO queues for     */
-/*    messages. These queues are shared among threads                 */
-/* ****************************************************************** */
-
-
-
-static void ** AllocBlock(unsigned int len)
-{
-       void ** blk;
-
-       blk=(void **)g_malloc(len*sizeof(void *));
-       if(blk==(void **)0)
-       {
-               CmiAbort("Cannot Allocate Memory!\n");
-       }
-       return blk;
-}
-
-static void SpillBlock(void **srcblk, void **destblk, int first, int len)
-{
-       memcpy(destblk, &srcblk[first], (len-first)*sizeof(void *));
-       memcpy(&destblk[len-first],srcblk,first*sizeof(void *));
-}
-
-static McQueue * McQueueCreate(void)
-{
-       McQueue *queue;
-       int one = 1;
-
-       queue = (McQueue *) g_malloc(sizeof(McQueue));
-       if(queue==(McQueue *)0)
-       {
-               CmiError("Cannot Allocate Memory!\n");
-               exit(1);
-       }
-       m_init32(&(queue->sema), &one);
-       queue->blk = AllocBlock(BLK_LEN);
-       queue->blk_len = BLK_LEN;
-       queue->first = 0;
-       queue->len = 0;
-       queue->maxlen = 0;
-       return queue;
-}
-
-static 
-void
-McQueueAddToBack(queue, element)
-McQueue *queue;
-void  *element;
-{
-       m_lock(&(queue->sema));
-       if(queue->len==queue->blk_len)
-       {
-               void **blk;
-
-               queue->blk_len *= 3;
-               blk = AllocBlock(queue->blk_len);
-               SpillBlock(queue->blk, blk, queue->first, queue->len);
-               free(queue->blk);
-               queue->blk = blk;
-               queue->first = 0;
-       }
-       queue->blk[(queue->first+queue->len++)%queue->blk_len] = element;
-       if(queue->len>queue->maxlen)
-               queue->maxlen = queue->len;
-       m_unlock(&(queue->sema));
-}
-
-
-static
-void *
-McQueueRemoveFromFront(queue)
-McQueue *queue;
-{
-       void *element;
-       m_lock(&(queue->sema));
-       element = (void *) 0;
-       if(queue->len)
-       {
-               element = queue->blk[queue->first++];
-               queue->first = (queue->first+queue->blk_len)%queue->blk_len;
-               queue->len--;
-       }
-       m_unlock(&(queue->sema));
-       return element;
-}
-
-/*@}*/
diff --git a/src/arch/mpi-axp/conv-mach-elan.h b/src/arch/mpi-axp/conv-mach-elan.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/mpi-axp/conv-mach-elan.sh b/src/arch/mpi-axp/conv-mach-elan.sh
deleted file mode 100644 (file)
index 73e59b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-CMK_LIBS="$CMK_LIBS -lelan"
diff --git a/src/arch/mpi-axp/conv-mach-smp.h b/src/arch/mpi-axp/conv-mach-smp.h
deleted file mode 100644 (file)
index 7bd3c96..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-#define CMK_SMP                                                   1
-
-#undef CMK_MALLOC_USE_GNU_MALLOC
-#undef CMK_MALLOC_USE_OS_BUILTIN
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#undef CMK_MEMORY_PROTECTABLE
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#undef CMK_NODE_QUEUE_AVAILABLE
-#define CMK_NODE_QUEUE_AVAILABLE                           1
-
-#undef CMK_SHARED_VARS_UNAVAILABLE
-#undef CMK_SHARED_VARS_POSIX_THREADS_SMP
-#define CMK_SHARED_VARS_UNAVAILABLE                        0
-#define CMK_SHARED_VARS_POSIX_THREADS_SMP                  1
-
-#undef CMK_SYNCHRONIZE_ON_TCP_CLOSE
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       1
-
diff --git a/src/arch/mpi-axp/conv-mach-smp.sh b/src/arch/mpi-axp/conv-mach-smp.sh
deleted file mode 100644 (file)
index 7a4c29a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-CMK_DEFS=' -D_REENTRANT -pthread '
-CMK_CPP_C="$CMK_CPP_C $CMK_DEFS"
-CMK_CC="$CMK_CC $CMK_DEFS"
-CMK_CC_RELIABLE="$CMK_CC_RELIABLE $CMK_DEFS "
-CMK_CC_FASTEST="$CMK_CC_FASTEST $CMK_DEFS "
-CMK_CXX="$CMK_CXX  $CMK_DEFS "
-CMK_CXXPP="$CMK_CXXPP $CMK_DEFS "
-CMK_LD="$CMK_LD $CMK_DEFS "
-CMK_LDXX="$CMK_LDXX $CMK_DEFS "
-CMK_LIBS=" -lpthread $CMK_LIBS "
diff --git a/src/arch/mpi-axp/conv-mach.h b/src/arch/mpi-axp/conv-mach.h
deleted file mode 100644 (file)
index 004b00d..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_FIX_HP_CONNECT_BUG                             0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            1
-#define CMK_THREADS_USE_PTHREADS                           0
-#define CMK_THREADS_ARE_WIN32_FIBERS                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_STRERROR_IS_A_BUILTIN                          1
-#define CMK_STRERROR_USE_SYS_ERRLIST                       0
-
-#define CMK_STRINGS_USE_OWN_DECLARATIONS                   0
-#define CMK_STRINGS_USE_STRINGS_H                          0
-#define CMK_STRINGS_USE_STRING_H                           1
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-#define CMK_COMPILEMODE_ORIG                               0
-#define CMK_COMPILEMODE_ANSI                               1
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_LBDB_ON                                       1
-
-
-#endif
-
diff --git a/src/arch/mpi-axp/conv-mach.sh b/src/arch/mpi-axp/conv-mach.sh
deleted file mode 100644 (file)
index af133e2..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc -D_REENTRANT'
-CMK_CXX='g++ -D_REENTRANT'
-CMK_CXXPP="$CMK_CXX -x c++ -E "
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt -lmpi '
-CMK_LD_LIBRARY_PATH="-rpath $CHARMLIBSO/"
-CMK_QT='axp-gcc'
-CMK_XIOPTS='-ansi'
-
-CMK_CF77='f77 -automatic'
-CMK_CF90='f90 -automatic'
-CMK_F90LIBS="-lUfor -lfor -lFutil"
-CMK_F77LIBS="$CMK_F90LIBS "
diff --git a/src/arch/mpi-crayx1/conv-mach-smp.h b/src/arch/mpi-crayx1/conv-mach-smp.h
deleted file mode 100644 (file)
index 3074457..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#define CMK_SMP                                                   1
-
-#undef CMK_MALLOC_USE_GNU_MALLOC
-#undef CMK_MALLOC_USE_OS_BUILTIN
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#undef CMK_MEMORY_PROTECTABLE
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#undef CMK_NODE_QUEUE_AVAILABLE
-#define CMK_NODE_QUEUE_AVAILABLE                           1
-
-#undef CMK_SHARED_VARS_UNAVAILABLE
-#undef CMK_SHARED_VARS_POSIX_THREADS_SMP
-#define CMK_SHARED_VARS_UNAVAILABLE                        0
-#define CMK_SHARED_VARS_POSIX_THREADS_SMP                  1
-
-#undef CMK_SYNCHRONIZE_ON_TCP_CLOSE
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       1
-
diff --git a/src/arch/mpi-crayx1/conv-mach-smp.sh b/src/arch/mpi-crayx1/conv-mach-smp.sh
deleted file mode 100644 (file)
index f78e4c0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-CMK_DEFS=' -D_REENTRANT '
-CMK_CPP_C="$CMK_CPP_C $CMK_DEFS"
-CMK_CC="$CMK_CC $CMK_DEFS"
-CMK_CC_RELIABLE="$CMK_CC_RELIABLE $CMK_DEFS "
-CMK_CC_FASTEST="$CMK_CC_FASTEST $CMK_DEFS "
-CMK_CXX="$CMK_CXX  $CMK_DEFS "
-CMK_CXXPP="$CMK_CXXPP $CMK_DEFS "
-CMK_LD="$CMK_LD $CMK_DEFS "
-CMK_LDXX="$CMK_LDXX $CMK_DEFS "
-CMK_LIBS=" -lpthread $CMK_LIBS "
diff --git a/src/arch/mpi-crayx1/conv-mach.h b/src/arch/mpi-crayx1/conv-mach.h
deleted file mode 100644 (file)
index 6544419..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_MEMORY_PREALLOCATE_HACK                       1
-
-#define CMK_DEFAULT_MAIN_USES_COMMON_CODE                  1
-
-#define CMK_GETPAGESIZE_AVAILABLE                          1
-
-#define CMK_IS_HETERO                                      0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            1
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-#define CMK_TIMER_USE_RTC                                 1
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_LBDB_ON                                       1
-
-
-#endif
-
diff --git a/src/arch/mpi-crayx1/conv-mach.sh b/src/arch/mpi-crayx1/conv-mach.sh
deleted file mode 100644 (file)
index 1753efe..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-CMK_CPP_CHARM="/lib/cpp -P"
-CMK_CPP_C="cc -h ssp -E "
-CMK_CC="cc -h ssp "
-CMK_CXX="CC -h ssp "
-CMK_CXXPP="CC -h ssp -E "
-CMK_CF77="ftn -O ssp"
-CMK_CF90="ftn -O ssp"
-CMK_RANLIB="true"
-CMK_LIBS="-lmpi -lCx "
-CMK_NATIVE_LDXX="$CMK_CXX -lCx"
-CMK_QT="none"
-
-#CMK_F90LIBS="-L/usr/absoft/lib -L/opt/absoft/lib -lf90math -lfio -lU77 -lf77math "
-#CMK_MOD_NAME_ALLCAPS=1
-#CMK_MOD_EXT="mod"
-#CMK_F90_USE_MODDIR=1
-#CMK_F90_MODINC="-p"
diff --git a/src/arch/mpi-exemplar/conv-mach.h b/src/arch/mpi-exemplar/conv-mach.h
deleted file mode 100644 (file)
index 4a932e9..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_IS_HETERO                                      0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-#define CMK_USE_HP_MAIN_FIX                                1
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_LBDB_ON                                       0
-
-
-#endif
-
diff --git a/src/arch/mpi-exemplar/conv-mach.sh b/src/arch/mpi-exemplar/conv-mach.sh
deleted file mode 100644 (file)
index 49ee467..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='cc -E '
-CMK_CXXPP='CC -E '
-CMK_CC='mpicc -Ae '
-CMK_CXX='mpiCC '
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_C_DEBUG='-g +O0 '
-CMK_C_OPTIMIZE='+O2'
-CMK_RANLIB='true'
-CMK_LIBS='-lckqt '
-CMK_NATIVE_LIBS=''
-CMK_NATIVE_CC='cc '
-CMK_NATIVE_LD='cc'
-CMK_NATIVE_CXX='CC '
-CMK_NATIVE_LDXX='CC'
-CMK_QT='convex'
-CMK_XIOPTS=''
diff --git a/src/arch/mpi-hp-ia64/conv-mach.h b/src/arch/mpi-hp-ia64/conv-mach.h
deleted file mode 100644 (file)
index 81d7279..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_IS_HETERO                                      0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_USE_CONTEXT                            1
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                1
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       1
-
-#define CMK_LBDB_ON                                       1
-
-#endif
-
diff --git a/src/arch/mpi-hp-ia64/conv-mach.sh b/src/arch/mpi-hp-ia64/conv-mach.sh
deleted file mode 100644 (file)
index daea7d0..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-CMK_CPP_CHARM="/usr/lib/cpp -P"
-CMK_CPP_C="mpicc -E"
-CMK_CC="mpicc -D_HPUX_SOURCE $CMK_INCDIR "
-CMK_CC_RELIABLE="mpicc -D_HPUX_SOURCE $CMK_INCDIR " 
-CMK_CC_FASTEST="mpicc -D_HPUX_SOURCE $CMK_INCDIR "
-CMK_CXX="mpiCC -w -D_HPUX_SOURCE $CMK_INCDIR "
-CMK_CXXPP="mpiCC -w -D_HPUX_SOURCE -E $CMK_INCDIR "
-CMK_C_OPTIMIZE="+O3 +Onolimit "
-CMK_LD="mpicc -D_HPUX_SOURCE $CMK_LIBDIR "
-CMK_LDXX="mpiCC -w  -D_HPUX_SOURCE $CMK_LIBDIR "
-CMK_NATIVE_CC="mpicc -D_HPUX_SOURCE $CMK_INCDIR "
-CMK_NATIVE_LD="mpicc -D_HPUX_SOURCE $CMK_LIBDIR "
-CMK_NATIVE_CXX="mpiCC -w -D_HPUX_SOURCE $CMK_INCDIR "
-CMK_NATIVE_LDXX="mpiCC -w -D_HPUX_SOURCE $CMK_LIBDIR "
-CMK_CF77="mpif77"
-CMK_CF90="mpif90"
-CMK_CPP_SUFFIX="i"
-CMK_XLATPP="charmxlat++ "
-CMK_RANLIB="true"
-CMK_LIBS="-lckqt"
-CMK_XIOPTS=""
-CMK_QT="none"
diff --git a/src/arch/mpi-linux-axp/cc-cxx.h b/src/arch/mpi-linux-axp/cc-cxx.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/mpi-linux-axp/cc-cxx.sh b/src/arch/mpi-linux-axp/cc-cxx.sh
deleted file mode 100644 (file)
index f9086ef..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-CMK_CPP_C='ccc -E'
-CMK_CC='ccc '
-CMK_CC_RELIABLE='ccc '
-CMK_CC_FASTEST='ccc '
-CMK_CXX='cxx '
-CMK_CXXPP='cxx -E '
-CMK_LD='ccc'
-CMK_LDXX='cxx'
-#CMK_LIBS='-lckqt -lmpi -lbproc -lbeostat'
-CMK_LIBS='-lckqt -lmpi'
-CMK_NATIVE_CC='ccc'
-CMK_NATIVE_LD='ccc'
-CMK_NATIVE_CXX='cxx'
-CMK_NATIVE_LDXX='cxx'
diff --git a/src/arch/mpi-linux-axp/conv-mach.h b/src/arch/mpi-linux-axp/conv-mach.h
deleted file mode 100644 (file)
index ac1699c..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_LBDB_ON                                       1
-
-#endif
-
diff --git a/src/arch/mpi-linux-axp/conv-mach.sh b/src/arch/mpi-linux-axp/conv-mach.sh
deleted file mode 100644 (file)
index a4bc1ad..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc '
-CMK_CXX='g++ '
-CMK_CXXPP="$CMK_CXX -E "
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt -lmpi'
-CMK_QT='axp-osf1-cc'
-CMK_XIOPTS='-ansi'
-
diff --git a/src/arch/mpi-origin/conv-mach-smp.h b/src/arch/mpi-origin/conv-mach-smp.h
deleted file mode 100644 (file)
index 7356ddf..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#define CMK_SMP                                                   1
-
-#undef CMK_MALLOC_USE_GNU_MALLOC
-#undef CMK_MALLOC_USE_OS_BUILTIN
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#undef CMK_MEMORY_PROTECTABLE
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#undef CMK_NODE_QUEUE_AVAILABLE
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#undef CMK_SHARED_VARS_UNAVAILABLE
-#undef CMK_SHARED_VARS_POSIX_THREADS_SMP
-#define CMK_SHARED_VARS_UNAVAILABLE                        0
-#define CMK_SHARED_VARS_POSIX_THREADS_SMP                  1
-
-#undef CMK_SYNCHRONIZE_ON_TCP_CLOSE
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       1
-
diff --git a/src/arch/mpi-origin/conv-mach-smp.sh b/src/arch/mpi-origin/conv-mach-smp.sh
deleted file mode 100644 (file)
index f78e4c0..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-CMK_DEFS=' -D_REENTRANT '
-CMK_CPP_C="$CMK_CPP_C $CMK_DEFS"
-CMK_CC="$CMK_CC $CMK_DEFS"
-CMK_CC_RELIABLE="$CMK_CC_RELIABLE $CMK_DEFS "
-CMK_CC_FASTEST="$CMK_CC_FASTEST $CMK_DEFS "
-CMK_CXX="$CMK_CXX  $CMK_DEFS "
-CMK_CXXPP="$CMK_CXXPP $CMK_DEFS "
-CMK_LD="$CMK_LD $CMK_DEFS "
-CMK_LDXX="$CMK_LDXX $CMK_DEFS "
-CMK_LIBS=" -lpthread $CMK_LIBS "
diff --git a/src/arch/mpi-origin/conv-mach.h b/src/arch/mpi-origin/conv-mach.h
deleted file mode 100644 (file)
index dafa7b9..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_DLL_CC "CC -shared -64 -LANG:std -O3 -o "
-
-#define CMK_ORIGIN2000                                    1
-#define CMK_DEFAULT_MAIN_USES_COMMON_CODE                  1
-
-#define CMK_GETPAGESIZE_AVAILABLE                          1
-
-#define CMK_IS_HETERO                                      0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                16384
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-
-#ifndef CMK_THREADS_COPY_STACK
-#define CMK_THREADS_COPY_STACK                             0
-#endif
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_LBDB_ON                                       1
-
-
-#endif
-
diff --git a/src/arch/mpi-origin/conv-mach.sh b/src/arch/mpi-origin/conv-mach.sh
deleted file mode 100644 (file)
index 8aae5d3..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp '
-CMK_CPP_C='cc -E -64 '
-CMK_LDRO='ld -r -o'
-CMK_LDRO_WORKS=0
-CMK_CC='cc  -64 -woff 1171 '
-CMK_CXX='CC -LANG:std -64 -woff 1171 '
-CMK_CXXPP="$CMK_CXX -E"
-CMK_CF77='f77 -64 '
-CMK_CF90='f90 -64 '
-CMK_F90_OPTIMIZE='-O3 -r10000 -INLINE:all -TARG:platform=ip27 -OPT:Olimit=0:roundoff=3:div_split=ON:alias=typed '
-CMK_C_OPTIMIZE='-O3 -r10000 -INLINE:all -TARG:platform=ip27 -OPT:Olimit=0:roundoff=3:div_split=ON:alias=typed '
-CMK_LD="$CMK_CC -w "
-CMK_LDXX="$CMK_CXX -w "
-CMK_LD77=''
-CMK_AR="$CMK_CXX -ar -o"
-CMK_RANLIB='true'
-CMK_LIBS=' -lckqt -lfastm -lmpi'
-CMK_LD_LIBRARY_PATH="-rpath $CHARMLIBSO/"
-CMK_LD_SHARED_THREAD="context"
-CMK_NM='nm'
-CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
-CMK_QT='origin'
-CMK_XIOPTS=''
-CMK_F90OBJS='fmain.o'
-CMK_F90LIBS='-L/usr/lib64 -lfortran -lftn'
-CMK_MOD_NAME_ALLCAPS=1
-CMK_MOD_EXT='mod'
diff --git a/src/arch/ncube2/conv-mach.h b/src/arch/ncube2/conv-mach.h
deleted file mode 100644 (file)
index 8c2ee3f..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_CCS_AVAILABLE                                  0
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-#define CMK_IS_HETERO                                      0
-
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 hdl,xhdl,info,padding; }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              1
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 unknown
-#define CMK_TYPEDEF_INT4 unknown
-#define CMK_TYPEDEF_INT8 unknown
-#define CMK_TYPEDEF_UINT2 unknown
-#define CMK_TYPEDEF_UINT4 unknown
-#define CMK_TYPEDEF_UINT8 unknown
-#define CMK_TYPEDEF_FLOAT4 unknown
-#define CMK_TYPEDEF_FLOAT8 unknown
-
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-
-
-#define CMK_LBDB_ON                                       0
-
-
-
-
-#endif
-
diff --git a/src/arch/ncube2/conv-mach.sh b/src/arch/ncube2/conv-mach.sh
deleted file mode 100644 (file)
index 0a5ba8c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp -P'
-CMK_CPP_C='ngcc -E'
-CMK_CC='ncc -g'
-CMK_CC_RELIABLE='ngcc -g'
-CMK_CC_FASTEST="$CMK_CC"
-CMK_CXX='NCC -g'
-CMK_CXXPP='NCC -E'
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_AR='nar q'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt'
-CMK_NATIVE_LIBS=''
-CMK_NATIVE_CC='cc'
-CMK_NATIVE_LD='cc'
-CMK_NATIVE_CXX='CC'
-CMK_NATIVE_LDXX='CC'
-CMK_QT='ncube2'
-CMK_XIOPTS=''
-
diff --git a/src/arch/ncube2/machine.c b/src/arch/ncube2/machine.c
deleted file mode 100644 (file)
index 89ae318..0000000
+++ /dev/null
@@ -1,267 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/** @file
- * Ncube2 machine layer
- * @ingroup Machine
- */
-/*@{*/
-
-#include <stdio.h>
-#include "converse.h"
-
-#define MSG_TYPE 1
-
-#define FLIPBIT(node,bitnumber) (node ^ (1 << bitnumber))
-
-
-CpvDeclare(int, Cmi_mype);
-CpvDeclare(int,  Cmi_numpes);
-CpvDeclare(void*, CmiLocalQueue);
-
-static int Cmi_dim;
-
-static int process, host, cflag, source, type;
-static double uclockinitvalue;
-extern double amicclk();
-
-/***********************************************************************
- *
- * Abort function:
- *
- ************************************************************************/
-
-void CmiAbort(const char *message)
-{
-  CmiError(message);
-  exit(1);
-}
-
-/**************************  TIMER FUNCTIONS **************************/
-
-double CmiTimer()
-{
-  return ( (amicclk() - uclockinitvalue) / 1000000.0 );
-}
-
-double CmiWallTimer()
-{
-  return ( (amicclk() - uclockinitvalue) / 1000000.0 );
-}
-
-double CmiCpuTimer()
-{
-  return ( (amicclk() - uclockinitvalue) / 1000000.0 );
-}
-
-static void CmiTimerInit()
-{
-  uclockinitvalue = amicclk();
-}
-
-int CmiAsyncMsgSent(c)
-CmiCommHandle c ;
-{
-    return 1;
-}
-
-
-void CmiReleaseCommHandle(c)
-CmiCommHandle c ;
-{
-}
-
-
-
-
-/********************* MESSAGE RECEIVE FUNCTIONS ******************/
-
-void *CmiGetNonLocal()
-{
-        void *env;
-        int  msglength;
-
-        type = MSG_TYPE;
-        source = -1;  /* dont care */
-
-        if ( (msglength = ntest(&source, &type)) > 0)
-        {
-               env = (void *)  CmiAlloc(msglength); 
-               if (env == 0) 
-                  CmiPrintf("*** ERROR *** Memory Allocation Failed.\n");
-               CmiSyncReceive(msglength, env);
-               return env;
-        }
-        else
-               return 0;
-}
-
-void CmiNotifyIdle()
-{
-#if CMK_WHEN_PROCESSOR_IDLE_USLEEP
-  tv.tv_sec=0; tv.tv_usec=5000;
-  select(0,0,0,0,&tv);
-#endif
-}
-CmiSyncReceive(size, buffer)
-int size;
-char *buffer;
-{
-    nread(buffer, size, &source, &type, &cflag);
-}
-
-
-/********************* MESSAGE SEND FUNCTIONS ******************/
-
-void CmiSyncSendFn(destPE, size, msg)
-int destPE;
-int size;
-char * msg;
-{
-    char *temp;
-    if (CpvAccess(Cmi_mype) == destPE)
-       {
-          temp = (char *)CmiAlloc(size) ;
-          memcpy(temp, msg, size) ;
-          CdsFifo_Enqueue(CpvAccess(CmiLocalQueue), temp);
-       }
-    else
-          nwrite(msg, size, destPE, MSG_TYPE, &cflag);
-    CQdCreate(CpvAccess(cQdState), 1);
-}
-
-
-CmiCommHandle CmiAsyncSendFn(destPE, size, msg)   /* same as sync send for ncube */
-int destPE;
-int size;
-char * msg;
-{
-    nwrite(msg, size, destPE, MSG_TYPE, &cflag);
-    CQdCreate(CpvAccess(cQdState), 1);
-    return 0 ;
-}
-
-
-void CmiFreeSendFn(destPE, size, msg)
-     int destPE, size;
-     char *msg;
-{
-    if (CpvAccess(Cmi_mype) == destPE)
-        CdsFifo_Enqueue(CpvAccess(CmiLocalQueue), msg);
-    else
-      {
-        nwrite(msg, size, destPE, MSG_TYPE, &cflag);
-        CmiFree(msg);
-      }
-    CQdCreate(CpvAccess(cQdState), 1);
-}
-
-/*********************** BROADCAST FUNCTIONS **********************/
-
-
-void CmiSyncBroadcastFn(size, msg)     /* ALL_EXCEPT_ME  */
-int size;
-char * msg;
-{
-       int i;
-
-       for (i=0; i<CpvAccess(Cmi_numpes); i++)
-               if (i != CpvAccess(Cmi_mype))
-                       nwrite(msg, size, i, MSG_TYPE, &cflag);
-        CQdCreate(CpvAccess(cQdState), CpvAccess(Cmi_numpes)-1);
-}
-
-
-CmiCommHandle CmiAsyncBroadcastFn(size, msg)   /* ALL_EXCEPT_ME  */
-int size;
-char * msg;
-{
-/* Same as sync broadcast for now */
-       int i;
-
-       for (i=0; i<CpvAccess(Cmi_numpes); i++)
-               if (i != CpvAccess(Cmi_mype))
-                       nwrite(msg, size, i, MSG_TYPE, &cflag);
-        CQdCreate(CpvAccess(cQdState), CpvAccess(Cmi_numpes)-1);
-       return 0 ;
-}
-
-void CmiFreeBroadcastFn(size, msg)
-    int size;
-    char *msg;
-{
-    CmiSyncBroadcastFn(size,msg);
-    CmiFree(msg);
-}
-
-void CmiSyncBroadcastAllFn(size, msg)
-int size;
-char * msg;
-{
-       int dest = 0xffff;
-       nwrite(msg, size, dest, MSG_TYPE, &cflag); 
-        CQdCreate(CpvAccess(cQdState), CpvAccess(Cmi_numpes));
-}
-
-
-CmiCommHandle CmiAsyncBroadcastAllFn(size, msg)
-int size;
-char * msg;
-{
-       int dest = 0xffff;
-       nwrite(msg, size, dest, MSG_TYPE, &cflag); 
-        CQdCreate(CpvAccess(cQdState), CpvAccess(Cmi_numpes));
-       return 0 ;
-}
-
-void CmiFreeBroadcastAllFn(size, msg)
-int size;
-char * msg;
-{
-       int dest = 0xffff;
-       nwrite(msg, size, dest, MSG_TYPE, &cflag); 
-        CQdCreate(CpvAccess(cQdState), CpvAccess(Cmi_numpes));
-       CmiFree(msg) ; 
-}
-
-
-
-
-
-/************************** SETUP ***********************************/
-
-void ConverseExit()
-{
-  ConverseCommonExit();
-  exit(0);
-}
-
-void ConverseInit(argc, argv, fn, usched, initret)
-int argc;
-char *argv[];
-CmiStartFn fn;
-int usched, initret;
-{
-  CpvInitialize(int, Cmi_mype);
-  CpvInitialize(int, Cmi_numpes);
-  CpvInitialize(void*, CmiLocalQueue);
-  whoami(&CpvAccess(Cmi_mype), &process, &host, &Cmi_dim);
-  CpvAccess(Cmi_numpes) = (1 << Cmi_dim) ;
-  CpvAccess(CmiLocalQueue)= CdsFifo_Create();
-  CmiSpanTreeInit();
-  CmiTimerInit();
-  CthInit(argv);
-  ConverseCommonInit(argv);
-  if (initret==0) {
-    fn(argc, argv);
-    if (usched==0) CsdScheduler(-1);
-    ConverseExit();
-  }
-}
-
-/*@}*/
diff --git a/src/arch/net-axp/conv-mach.h b/src/arch/net-axp/conv-mach.h
deleted file mode 100644 (file)
index 29b36a1..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_OSF1                                           1
-
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          1
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               1
-#define CMK_RSH_NOT_NEEDED                                 0
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            0
-#define CMK_THREADS_USE_PTHREADS                           0
-#define CMK_THREADS_ARE_WIN32_FIBERS                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            1
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-
-#define CMK_LBDB_ON                                       1
-
-
-
-#endif
-
diff --git a/src/arch/net-axp/conv-mach.sh b/src/arch/net-axp/conv-mach.sh
deleted file mode 100644 (file)
index 082401e..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc -D_REENTRANT'
-CMK_CXX='g++ -D_REENTRANT'
-CMK_CXXPP="$CMK_CXX -x c++ -E "
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt -lpthread'
-CMK_LD_LIBRARY_PATH="-rpath $CHARMLIBSO/"
-CMK_LD_SHARED_THREAD="context"
-CMK_QT='axp-gcc'
-CMK_XIOPTS='-ansi'
-CMK_F90LIBS='-lUfor -lfor -lFutil'
diff --git a/src/arch/net-hp-ia64/cc-acc.h b/src/arch/net-hp-ia64/cc-acc.h
deleted file mode 100644 (file)
index 9f6d4eb..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-
-#include <stdlib.h>
-
-#undef CMK_USE_HP_MAIN_FIX
-#define CMK_USE_HP_MAIN_FIX                                0
diff --git a/src/arch/net-hp-ia64/cc-acc.sh b/src/arch/net-hp-ia64/cc-acc.sh
deleted file mode 100644 (file)
index e850049..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp -P'
-CMK_CPP_C='cc -E'
-CMK_CC='cc -D_HPUX_SOURCE '
-CMK_CC_RELIABLE='cc -D_HPUX_SOURCE '
-CMK_CC_FASTEST='cc -D_HPUX_SOURCE '
-CMK_CXX='aCC -Aa -w -D_HPUX_SOURCE '
-CMK_CXXPP='aCC -Aa -w -D_HPUX_SOURCE -E '
-CMK_C_OPTIMIZE='+O3 +Onolimit '
-CMK_LD='cc -D_HPUX_SOURCE '
-CMK_LDXX='aCC -Aa -w '
-CMK_NATIVE_CC='cc -D_HPUX_SOURCE '
-CMK_NATIVE_LD='cc -D_HPUX_SOURCE '
-CMK_NATIVE_CXX='aCC -Aa -w -D_HPUX_SOURCE '
-CMK_NATIVE_LDXX='aCC -Aa -w -D_HPUX_SOURCE '
-CMK_CPP_SUFFIX="i"
-CMK_XLATPP='charmxlat++ '
-CMK_QT='generic'
diff --git a/src/arch/net-hp-ia64/conv-mach-gm.h b/src/arch/net-hp-ia64/conv-mach-gm.h
deleted file mode 100644 (file)
index e51cf9f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-
-#define GM_CPU_DEFINED                                 1
-#define GM_CPU_ia64                                    1
-
-#undef CMK_USE_GM
-#define CMK_USE_GM                                         1
-
-#undef CMK_NETPOLL
-#define CMK_NETPOLL                                        1
-
-#undef __ONESIDED_IMPL
-#define __ONESIDED_IMPL 1
-
-#undef __ONESIDED_GM_HARDWARE
-#undef __ONESIDED_NO_HARDWARE
-#define __ONESIDED_GM_HARDWARE  1
diff --git a/src/arch/net-hp-ia64/conv-mach-gm.sh b/src/arch/net-hp-ia64/conv-mach-gm.sh
deleted file mode 100644 (file)
index a69cd92..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-test -z "$CMK_INCDIR" && CMK_INCDIR='-I/usr/gm/include'
-test -z "$CMK_LIBDIR" && CMK_LIBDIR='-L/usr/gm/lib'
-
-CMK_LIBS="$CMK_LIBS -lgm"
diff --git a/src/arch/net-hp-ia64/conv-mach.h b/src/arch/net-hp-ia64/conv-mach.h
deleted file mode 100644 (file)
index 8790808..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_IS_HETERO                                      1
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 0
-#define CMK_RSH_USE_REMSH                                  1
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            1
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                1
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       1
-
-#define CMK_LBDB_ON                                       1
-
-#define CMK_NO_ISO_MALLOC                                 1
-
-
-#endif
-
diff --git a/src/arch/net-hp-ia64/conv-mach.sh b/src/arch/net-hp-ia64/conv-mach.sh
deleted file mode 100644 (file)
index 728ddea..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc '
-CMK_CXX='g++'
-CMK_CXXPP='g++ -E '
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='true'
-CMK_LIBS='-lckqt'
-CMK_NATIVE_LD='gcc -static '
-CMK_NATIVE_LDXX='g++ -static '
-CMK_XIOPTS=''
-
diff --git a/src/arch/net-hp/cc-acc.h b/src/arch/net-hp/cc-acc.h
deleted file mode 100644 (file)
index ba66ab2..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-
-#undef CMK_USE_HP_MAIN_FIX
-#define CMK_USE_HP_MAIN_FIX                                1
diff --git a/src/arch/net-hp/cc-acc.sh b/src/arch/net-hp/cc-acc.sh
deleted file mode 100644 (file)
index c9c24c2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp -P'
-CMK_CPP_C='cc +DAportable -Aa -E'
-CMK_CC='cc +DAportable -Aa -D_HPUX_SOURCE +Z '
-CMK_CC_RELIABLE='cc +DAportable -Aa -D_HPUX_SOURCE '
-CMK_CC_FASTEST='cc +DAportable -Aa -D_HPUX_SOURCE '
-CMK_CXX='aCC -Aa -w +DAportable -D_HPUX_SOURCE +Z '
-CMK_CXXPP='aCC -Aa -w +DAportable -D_HPUX_SOURCE -E '
-CMK_C_OPTIMIZE='+O3 +Onolimit '
-#CMK_LD='cc +DAportable -D_HPUX_SOURCE '
-CMK_LD='aCC -Aa -w +DAportable '
-CMK_LDXX='aCC -Aa -w +DAportable '
-CMK_LD_SHARED='-b'
-CMK_NATIVE_CC='cc +DAportable -Aa -D_HPUX_SOURCE '
-CMK_NATIVE_LD='cc +DAportable -Aa -D_HPUX_SOURCE '
-CMK_NATIVE_CXX='aCC -Aa -w +DAportable -D_HPUX_SOURCE '
-CMK_NATIVE_LDXX='aCC -Aa -w +DAportable -D_HPUX_SOURCE '
-CMK_CPP_SUFFIX="i"
-CMK_XLATPP='charmxlat++ '
-CMK_QT='hpux-cc'
diff --git a/src/arch/net-hp/cc-cc.h b/src/arch/net-hp/cc-cc.h
deleted file mode 100644 (file)
index 7d86d79..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#include <stdlib.h>
-
-#undef CMK_USE_HP_MAIN_FIX
-#define CMK_USE_HP_MAIN_FIX                                1
diff --git a/src/arch/net-hp/cc-cc.sh b/src/arch/net-hp/cc-cc.sh
deleted file mode 100644 (file)
index fe1d2ed..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-CMK_CPP_C='cc -Aa -E '
-CMK_CC='cc -Aa -D_HPUX_SOURCE +DAportable -w '
-CMK_CC_RELIABLE='cc -Aa -D_HPUX_SOURCE +DAportable '
-CMK_CC_FASTEST='cc -Aa -D_HPUX_SOURCE +DAportable '
-CMK_CXX='CC -D_HPUX_SOURCE +DAportable -w '
-CMK_CXXPP='CC -Aa -D_HPUX_SOURCE -E +DAportable '
-CMK_C_OPTIMIZE='+O3 +Onolimit '
-CMK_CXX_OPTIMIZE='+O3 +Onolimit '
-CMK_LD='cc -Aa -D_HPUX_SOURCE +DAportable '
-CMK_LDXX='CC -Aa -D_HPUX_SOURCE -Wl,+n +DAportable '
-CMK_NATIVE_CC='cc -Aa -D_HPUX_SOURCE +DAportable '
-CMK_NATIVE_LD='cc -Aa -D_HPUX_SOURCE +DAportable '
-CMK_NATIVE_CXX='CC -Aa -D_HPUX_SOURCE +DAportable '
-CMK_NATIVE_LDXX='CC -Aa -D_HPUX_SOURCE +DAportable '
-CMK_CPP_SUFFIX="i"
-CMK_XLATPP='charmxlat++ '
-CMK_QT='hpux-cc'
-
diff --git a/src/arch/net-hp/conv-mach.h b/src/arch/net-hp/conv-mach.h
deleted file mode 100644 (file)
index f8f1537..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_IS_HETERO                                      1
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 0
-#define CMK_RSH_USE_REMSH                                  1
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                1
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       1
-
-#define CMK_LBDB_ON                                       1
-
-#define CMK_NO_ISO_MALLOC                                 1
-
-
-#endif
-
diff --git a/src/arch/net-hp/conv-mach.sh b/src/arch/net-hp/conv-mach.sh
deleted file mode 100644 (file)
index 6e72e7c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc '
-CMK_CXX='g++'
-CMK_CXXPP='g++ -E '
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='true'
-CMK_LIBS='-lckqt'
-CMK_LD_SHARED="-r"
-CMK_LD_LIBRARY_PATH="-Wl,+b$CHARMLIBSO/"
-CMK_SHARED_SUF="sl"
-CMK_NATIVE_LIBS=''
-CMK_NATIVE_LD='gcc -static '
-CMK_NATIVE_LDXX='g++ -static '
-CMK_QT='hpux-gcc'
-CMK_XIOPTS=''
-
diff --git a/src/arch/net-irix/cc-cc.h b/src/arch/net-irix/cc-cc.h
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/src/arch/net-irix/cc-cc.sh b/src/arch/net-irix/cc-cc.sh
deleted file mode 100644 (file)
index 1edb865..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-CMK_CPP_C='cc -32 -E '
-CMK_CC='cc  -w -32 '
-CMK_CC_RELIABLE='cc  -w -32 '
-CMK_CC_FASTEST='cc  -w -32 '
-CMK_CXX='CC -w -32 '
-CMK_CXXPP='CC -E -w -32 '
-CMK_LD='cc -w -32 '
-CMK_LDXX='CC -w -32 '
-CMK_NATIVE_CC='cc -w -32 '
-CMK_NATIVE_LD='cc -w -32 '
-CMK_NATIVE_CXX='CC -w -32 '
-CMK_NATIVE_LDXX='CC -w -32 '
-CMK_QT='irix5-cc'
diff --git a/src/arch/net-irix/cc-cc64.h b/src/arch/net-irix/cc-cc64.h
deleted file mode 100644 (file)
index e1178b8..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#undef CMK_MEMORY_PAGESIZE
-#define CMK_MEMORY_PAGESIZE                                16384
diff --git a/src/arch/net-irix/cc-cc64.sh b/src/arch/net-irix/cc-cc64.sh
deleted file mode 100644 (file)
index b6575cc..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-CMK_CPP_C='cc -64 -E '
-CMK_CC='cc  -w -64 '
-CMK_CC_RELIABLE='cc  -w -64 '
-CMK_CC_FASTEST='cc  -w -64 '
-CMK_CXX='CC -w -64 '
-CMK_CXXPP='CC -E -w -64 '
-
-CMK_CF90='f90 -64 '
-
-CMK_LD='cc -w -64 '
-CMK_LDXX='CC -w -64 '
-CMK_NATIVE_CC='cc -w -64 '
-CMK_NATIVE_LD='cc -w -64 '
-CMK_NATIVE_CXX='CC -w -64 '
-CMK_NATIVE_LDXX='CC -w -64 '
-CMK_F90LIBS='-L/usr/lib64 -lfortran -lftn'
-CMK_QT='origin'
diff --git a/src/arch/net-irix/conv-mach.h b/src/arch/net-irix/conv-mach.h
deleted file mode 100644 (file)
index a294f91..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
-
-#define CMK_DEFAULT_MAIN_USES_COMMON_CODE                  1
-#define CMK_DEFAULT_MAIN_USES_SIMULATOR_CODE               0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          1
-
-#define CMK_IS_HETERO                                      1
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_GNUOLD_MALLOC                       0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               1
-#define CMK_RSH_NOT_NEEDED                                 0
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_ARE_WIN32_FIBERS                       0
-#define CMK_THREADS_USE_PTHREADS                           0
-#define CMK_THREADS_USE_CONTEXT                            0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                1
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_NETPOLL                                        1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       0
-
-#define CMK_LBDB_ON                                       1
-
-
-
-
-#endif
-
diff --git a/src/arch/net-irix/conv-mach.sh b/src/arch/net-irix/conv-mach.sh
deleted file mode 100644 (file)
index 57c9a94..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp '
-CMK_CPP_C='gcc -E '
-CMK_CC='gcc '
-CMK_CXX='g++ '
-CMK_CXXPP='g++ -E '
-CMK_CF77='f77'
-CMK_CF90='f90 '
-CMK_RANLIB='true'
-CMK_LIBS='-lckqt'
-CMK_F90LIBS='-L/usr/lib32 -lfortran -lftn'
-CMK_QT='irix5-gcc'
-CMK_XIOPTS=''
-
diff --git a/src/arch/net-linux-axp/cc-cxx.h b/src/arch/net-linux-axp/cc-cxx.h
deleted file mode 100644 (file)
index ad7261a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-#undef  CMK_COMPILEMODE_ORIG
-#undef  CMK_COMPILEMODE_ANSI
-#define CMK_COMPILEMODE_ORIG                               0
-#define CMK_COMPILEMODE_ANSI                               1
diff --git a/src/arch/net-linux-axp/cc-cxx.sh b/src/arch/net-linux-axp/cc-cxx.sh
deleted file mode 100644 (file)
index 9e54fb7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-CMK_CPP_C='ccc -E'
-CMK_CC='ccc '
-CMK_CC_RELIABLE='ccc -D_REENTRANT'
-CMK_CC_FASTEST='ccc -D_REENTRANT'
-CMK_CXX='cxx -D_REENTRANT'
-CMK_CXXPP='cxx -x c++ -E '
-CMK_LD='ccc -D_REENTRANT'
-CMK_LDXX='cxx -D_REENTRANT'
-CMK_NATIVE_CC='ccc'
-CMK_NATIVE_LD='ccc'
-CMK_NATIVE_CXX='cxx'
-CMK_NATIVE_LDXX='cxx'
diff --git a/src/arch/net-linux-axp/conv-mach-scyld.h b/src/arch/net-linux-axp/conv-mach-scyld.h
deleted file mode 100644 (file)
index 40139cb..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#define CMK_SCYLD                                          1
-
-#undef CMK_ASYNC_NOT_NEEDED
-#undef CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN
-#define CMK_ASYNC_NOT_NEEDED                               1
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 0
diff --git a/src/arch/net-linux-axp/conv-mach-scyld.sh b/src/arch/net-linux-axp/conv-mach-scyld.sh
deleted file mode 100644 (file)
index c54b46e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-CMK_LIBS="$CMK_LIBS -lbproc"
-CMK_NATIVE_LIBS="$CMK_NATIVE_LIBS -lbproc"
diff --git a/src/arch/net-linux-axp/conv-mach.h b/src/arch/net-linux-axp/conv-mach.h
deleted file mode 100644 (file)
index bf87ea6..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
-#define CMK_WEB_MODE                                       1
-#define CMK_DEBUG_MODE                                     0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               1
-#define CMK_RSH_NOT_NEEDED                                 0
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            1
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-
-#define CMK_LBDB_ON                                       1
-
-
-
-#endif
-
diff --git a/src/arch/net-linux-axp/conv-mach.sh b/src/arch/net-linux-axp/conv-mach.sh
deleted file mode 100644 (file)
index 1758005..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc -D_REENTRANT'
-CMK_CXX='g++ -D_REENTRANT'
-CMK_CXXPP='g++ -x c++ -E '
-CMK_LD_SHARED_THREAD="pthreads"
-CMK_LD_LIBRARY_PATH="-Wl,-rpath,$CHARMLIBSO/"
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt'
-CMK_QT='axp-osf1-cc'
-CMK_XIOPTS='-ansi'
-
diff --git a/src/arch/net-sun/conv-mach.h b/src/arch/net-sun/conv-mach.h
deleted file mode 100644 (file)
index 3a1e7ec..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_ASYNC_NOT_NEEDED                               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_FIOSETOWN               0
-#define CMK_ASYNC_USE_FIOASYNC_AND_SIOCSPGRP               0
-#define CMK_ASYNC_USE_FIOSSAIOSTAT_AND_FIOSSAIOOWN         0
-#define CMK_ASYNC_USE_F_SETFL_AND_F_SETOWN                 1
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          1
-#define CMK_MALLOC_USE_OS_BUILTIN                          0
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               1
-#define CMK_RSH_NOT_NEEDED                                 0
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           1
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       1
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            1
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 unknown
-#define CMK_TYPEDEF_INT4 unknown
-#define CMK_TYPEDEF_INT8 unknown
-#define CMK_TYPEDEF_UINT2 unknown
-#define CMK_TYPEDEF_UINT4 unknown
-#define CMK_TYPEDEF_UINT8 unknown
-#define CMK_TYPEDEF_FLOAT4 unknown
-#define CMK_TYPEDEF_FLOAT8 unknown
-
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   0
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     1
-
-
-
-#define CMK_LBDB_ON                                       0
-
-
-
-
-#endif
-
diff --git a/src/arch/net-sun/conv-mach.sh b/src/arch/net-sun/conv-mach.sh
deleted file mode 100644 (file)
index c5c7fc9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc '
-CMK_CXX='g++ '
-CMK_CXXPP='g++ -x c++ -E '
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt'
-CMK_QT='sunos-gcc'
-CMK_XIOPTS=''
diff --git a/src/arch/origin-pthreads/charmrun b/src/arch/origin-pthreads/charmrun
deleted file mode 100755 (executable)
index cbfc313..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-#
-# Just executes all its arguments.
-PATH=.:$PATH
-export PATH
-$*
diff --git a/src/arch/origin-pthreads/conv-mach.h b/src/arch/origin-pthreads/conv-mach.h
deleted file mode 100644 (file)
index 4551b0a..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_ORIGIN2000                                    1
-#define CMK_CCS_AVAILABLE                                  0
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0
-
-#define CMK_DEFAULT_MAIN_USES_COMMON_CODE                  1
-
-
-#define CMK_GETPAGESIZE_AVAILABLE                          1
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-#define CMK_IS_HETERO                                      0
-
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 hdl,xhdl,info,stratid,root,redID,padding2,padding3; }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        0
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-#define CMK_SHARED_VARS_PTHREADS                           1
-
-#define CMK_SIGNAL_NOT_NEEDED                              1
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
-
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-
-#define CMK_LBDB_ON                                       0
-
-
-
-
-
-#endif
-
diff --git a/src/arch/origin-pthreads/conv-mach.sh b/src/arch/origin-pthreads/conv-mach.sh
deleted file mode 100644 (file)
index 35f3433..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp '
-CMK_CPP_C='cc -E -64 -D_SGI_MP_SOURCE '
-CMK_LDRO='ld -r -o'
-CMK_LDRO_WORKS=0
-CMK_CC='cc  -64 -D_SGI_MP_SOURCE '
-CMK_CXX='CC -64 -D_SGI_MP_SOURCE -LANG:std '
-CMK_CXXPP="$CMK_CXX -E"
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_AR='ar cq'
-CMK_RANLIB='true'
-CMK_LIBS=' -lckqt -lpthread '
-CMK_NATIVE_LIBS=' '
-CMK_NATIVE_CC='cc -64 '
-CMK_NATIVE_LD='cc -64 '
-CMK_NATIVE_CXX='CC -64 -LANG:std '
-CMK_NATIVE_LDXX='CC -64 -LANG:std '
-CMK_NM='nm'
-CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
-CMK_QT='origin'
-CMK_XIOPTS=''
diff --git a/src/arch/origin-pthreads/machine.c b/src/arch/origin-pthreads/machine.c
deleted file mode 100644 (file)
index f019229..0000000
+++ /dev/null
@@ -1,422 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/** @file
- * Origin Pthreads machine layer
- * @ingroup Machine
- * @{
- */
-
-#include <errno.h>
-#include <pthread.h>
-#include <sched.h>
-#include <time.h>
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <limits.h>
-#include <unistd.h>
-
-#include "converse.h"
-
-#define BLK_LEN  512
-
-typedef struct {
-  pthread_mutex_t mutex;
-  pthread_cond_t cond;
-  int waiting;
-  CdsFifo q;
-} McQueue;
-
-static McQueue *McQueueCreate(void);
-static void McQueueAddToBack(McQueue *queue, void *element);
-static void *McQueueRemoveFromFront(McQueue *queue);
-static McQueue **MsgQueue;
-
-CpvDeclare(void*, CmiLocalQueue);
-
-int Cmi_argc;
-int _Cmi_numpes;
-int Cmi_usched;
-int Cmi_initret;
-CmiStartFn Cmi_startFn;
-
-pthread_key_t perThreadKey;
-
-static void *threadInit(void *arg);
-
-pthread_mutex_t memory_mutex;
-
-void CmiMemLock() {pthread_mutex_lock(&memory_mutex);}
-void CmiMemUnlock() {pthread_mutex_unlock(&memory_mutex);}
-
-int barrier;
-pthread_cond_t barrier_cond;
-pthread_mutex_t barrier_mutex;
-
-void CmiNodeBarrier(void)
-{
-  pthread_mutex_lock(&barrier_mutex);
-  barrier++;
-  if(barrier!=CmiNumPes())
-    pthread_cond_wait(&barrier_cond, &barrier_mutex);
-  else {
-    barrier = 0;
-    pthread_cond_broadcast(&barrier_cond);
-  }
-  pthread_mutex_unlock(&barrier_mutex);
-}
-
-void CmiNodeAllBarrier(void)
-{
-  pthread_mutex_lock(&barrier_mutex);
-  barrier++;
-  if(barrier!=CmiNumPes()+1)
-    pthread_cond_wait(&barrier_cond, &barrier_mutex);
-  else {
-    barrier = 0;
-    pthread_cond_broadcast(&barrier_cond);
-  }
-  pthread_mutex_unlock(&barrier_mutex);
-}
-
-CmiNodeLock CmiCreateLock(void)
-{
-  pthread_mutex_t *lock;
-  lock = (pthread_mutex_t *) CmiAlloc(sizeof(pthread_mutex_t));
-  pthread_mutex_init(lock, (pthread_mutexattr_t *) 0);
-  return lock;
-}
-
-void CmiLock(CmiNodeLock lock)
-{
-  pthread_mutex_lock(lock);
-}
-
-void CmiUnlock(CmiNodeLock lock)
-{
-  pthread_mutex_unlock(lock);
-}
-
-int CmiTryLock(CmiNodeLock lock)
-{
-  return pthread_mutex_trylock(lock);
-}
-
-void CmiDestroyLock(CmiNodeLock lock)
-{
-  pthread_mutex_destroy(lock);
-}
-
-int CmiMyPe()
-{
-  int mype = (size_t) pthread_getspecific(perThreadKey);
-  return mype;
-}
-
-/***********************************************************************
- *
- * Abort function:
- *
- ************************************************************************/
-
-void CmiAbort(const char *message)
-{
-  CmiError(message);
-  abort();
-}
-
-int CmiAsyncMsgSent(CmiCommHandle msgid)
-{
-  return 1;
-}
-
-
-typedef struct {
-  char       **argv;
-  int        mype;
-} USER_PARAMETERS;
-
-void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
-{
-  int i;
-  USER_PARAMETERS *usrparam;
-  pthread_t *aThread;
-  _Cmi_numpes = 0; 
-  Cmi_usched = usched;
-  Cmi_initret = initret;
-  Cmi_startFn = fn;
-
-  CmiGetArgInt(argv,"+p",&_Cmi_numpes);
-  if (_Cmi_numpes <= 0)
-  {
-    CmiError("Error: requested number of processors is invalid %d\n",
-              _Cmi_numpes);
-    abort();
-  }
-
-
-  pthread_mutex_init(&memory_mutex, (pthread_mutexattr_t *) 0);
-
-  MsgQueue=(McQueue **)CmiAlloc(_Cmi_numpes*sizeof(McQueue *));
-  for(i=0; i<_Cmi_numpes; i++) 
-    MsgQueue[i] = McQueueCreate();
-
-  pthread_key_create(&perThreadKey, (void *) 0);
-  barrier = 0;
-  pthread_cond_init(&barrier_cond, (pthread_condattr_t *) 0);
-  pthread_mutex_init(&barrier_mutex, (pthread_mutexattr_t *) 0);
-
-  /* suggest to IRIX that we actually use the right number of processors */
-  pthread_setconcurrency(_Cmi_numpes);
-
-  Cmi_argc = CmiGetArgc(argv);
-  aThread = (pthread_t *) CmiAlloc(sizeof(pthread_t) * _Cmi_numpes);
-  for(i=1; i<_Cmi_numpes; i++) {
-    usrparam = (USER_PARAMETERS *) CmiAlloc(sizeof(USER_PARAMETERS));
-    usrparam->argv = CmiCopyArgs(argv);
-    usrparam->mype = i;
-
-    pthread_create(&aThread[i],(pthread_attr_t *)0,threadInit,(void *)usrparam);
-  }
-  usrparam = (USER_PARAMETERS *) CmiAlloc(sizeof(USER_PARAMETERS));
-  usrparam->argv = CmiCopyArgs(argv);
-  usrparam->mype = 0;
-  threadInit(usrparam);
-}
-
-void CmiTimerInit(char **argv);
-
-static void *threadInit(void *arg)
-{
-  USER_PARAMETERS *usrparam;
-  usrparam = (USER_PARAMETERS *) arg;
-
-
-  pthread_setspecific(perThreadKey, (void *) usrparam->mype);
-
-  CthInit(usrparam->argv);
-  ConverseCommonInit(usrparam->argv);
-  CpvInitialize(void*, CmiLocalQueue);
-  CpvAccess(CmiLocalQueue) = CdsFifo_Create();
-  CmiTimerInit(usrparam->argv);
-  if (Cmi_initret==0) {
-    Cmi_startFn(Cmi_argc, usrparam->argv);
-    if (Cmi_usched==0) CsdScheduler(-1);
-    ConverseExit();
-  }
-  return (void *) 0;
-}
-
-
-void ConverseExit(void)
-{
-  ConverseCommonExit();
-  CmiNodeBarrier();
-}
-
-
-void CmiDeclareArgs(void)
-{
-}
-
-
-void CmiNotifyIdle()
-{
-  McQueue *queue = MsgQueue[CmiMyPe()];
-  struct timespec ts;
-  pthread_mutex_lock(&(queue->mutex));
-  if(CdsFifo_Empty(queue->q)){
-    queue->waiting++;
-    ts.tv_sec = (time_t) 0;
-    ts.tv_nsec = 10000000L;
-    pthread_cond_timedwait(&(queue->cond), &(queue->mutex), &ts);
-    queue->waiting--;
-  }
-  pthread_mutex_unlock(&(queue->mutex));
-  return;
-}
-
-void *CmiGetNonLocal()
-{
-  return McQueueRemoveFromFront(MsgQueue[CmiMyPe()]);
-}
-
-
-void CmiSyncSendFn(int destPE, int size, char *msg)
-{
-  char *buf;
-
-  buf=(void *)CmiAlloc(size);
-  memcpy(buf,msg,size);
-  McQueueAddToBack(MsgQueue[destPE],buf); 
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-
-CmiCommHandle CmiAsyncSendFn(int destPE, int size, char *msg)
-{
-  CmiSyncSendFn(destPE, size, msg); 
-  return 0;
-}
-
-
-void CmiFreeSendFn(int destPE, int size, char *msg)
-{
-  if (CmiMyPe()==destPE) {
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-  } else {
-    McQueueAddToBack(MsgQueue[destPE],msg); 
-  }
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-void CmiSyncBroadcastFn(int size, char *msg)
-{
-  int i;
-  for(i=0; i<_Cmi_numpes; i++)
-    if (CmiMyPe() != i) CmiSyncSendFn(i,size,msg);
-}
-
-CmiCommHandle CmiAsyncBroadcastFn(int size, char *msg)
-{
-  CmiSyncBroadcastFn(size, msg);
-  return 0;
-}
-
-void CmiFreeBroadcastFn(int size, char *msg)
-{
-  CmiSyncBroadcastFn(size,msg);
-  CmiFree(msg);
-}
-
-void CmiSyncBroadcastAllFn(int size, char *msg)
-{
-  int i;
-  for(i=0; i<CmiNumPes(); i++) 
-    CmiSyncSendFn(i,size,msg);
-}
-
-
-CmiCommHandle CmiAsyncBroadcastAllFn(int size, char *msg)
-{
-  CmiSyncBroadcastAllFn(size, msg);
-  return 0; 
-}
-
-
-void CmiFreeBroadcastAllFn(int size, char *msg)
-{
-  int i;
-  for(i=0; i<CmiNumPes(); i++) {
-    if(CmiMyPe() != i) {
-      CmiSyncSendFn(i,size,msg);
-    }
-  }
-  CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-/* ****************************************************************** */
-/*    The following internal functions implements FIFO queues for     */
-/*    messages. These queues are shared among threads                 */
-/* ****************************************************************** */
-
-static void ** AllocBlock(unsigned int len)
-{
-  void **blk;
-
-  blk=(void **)CmiAlloc(len*sizeof(void *));
-  return blk;
-}
-
-static void 
-SpillBlock(void **srcblk, void **destblk, unsigned int first, unsigned int len)
-{
-  memcpy(destblk, &(srcblk[first]), (len-first)*sizeof(void *));
-  memcpy(&(destblk[len-first]),srcblk,first*sizeof(void *));
-}
-
-McQueue * McQueueCreate(void)
-{
-  McQueue *queue;
-
-  queue = (McQueue *) CmiAlloc(sizeof(McQueue));
-  pthread_mutex_init(&(queue->mutex), (pthread_mutexattr_t *) 0);
-  pthread_cond_init(&(queue->cond), (pthread_condattr_t *) 0);
-  queue->waiting = 0;
-  queue->q = CdsFifo_Create_len(BLK_LEN);
-  return queue;
-}
-
-void McQueueAddToBack(McQueue *queue, void *element)
-{
-  pthread_mutex_lock(&(queue->mutex));
-  CdsFifo_Enqueue(queue->q, element);
-  if(queue->waiting) {
-    pthread_cond_broadcast(&(queue->cond));
-  }
-  pthread_mutex_unlock(&(queue->mutex));
-}
-
-
-void * McQueueRemoveFromFront(McQueue *queue)
-{
-  void *element = 0;
-  pthread_mutex_lock(&(queue->mutex));
-  element = CdsFifo_Dequeue(queue->q);
-  pthread_mutex_unlock(&(queue->mutex));
-  return element;
-}
-
-/* Timer Routines */
-
-
-CpvStaticDeclare(double,inittime_wallclock);
-CpvStaticDeclare(double,inittime_virtual);
-
-void CmiTimerInit(char **argv)
-{
-  struct timespec temp;
-  CpvInitialize(double, inittime_wallclock);
-  CpvInitialize(double, inittime_virtual);
-  clock_gettime(CLOCK_SGI_CYCLE, &temp);
-  CpvAccess(inittime_wallclock) = (double) temp.tv_sec +
-                                 1e-9 * temp.tv_nsec;
-  CpvAccess(inittime_virtual) = CpvAccess(inittime_wallclock);
-}
-
-double CmiWallTimer(void)
-{
-  struct timespec temp;
-  double currenttime;
-
-  clock_gettime(CLOCK_SGI_CYCLE, &temp);
-  currenttime = (double) temp.tv_sec +
-                1e-9 * temp.tv_nsec;
-  return (currenttime - CpvAccess(inittime_wallclock));
-}
-
-double CmiCpuTimer(void)
-{
-  struct timespec temp;
-  double currenttime;
-
-  clock_gettime(CLOCK_SGI_CYCLE, &temp);
-  currenttime = (double) temp.tv_sec +
-                1e-9 * temp.tv_nsec;
-  return (currenttime - CpvAccess(inittime_virtual));
-}
-
-double CmiTimer(void)
-{
-  return CmiCpuTimer();
-}
-
-/*@}*/
diff --git a/src/arch/origin2000/charmrun b/src/arch/origin2000/charmrun
deleted file mode 100755 (executable)
index 9b9bc7a..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-#
-# Just executes all its arguments.
-# but move ++ options after the program.
-PATH=.:$PATH
-export PATH
-
-args=""
-cmd=""
-
-while [ $# -gt 0 ]
-do 
-       case $1 in
-       +p)
-               args=$args" "$1" "$2
-               shift
-               ;;
-       +p*)
-               args=$args" "$1
-               ;;
-       ++*)
-               args=$args" "$1
-               ;;
-       *)
-               cmd=$cmd" "$1
-               ;;
-       esac
-       shift
-done
-
-echo "$cmd $args"
-$cmd $args
diff --git a/src/arch/origin2000/conv-mach.h b/src/arch/origin2000/conv-mach.h
deleted file mode 100644 (file)
index 8bf772f..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_ORIGIN2000                                    1
-#define CMK_CCS_AVAILABLE                                  1
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0
-
-#define CMK_DEFAULT_MAIN_USES_COMMON_CODE                  1
-
-
-#define CMK_GETPAGESIZE_AVAILABLE                          1
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-#define CMK_IS_HETERO                                      0
-
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_MSG_HEADER_FIELDS  CmiUInt2 hdl,xhdl,info,stratid,root,redID,pad2,pad3;
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CMK_MSG_HEADER_FIELDS }
-#define CMK_MSG_HEADER_BLUEGENE    { CMK_MSG_HEADER_FIELDS CMK_BLUEGENE_FIELDS }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            0
-#define CMK_CONTEXT_STACKEND                               1
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                   1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-#define NODE_0_IS_CONVHOST                                 1
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       1
-
-
-#define CMK_LBDB_ON                                       1
-
-
-
-
-#endif
-
diff --git a/src/arch/origin2000/conv-mach.sh b/src/arch/origin2000/conv-mach.sh
deleted file mode 100644 (file)
index e9d592e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp '
-CMK_CPP_C='cc -E -64 '
-CMK_LDRO='ld -r -o'
-CMK_LDRO_WORKS=0
-CMK_CC='cc  -64 '
-CMK_CXX='CC -64 -LANG:std '
-CMK_CXXPP="$CMK_CXX -E"
-CMK_CF77='f77'
-CMK_CF90='f90 -64 '
-CMK_C_OPTIMIZE='-O3 -r10000 -INLINE:all -TARG:platform=ip27 -OPT:Olimit=0:roundoff=3:div_split=ON:alias=typed '
-CMK_CXX_OPTIMIZE='-O3 -r10000 -INLINE:all -TARG:platform=ip27 -OPT:Olimit=0:roundoff=3:div_split=ON:alias=typed '
-CMK_LD="$CMK_CC -w"
-CMK_LDXX="$CMK_CXX -w"
-CMK_LD_SHARED_THREAD="context"
-CMK_AR="$CMK_CXX -ar -o"
-CMK_RANLIB='true'
-CMK_LIBS=' -lckqt -lfastm '
-CMK_LD_LIBRARY_PATH="-rpath $CHARMLIBSO/"
-CMK_NM='nm'
-CMK_NM_FILTER="grep '|GLOB |' | sed -e 's/.*|//'"
-CMK_QT='origin'
-CMK_XIOPTS=''
-CMK_F90OBJS='fmain.o'
-CMK_F90LIBS='-L/usr/lib64 -lfortran -lftn'
-CMK_MOD_NAME_ALLCAPS=1
-CMK_MOD_EXT='mod'
diff --git a/src/arch/origin2000/machine.c b/src/arch/origin2000/machine.c
deleted file mode 100644 (file)
index 2fba936..0000000
+++ /dev/null
@@ -1,443 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/** @file
- * Origin2000 machine layer
- * @ingroup Machine
- * @{
- */
-
-#include <sys/types.h>
-#include <sys/sysmp.h>
-#include <sys/sysinfo.h>
-#include <sys/prctl.h>
-#include <sys/pda.h>
-#include <ulocks.h>
-#include <math.h>
-#include <stdlib.h>
-#include "converse.h"
-#include <time.h>
-
-usptr_t *arena;
-static barrier_t *barr;
-
-#define BLK_LEN  512
-typedef struct {
-  usema_t  *sema;
-  void     **blk;
-  unsigned int blk_len;
-  unsigned int first;
-  unsigned int len;
-  unsigned int maxlen;
-} McQueue;
-
-static McQueue *McQueueCreate(void);
-static void McQueueAddToBack(McQueue *queue, void *element);
-static void *McQueueRemoveFromFront(McQueue *queue);
-static McQueue **MsgQueue;
-#define g_malloc(s)  usmalloc(s,arena)
-#define g_free(p)    usfree(p,arena)
-
-#if NODE_0_IS_CONVHOST
-int inside_comm = 0;
-#endif
-
-CpvDeclare(void*, CmiLocalQueue);
-int _Cmi_mype;
-int _Cmi_numpes;
-int _Cmi_myrank;
-
-static int nthreads;
-static int requested_npe;
-static int arena_size_meg;
-
-static void threadInit(void *arg);
-
-int membusy;
-
-void CmiMemLock() {membusy=1;}
-void CmiMemUnlock() {membusy=0;}
-
-/***********************************************************************
- *
- * Abort function:
- *
- ************************************************************************/
-
-void CmiAbort(const char *message)
-{
-  CmiError(message);
-  exit(1);
-}
-
-int CmiAsyncMsgSent(CmiCommHandle msgid)
-{
-  return 1;
-}
-
-
-typedef struct {
-  void       *argv;
-  CmiStartFn fn;
-  int        argc;
-  int        npe;
-  int        mype;
-  int        usched;
-  int        initret;
-} USER_PARAMETERS;
-
-USER_PARAMETERS usrparam;
-
-void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
-{
-  int i;
-  requested_npe = 1; 
-  CmiGetArgInt(argv,"+p",&requested_npe);
-  CmiGetArgInt(argv,"++p",&requested_npe);
-  arena_size_meg = 128;
-  CmiGetArgInt(argv,"+memsize",&arena_size_meg);
-
-  if (requested_npe <= 0)
-  {
-    CmiError("Error: requested number of processors is invalid %d\n",
-              requested_npe);
-    abort();
-  }
-
-  usconfig(CONF_INITUSERS, requested_npe+1);
-  usconfig(CONF_ARENATYPE, US_SHAREDONLY);
-  /* this means the largest message size allowed is 128M */
-  if(usconfig(CONF_INITSIZE,  (arena_size_meg * 1<<20))==(-1)) {
-    CmiPrintf("Cannot set size of arena\n");
-    abort();
-  }
-  arena = usinit("/dev/zero");
-  if(arena == (usptr_t *) NULL) {
-    CmiError("Cannot allocate arena\n");
-    abort();
-  }
-  barr = new_barrier(arena);
-  init_barrier(barr);
-  nthreads = requested_npe;
-
-  usrparam.argc = argc;
-  usrparam.argv = CmiCopyArgs(argv);
-  usrparam.npe = requested_npe;
-  usrparam.fn = fn;
-  usrparam.initret = initret;
-  usrparam.usched = usched;
-
-  MsgQueue=(McQueue **)g_malloc(requested_npe*sizeof(McQueue *));
-  if (MsgQueue == (McQueue **)0) {
-    CmiError("Cannot Allocate Memory...\n");
-    abort();
-  }
-  for(i=0; i<requested_npe; i++) 
-    MsgQueue[i] = McQueueCreate();
-
-  for(i=1; i<requested_npe; i++) {
-    usrparam.mype = i;
-    sproc(threadInit, PR_SFDS, (void *)&usrparam);
-  }
-  usrparam.mype = 0;
-  threadInit(&usrparam);
-}
-
-/* static void neighbour_init(int); */
-
-void CmiTimerInit(char **argv);
-
-static void threadInit(void *arg)
-{
-  USER_PARAMETERS *usrparam;
-  usrparam = (USER_PARAMETERS *) arg;
-
-
-  CpvInitialize(void*, CmiLocalQueue);
-  _Cmi_mype  = usrparam->mype;
-  _Cmi_myrank = 0;
-  _Cmi_numpes =  usrparam->npe;
-#ifdef DEBUG
-  printf("thread %d/%d started \n", CmiMyPe(), CmiNumPes());
-#endif
-  prctl(PR_SETEXITSIG, SIGHUP,0);
-
-  CthInit(usrparam->argv);
-  CpvAccess(CmiLocalQueue) = CdsFifo_Create();
-  CmiTimerInit(usrparam->argv);
-  /*  neighbour_init(_Cmi_mype); */
-  usadd(arena);
-  ConverseCommonInit(usrparam->argv);
-  if (usrparam->initret==0 || usrparam->mype) {
-    usrparam->fn(CmiGetArgc(usrparam->argv), usrparam->argv);
-    if (usrparam->usched==0) {
-      CsdScheduler(-1);
-    }
-    ConverseExit();
-  }
-}
-
-
-void ConverseExit(void)
-{
-#if (CMK_DEBUG_MODE || CMK_WEB_MODE || NODE_0_IS_CONVHOST)
-  if (CmiMyPe() == 0){
-    CmiPrintf("End of program\n");
-  }
-#endif
-  prctl(PR_SETEXITSIG,0,0);
-  ConverseCommonExit();
-/*  barrier(barr, nthreads); */
-  exit(0);
-}
-
-
-void CmiDeclareArgs(void)
-{
-}
-
-
-void CmiNotifyIdle()
-{
-}
-
-void *CmiGetNonLocal()
-{
-  return McQueueRemoveFromFront(MsgQueue[CmiMyPe()]);
-}
-
-
-void CmiSyncSendFn(int destPE, int size, char *msg)
-{
-  char *buf;
-
-  buf=(void *)g_malloc(size+8);
-  if(buf==(void *)0) {
-    CmiError("Cannot allocate memory of size %d!\n", size);
-    abort();
-  }
-  ((int *)buf)[0]=size;
-  buf += 8;
-
-#ifdef DEBUG
-  printf("Message of size %d allocated\n", CmiSize(buf));
-#endif
-  memcpy(buf,msg,size);
-  McQueueAddToBack(MsgQueue[destPE],buf); 
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-
-CmiCommHandle CmiAsyncSendFn(int destPE, int size, char *msg)
-{
-  CmiSyncSendFn(destPE, size, msg); 
-  return 0;
-}
-
-
-void CmiFreeSendFn(int destPE, int size, char *msg)
-{
-  if (_Cmi_mype==destPE) {
-    CQdCreate(CpvAccess(cQdState), 1);
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-  } else {
-    CmiSyncSendFn(destPE, size, msg);
-    CmiFree(msg);
-  }
-}
-
-void CmiSyncBroadcastFn(int size, char *msg)
-{
-  int i;
-  for(i=0; i<CmiNumPes(); i++)
-    if (CmiMyPe() != i) CmiSyncSendFn(i,size,msg);
-}
-
-CmiCommHandle CmiAsyncBroadcastFn(int size, char *msg)
-{
-  CmiSyncBroadcastFn(size, msg);
-  return 0;
-}
-
-void CmiFreeBroadcastFn(int size, char *msg)
-{
-  CmiSyncBroadcastFn(size,msg);
-  CmiFree(msg);
-}
-
-void CmiSyncBroadcastAllFn(int size, char *msg)
-{
-  int i;
-  for(i=0; i<CmiNumPes(); i++) 
-    CmiSyncSendFn(i,size,msg);
-}
-
-
-CmiCommHandle CmiAsyncBroadcastAllFn(int size, char *msg)
-{
-  CmiSyncBroadcastAllFn(size, msg);
-  return 0; 
-}
-
-
-void CmiFreeBroadcastAllFn(int size, char *msg)
-{
-  int i;
-  for(i=0; i<CmiNumPes(); i++) {
-    if(CmiMyPe() != i) {
-      CmiSyncSendFn(i,size,msg);
-    }
-  }
-  CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-/* ****************************************************************** */
-/*    The following internal functions implements FIFO queues for     */
-/*    messages. These queues are shared among threads                 */
-/* ****************************************************************** */
-
-static void ** AllocBlock(unsigned int len)
-{
-  void ** blk;
-
-  blk=(void **)g_malloc(len*sizeof(void *));
-  if(blk==(void **)0) {
-    CmiError("Cannot Allocate Memory!\n");
-    abort();
-  }
-  return blk;
-}
-
-static void 
-SpillBlock(void **srcblk, void **destblk, unsigned int first, unsigned int len)
-{
-  memcpy(destblk, &srcblk[first], (len-first)*sizeof(void *));
-  memcpy(&destblk[len-first],srcblk,first*sizeof(void *));
-}
-
-McQueue * McQueueCreate(void)
-{
-  McQueue *queue;
-
-  queue = (McQueue *) g_malloc(sizeof(McQueue));
-  if(queue==(McQueue *)0) {
-    CmiError("Cannot Allocate Memory!\n");
-    abort();
-  }
-  queue->sema = usnewsema(arena, 1);
-  usinitsema(queue->sema, 1);
-  queue->blk = AllocBlock(BLK_LEN);
-  queue->blk_len = BLK_LEN;
-  queue->first = 0;
-  queue->len = 0;
-  queue->maxlen = 0;
-  return queue;
-}
-
-void McQueueAddToBack(McQueue *queue, void *element)
-{
-#if NODE_0_IS_CONVHOST
-  inside_comm = 1;
-#endif
-#ifdef DEBUG
-  printf("[%d] Waiting for lock\n",CmiMyPe());
-#endif
-  uspsema(queue->sema);
-#ifdef DEBUG
-  printf("[%d] Acquired lock\n",CmiMyPe());
-#endif
-  if(queue->len==queue->blk_len) {
-    void **blk;
-
-    queue->blk_len *= 3;
-    blk = AllocBlock(queue->blk_len);
-    SpillBlock(queue->blk, blk, queue->first, queue->len);
-    g_free(queue->blk);
-    queue->blk = blk;
-    queue->first = 0;
-  }
-  queue->blk[(queue->first+queue->len++)%queue->blk_len] = element;
-  if(queue->len>queue->maxlen)
-    queue->maxlen = queue->len;
-  usvsema(queue->sema);
-#ifdef DEBUG
-  printf("[%d] released lock\n",CmiMyPe());
-#endif
-#if NODE_0_IS_CONVHOST
-  inside_comm = 0;
-#endif
-}
-
-
-void * McQueueRemoveFromFront(McQueue *queue)
-{
-  void *element = (void *) 0;
-  void *localmsg = (void *) 0;
-  if(queue->len) {
-    uspsema(queue->sema);
-    element = queue->blk[queue->first++];
-    queue->first = (queue->first+queue->blk_len)%queue->blk_len;
-    queue->len--;
-    usvsema(queue->sema);
-  }
-  if(element) {
-#ifdef DEBUG
-    printf("[%d] received message of size %d\n", CmiMyPe(), CmiSize(element));
-#endif
-    localmsg = CmiAlloc(CmiSize(element));
-    memcpy(localmsg, element, CmiSize(element));
-    g_free((char *)element-8);
-  }
-  return localmsg;
-}
-
-/* Timer Routines */
-
-
-CpvStaticDeclare(double,inittime_wallclock);
-CpvStaticDeclare(double,inittime_virtual);
-
-void CmiTimerInit(char **argv)
-{
-  struct timespec temp;
-  CpvInitialize(double, inittime_wallclock);
-  CpvInitialize(double, inittime_virtual);
-  clock_gettime(CLOCK_SGI_CYCLE, &temp);
-  CpvAccess(inittime_wallclock) = (double) temp.tv_sec +
-                                 1e-9 * temp.tv_nsec;
-  CpvAccess(inittime_virtual) = CpvAccess(inittime_wallclock);
-}
-
-double CmiWallTimer(void)
-{
-  struct timespec temp;
-  double currenttime;
-
-  clock_gettime(CLOCK_SGI_CYCLE, &temp);
-  currenttime = (double) temp.tv_sec +
-                1e-9 * temp.tv_nsec;
-  return (currenttime - CpvAccess(inittime_wallclock));
-}
-
-double CmiCpuTimer(void)
-{
-  struct timespec temp;
-  double currenttime;
-
-  clock_gettime(CLOCK_SGI_CYCLE, &temp);
-  currenttime = (double) temp.tv_sec +
-                1e-9 * temp.tv_nsec;
-  return (currenttime - CpvAccess(inittime_virtual));
-}
-
-double CmiTimer(void)
-{
-  return CmiCpuTimer();
-}
-
-/*@}*/
diff --git a/src/arch/shmem-axp/charmrun b/src/arch/shmem-axp/charmrun
deleted file mode 100755 (executable)
index 9f54b77..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Conv-host for TCS:
-#  Translates +pN-style conv-host options into 
-# prun -n N options.
-
-args=""
-pes=1
-
-while [ $# -gt 0 ]
-do
-       case $1 in
-       +p)
-               pes=$2
-               shift
-               ;;
-       +p*)
-               pes=`echo $1 | awk '{print substr($1,3)}'`
-               ;;
-       *) 
-               args="$args $1"
-               ;;
-       esac
-       shift
-done
-
-echo "Running on $pes processors: $args"
-
-prun -n $pes $args
diff --git a/src/arch/shmem-axp/conv-mach.h b/src/arch/shmem-axp/conv-mach.h
deleted file mode 100644 (file)
index a2a2714..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            1
-#define CMK_TIMER_USE_SPECIAL                              0
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 short
-#define CMK_TYPEDEF_INT8 int
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned short
-#define CMK_TYPEDEF_UINT8 unsigned int
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-#define CMK_USE_HP_MAIN_FIX                                1
-
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       1
-
-
-#define CMK_LBDB_ON                                       1
-
-#define CMK_SHMEM_H                                    <shmem.h>
-#define CMK_SHMEM_INIT                                    shmem_init()
-#define CMK_SHMEM_LOCK                                    1
-
-#endif
-
diff --git a/src/arch/shmem-axp/conv-mach.sh b/src/arch/shmem-axp/conv-mach.sh
deleted file mode 100644 (file)
index 5875685..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-CMK_CPP_CHARM='/lib/cpp -P'
-CMK_CPP_C='gcc -E'
-CMK_CC='gcc -D_REENTRANT'
-CMK_CXX='g++ -D_REENTRANT'
-CMK_CXXPP='g++ -x c++ -E '
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt -lshmem -lelan'
-CMK_QT='axp-gcc'
-CMK_XIOPTS='-ansi'
-
diff --git a/src/arch/sp3/conv-mach.h b/src/arch/sp3/conv-mach.h
deleted file mode 100644 (file)
index c600c10..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-#define CMK_CCS_AVAILABLE                                  0
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-#define CMK_IS_HETERO                                      0
-
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CmiUInt2 hdl,xhdl,info,stratid,root,redID,padding2,padding3; }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 1
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                1
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_SIGNAL_NOT_NEEDED                              1
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              0
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 int
-#define CMK_TYPEDEF_INT8 long
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned int
-#define CMK_TYPEDEF_UINT8 unsigned long
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-
-
-#define CMK_LBDB_ON                                       1
-
-
-
-
-
-#endif
-
diff --git a/src/arch/sp3/conv-mach.sh b/src/arch/sp3/conv-mach.sh
deleted file mode 100644 (file)
index 29bf817..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-CMK_CPP_CHARM='/usr/lib/cpp -P -D_NO_PROTO '
-CMK_CPP_C='/usr/lib/cpp -P -D_NO_PROTO '
-CMK_LDRO='ld -r -o '
-CMK_LDRO_WORKS=0
-CMK_CC='mpcc '  
-CMK_CXX='mpCC '
-CMK_CXXPP='xlC -E '
-CMK_CF77='mpxlf'
-CMK_CF90='mpxlf90'
-CMK_C_OPTIMIZE='-O3 -qstrict -Q  '
-CMK_CXX_OPTIMIZE='-O3 -qstrict -Q  '
-CMK_F90_OPTIMIZE='-O3 -qstrict -Q  '
-CMK_AR='ar cq'
-CMK_RANLIB='true'
-CMK_LIBS='-lckqt'
-CMK_NATIVE_LIBS=''  
-CMK_NATIVE_CC='xlc' 
-CMK_NATIVE_LD='xlc' 
-CMK_NATIVE_CXX='xlC' 
-CMK_NATIVE_LDXX='xlC' 
-CMK_NM='/bin/nm'  
-CMK_NM_FILTER="grep ^_CK_ | cut -f 1 -d ' '"
-CMK_QT='aix32-xlc'
-CMK_XIOPTS=''
-CMK_F90OBJS=''
-CMK_F90LIBS=''
-CMK_MOD_EXT='mod'
diff --git a/src/arch/sp3/machine.c b/src/arch/sp3/machine.c
deleted file mode 100644 (file)
index 356e136..0000000
+++ /dev/null
@@ -1,388 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/** @file
- * SP3 machine layer
- * @ingroup Machine
- * @{
- */
-
-#include <stdio.h>
-#include <sys/time.h>
-#include "converse.h"
-#include <mpproto.h>
-#include <sys/systemcfg.h>
-
-#define FLIPBIT(node,bitnumber) (node ^ (1 << bitnumber))
-
-int _Cmi_mype;
-int _Cmi_numpes;
-int _Cmi_myrank;
-CpvDeclare(void*, CmiLocalQueue);
-
-#define BLK_LEN  512
-
-static void **recdQueue_blk;
-static unsigned int recdQueue_blk_len;
-static unsigned int recdQueue_first;
-static unsigned int recdQueue_len;
-static void recdQueueInit(void);
-static void recdQueueAddToBack(void *element);
-static void *recdQueueRemoveFromFront(void);
-
-typedef struct msg_list {
-     int msgid;
-     char *msg;
-     struct msg_list *next;
-} SMSG_LIST;
-
-static int Cmi_dim;
-static double itime;
-
-static SMSG_LIST *sent_msgs=0;
-static SMSG_LIST *end_sent=0;
-
-static int allmsg, dontcare, msgtype;
-
-/**************************  TIMER FUNCTIONS **************************/
-
-void CmiTimerInit(char **argv)
-{
-  timebasestruct_t time;
-  read_real_time(&time, TIMEBASE_SZ);
-  time_base_to_time(&time, TIMEBASE_SZ);
-  itime=(double)time.tb_high + 1.0e-9*((double) time.tb_low);
-}
-
-double CmiTimer(void)
-{
-  double t;
-  timebasestruct_t time;
-  
-  read_real_time(&time, TIMEBASE_SZ);
-  time_base_to_time(&time, TIMEBASE_SZ);
-  t=(double)time.tb_high + 1.0e-9*((double) time.tb_low);
-  return (t-itime);
-}
-
-double CmiWallTimer(void)
-{
-  double t;
-  timebasestruct_t time;
-  
-  read_real_time(&time, TIMEBASE_SZ);
-  time_base_to_time(&time, TIMEBASE_SZ);
-  t=(double)time.tb_high + 1.0e-9*((double) time.tb_low);
-  return (t-itime);
-}
-
-double CmiCpuTimer(void)
-{
-  return CmiTimer();
-}
-
-static int CmiAllAsyncMsgsSent(void)
-{
-   SMSG_LIST *msg_tmp = sent_msgs;
-     
-   while(msg_tmp!=0) {
-    if(mpc_status(msg_tmp->msgid)<0)
-      return 0;
-    msg_tmp = msg_tmp->next;
-   }
-   return 1;
-}
-
-int CmiAsyncMsgSent(CmiCommHandle c) {
-     
-  SMSG_LIST *msg_tmp = sent_msgs;
-
-  while ((msg_tmp) && ((CmiCommHandle)msg_tmp->msgid != c))
-    msg_tmp = msg_tmp->next;
-     
-  if ((msg_tmp) && (mpc_status(msg_tmp->msgid)<0))
-    return 0;
-  else
-    return 1;
-}
-
-void CmiReleaseCommHandle(CmiCommHandle c)
-{
-  return;
-}
-
-
-static void CmiReleaseSentMessages(void)
-{
-  SMSG_LIST *msg_tmp=sent_msgs;
-  SMSG_LIST *prev=0;
-  SMSG_LIST *temp;
-     
-  while(msg_tmp!=0) {
-    if(mpc_status(msg_tmp->msgid)>=0) {
-      /* Release the message */
-      temp = msg_tmp->next;
-      if(prev==0)  /* first message */
-        sent_msgs = temp;
-      else
-        prev->next = temp;
-      CmiFree(msg_tmp->msg);
-      CmiFree(msg_tmp);
-      msg_tmp = temp;
-    } else {
-      prev = msg_tmp;
-      msg_tmp = msg_tmp->next;
-    }
-  }
-  end_sent = prev;
-}
-
-static void PumpMsgs(void)
-{
-  int src, type, mstat;
-  size_t nbytes;
-  char *msg;
-
-  while(1) {
-    src = dontcare; type = msgtype;
-    mpc_probe(&src, &type, &mstat);
-    if(mstat<0)
-      return;
-    msg = (char *) CmiAlloc((size_t) mstat);
-    mpc_brecv(msg, (size_t)mstat, &src, &type, &nbytes);
-    recdQueueAddToBack(msg);
-  }
-}
-
-/********************* MESSAGE RECEIVE FUNCTIONS ******************/
-
-void *CmiGetNonLocal(void)
-{
-  CmiReleaseSentMessages();
-  PumpMsgs();
-  return recdQueueRemoveFromFront();
-}
-
-void CmiNotifyIdle(void)
-{
-  CmiReleaseSentMessages();
-  PumpMsgs();
-}
-/********************* MESSAGE SEND FUNCTIONS ******************/
-
-void CmiSyncSendFn(int destPE, int size, char *msg)
-{
-  char *dupmsg = (char *) CmiAlloc(size);
-  memcpy(dupmsg, msg, size);
-  if (_Cmi_mype==destPE) {
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),dupmsg);
-    CQdCreate(CpvAccess(cQdState), 1);
-  }
-  else
-    CmiAsyncSendFn(destPE, size, dupmsg);
-}
-
-
-CmiCommHandle CmiAsyncSendFn(int destPE, int size, char *msg)
-{
-  SMSG_LIST *msg_tmp;
-  int msgid;
-     
-  mpc_send(msg, size, destPE, msgtype, &msgid);
-  msg_tmp = (SMSG_LIST *) CmiAlloc(sizeof(SMSG_LIST));
-  msg_tmp->msgid = msgid;
-  msg_tmp->msg = msg;
-  msg_tmp->next = 0;
-  if(sent_msgs==0)
-    sent_msgs = msg_tmp;
-  else
-    end_sent->next = msg_tmp;
-  end_sent = msg_tmp;
-  CQdCreate(CpvAccess(cQdState), 1);
-  return (CmiCommHandle) msgid;
-}
-
-void CmiFreeSendFn(int destPE, int size, char *msg)
-{
-  if (_Cmi_mype==destPE) {
-    CQdCreate(CpvAccess(cQdState), 1);
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-  } else {
-    CmiAsyncSendFn(destPE, size, msg);
-  }
-}
-
-
-/*********************** BROADCAST FUNCTIONS **********************/
-
-void CmiSyncBroadcastFn(int size, char *msg)     /* ALL_EXCEPT_ME  */
-{
-  int i ;
-     
-  for ( i=_Cmi_mype+1; i<_Cmi_numpes; i++ ) 
-    CmiSyncSendFn(i, size,msg) ;
-  for ( i=0; i<_Cmi_mype; i++ ) 
-    CmiSyncSendFn(i, size,msg) ;
-}
-
-
-CmiCommHandle CmiAsyncBroadcastFn(int size, char *msg)  
-{
-  int i ;
-
-  for ( i=_Cmi_mype+1; i<_Cmi_numpes; i++ ) 
-    CmiAsyncSendFn(i,size,msg) ;
-  for ( i=0; i<_Cmi_mype; i++ ) 
-    CmiAsyncSendFn(i,size,msg) ;
-  return (CmiCommHandle) (CmiAllAsyncMsgsSent());
-}
-
-void CmiFreeBroadcastFn(int size, char *msg)
-{
-   CmiSyncBroadcastFn(size,msg);
-   CmiFree(msg);
-}
-void CmiSyncBroadcastAllFn(int size, char *msg)        /* All including me */
-{
-  int i ;
-     
-  for ( i=0; i<_Cmi_numpes; i++ ) 
-    CmiSyncSendFn(i,size,msg) ;
-}
-
-CmiCommHandle CmiAsyncBroadcastAllFn(int size, char *msg)  
-{
-  int i ;
-
-  for ( i=1; i<_Cmi_numpes; i++ ) 
-    CmiAsyncSendFn(i,size,msg) ;
-  return (CmiCommHandle) (CmiAllAsyncMsgsSent());
-}
-
-void CmiFreeBroadcastAllFn(int size, char *msg)  /* All including me */
-{
-  int i ;
-     
-  for ( i=0; i<_Cmi_numpes; i++ ) 
-    CmiSyncSendFn(i,size,msg) ;
-  CmiFree(msg) ;
-}
-
-/************************** MAIN ***********************************/
-
-void ConverseExit(void)
-{
-  int msgid = allmsg; 
-  size_t nbytes;
-  ConverseCommonExit();
-  mpc_wait(&msgid, &nbytes);
-  exit(0);
-}
-
-void ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
-{
-  int n ;
-  int nbuf[4];
-  
-  _Cmi_myrank = 0;
-  mpc_environ(&_Cmi_numpes, &_Cmi_mype);
-  mpc_task_query(nbuf, 4, 3);
-  dontcare = nbuf[0];
-  allmsg = nbuf[1];
-  mpc_task_query(nbuf, 2, 2);
-  msgtype = nbuf[0];
-  
-  /* find dim = log2(numpes), to pretend we are a hypercube */
-  for ( Cmi_dim=0,n=_Cmi_numpes; n>1; n/=2 )
-    Cmi_dim++ ;
-  /* CmiSpanTreeInit(); */
-  CmiTimerInit(argv);
-  CpvInitialize(void *, CmiLocalQueue);
-  CpvAccess(CmiLocalQueue) = CdsFifo_Create();
-  recdQueueInit();
-  CthInit(argv);
-  ConverseCommonInit(argv);
-  if (initret==0) {
-    fn(argc, argv);
-    if (usched==0) CsdScheduler(-1);
-    ConverseExit();
-  }
-}
-
-/***********************************************************************
- *
- * Abort function:
- *
- ************************************************************************/
-
-void CmiAbort(const char *message)
-{
-  CmiError(message);
-  exit(1);
-}
-/* ****************************************************************** */
-/*    The following internal functions implement recd msg queue       */
-/* ****************************************************************** */
-
-static void ** AllocBlock(unsigned int len)
-{
-  void ** blk;
-
-  blk=(void **)CmiAlloc(len*sizeof(void *));
-  if(blk==(void **)0) {
-    CmiError("Cannot Allocate Memory!\n");
-    mpc_stopall(1);
-  }
-  return blk;
-}
-
-static void 
-SpillBlock(void **srcblk, void **destblk, unsigned int first, unsigned int len)
-{
-  memcpy(destblk, &srcblk[first], (len-first)*sizeof(void *));
-  memcpy(&destblk[len-first],srcblk,first*sizeof(void *));
-}
-
-void recdQueueInit(void)
-{
-  recdQueue_blk = AllocBlock(BLK_LEN);
-  recdQueue_blk_len = BLK_LEN;
-  recdQueue_first = 0;
-  recdQueue_len = 0;
-}
-
-void recdQueueAddToBack(void *element)
-{
-  if(recdQueue_len==recdQueue_blk_len) {
-    void **blk;
-    recdQueue_blk_len *= 3;
-    blk = AllocBlock(recdQueue_blk_len);
-    SpillBlock(recdQueue_blk, blk, recdQueue_first, recdQueue_len);
-    CmiFree(recdQueue_blk);
-    recdQueue_blk = blk;
-    recdQueue_first = 0;
-  }
-  recdQueue_blk[(recdQueue_first+recdQueue_len++)%recdQueue_blk_len] = element;
-}
-
-
-void * recdQueueRemoveFromFront(void)
-{
-  if(recdQueue_len) {
-    void *element;
-    element = recdQueue_blk[recdQueue_first++];
-    recdQueue_first %= recdQueue_blk_len;
-    recdQueue_len--;
-    return element;
-  }
-  return 0;
-}
-
-/*@}*/
diff --git a/src/arch/t3e/charmrun b/src/arch/t3e/charmrun
deleted file mode 100755 (executable)
index 9e169f5..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# Conv-host for Cray T3E:
-#  Translates +pN-style conv-host options into 
-# mpp -n N options.
-
-args=""
-pes=1
-
-while [ $# -gt 0 ]
-do
-       case $1 in
-       +p)
-               pes=$2
-               shift
-               ;;
-       +p*)
-               pes=`echo $1 | awk '{print substr($1,3)}'`
-               ;;
-       *) 
-               args="$args $1"
-               ;;
-       esac
-       shift
-done
-
-echo "Running on $pes processors: $args"
-
-mpprun -n $pes $args
diff --git a/src/arch/t3e/conv-mach.h b/src/arch/t3e/conv-mach.h
deleted file mode 100644 (file)
index cf10199..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-#ifndef _CONV_MACH_H
-#define _CONV_MACH_H
-
-
-#define CMK_CCS_AVAILABLE                                  1
-
-#define CMK_CMIDELIVERS_USE_COMMON_CODE                    1
-
-#define CMK_CMIPRINTF_IS_A_BUILTIN                         0
-
-#define CMK_GETPAGESIZE_AVAILABLE                          0
-
-#define CMK_HANDLE_SIGUSR                                  1
-
-#define CMK_IS_HETERO                                      0
-
-
-#define CMK_MALLOC_USE_GNU_MALLOC                          0
-#define CMK_MALLOC_USE_OS_BUILTIN                          1
-
-#define CMK_MEMORY_PAGESIZE                                8192
-#define CMK_MEMORY_PROTECTABLE                             0
-
-#define CMK_MSG_HEADER_FIELDS   char gap[56]; CmiUInt2 hdl,xhdl,info,stratid,root,redID,pad2,pad3;
-#define CMK_MSG_HEADER_BASIC  CMK_MSG_HEADER_EXT
-#define CMK_MSG_HEADER_EXT    { CMK_MSG_HEADER_FIELDS }
-#define CMK_MSG_HEADER_BLUEGENE    { CMK_MSG_HEADER_FIELDS CMK_BLUEGENE_FIELDS }
-
-#define CMK_MULTICAST_GROUP_TYPE                struct { unsigned pe, id; }
-#define CMK_MULTICAST_DEF_USE_COMMON_CODE                  1
-#define CMK_MULTICAST_LIST_USE_COMMON_CODE                 0
-#define CMK_MULTICAST_GROUP_USE_COMMON_CODE                0
-
-#define CMK_NODE_QUEUE_AVAILABLE                           0
-
-#define CMK_RSH_IS_A_COMMAND                               0
-#define CMK_RSH_NOT_NEEDED                                 1
-#define CMK_RSH_USE_REMSH                                  0
-
-#define CMK_SHARED_VARS_EXEMPLAR                           0
-#define CMK_SHARED_VARS_UNAVAILABLE                        1
-#define CMK_SHARED_VARS_UNIPROCESSOR                       0
-
-#define CMK_THREADS_USE_CONTEXT                            0
-#define CMK_CONTEXT_STACKMIDDLE                            1
-
-#define CMK_SIGNAL_NOT_NEEDED                              0
-#define CMK_SIGNAL_USE_SIGACTION                           0
-#define CMK_SIGNAL_USE_SIGACTION_WITH_RESTART              1
-
-#define CMK_SPANTREE_MAXSPAN                               4
-#define CMK_SPANTREE_USE_COMMON_CODE                       1
-
-#define CMK_SYNCHRONIZE_ON_TCP_CLOSE                       0
-
-#define CMK_THREADS_REQUIRE_NO_CPV                         0
-#define CMK_THREADS_COPY_STACK                             0
-
-#define CMK_TIMER_USE_GETRUSAGE                            0
-#define CMK_TIMER_USE_SPECIAL                              1
-#define CMK_TIMER_USE_TIMES                                0
-
-#define CMK_TYPEDEF_INT2 short
-#define CMK_TYPEDEF_INT4 short
-#define CMK_TYPEDEF_INT8 int
-#define CMK_TYPEDEF_UINT2 unsigned short
-#define CMK_TYPEDEF_UINT4 unsigned short
-#define CMK_TYPEDEF_UINT8 unsigned int
-#define CMK_TYPEDEF_FLOAT4 float
-#define CMK_TYPEDEF_FLOAT8 double
-
-#define CMK_VECTOR_SEND_USES_COMMON_CODE                        1
-
-#define CMK_WHEN_PROCESSOR_IDLE_BUSYWAIT                   1
-#define CMK_WHEN_PROCESSOR_IDLE_USLEEP                     0
-
-#define CMK_USE_HP_MAIN_FIX                                1
-
-#define NODE_0_IS_CONVHOST                                 1
-#define CMK_DEBUG_MODE                                     0
-#define CMK_WEB_MODE                                       1
-
-
-#define CMK_LBDB_ON                                       1
-
-
-#define CMK_TRACE_LOGFILE_NUM_CONTROL                      1
-
-
-#endif
-
diff --git a/src/arch/t3e/conv-mach.sh b/src/arch/t3e/conv-mach.sh
deleted file mode 100644 (file)
index dcfd322..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-CMK_CPP_CHARM='cpp'
-CMK_CPP_C='cc -E'
-CMK_CC='cc'
-CMK_CXX='CC'
-CMK_CXXPP='CC -E'
-CMK_CF77='f77'
-CMK_CF90='f90'
-CMK_C_OPTIMIZE='-O3'
-CMK_CXX_OPTIMIZE='-O3'
-CMK_RANLIB='ranlib'
-CMK_LIBS='-lckqt'
-CMK_QT='cray-t3e-cc'
-CMK_XIOPTS=''
-CMK_NO_BUILD_SHARED="true"
diff --git a/src/arch/t3e/machine.c b/src/arch/t3e/machine.c
deleted file mode 100644 (file)
index bd6d250..0000000
+++ /dev/null
@@ -1,911 +0,0 @@
-/*****************************************************************************
- * $Source$
- * $Author$
- * $Date$
- * $Revision$
- *****************************************************************************/
-
-/** @file
- * T3E machine layer
- * @ingroup Machine
- * This is a complete port, but could be made considerably more efficient
- * by handling asynchronous messages correctly, ie. without doing
- * an extra copy and synchronous send
- * @{
- */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <mpp/shmem.h>
-#include "converse.h"
-
-/*
- *  We require statically allocated variables for locks.  This defines
- *  the max number of processors available.
- */
-#define MAX_PES 2048
-
-/*
- * Some constants
- */
-enum boolean {false = 0, true = 1};
-enum {list_empty = -1 };
-
-
-/*
- * Local declarations for Cmi, used by common code
- */
-CpvDeclare(void*, CmiLocalQueue);
-int _Cmi_mype;
-int _Cmi_numpes;
-int _Cmi_myrank;
-
-/*
- * Local queue functions, used by common code to store messages 
- * to my own node efficiently.  These are used when 
- * CMK_CMIDELIVERS_USE_COMMON_CODE is true.
- */
-/*
- * Distributed list declarations.  This linked list goes across machines,
- * storing all the messages for this node until this processor copies them
- * into local memory.
- */
-typedef struct McDistListS
-{
-  int nxt_node;
-  struct McMsgHdrS *nxt_addr;
-  int msg_sz;
-} McDistList;
-
-typedef struct McMsgHdrS
-{
-  McDistList list_node;
-  enum {Unknown, Message, BcastMessage } msg_type;
-  enum boolean received_f;
-  union
-  {
-    struct McMsgHdrS *ptr;
-    int count;
-  } bcast;
-  int bcast_msg_size;
-  int handler;
-} McMsgHdr;
-
-
-/*
- * Mc functions, used in machine.c only.
- */
-static void McInit();
-static void McInitList();
-static void McEnqueueRemote(void *msg, int msg_sz, int dst_pe);
-static void McRetrieveRemote(void);
-static void McCleanUpInTransit(void);
-
-/*
- * These declarations are for a local linked list to hold messages which
- * have been copied into local memory.  It is a modified version of the
- * Origin2000 code with the locks removed.
- */
-/* Allocation block size, to reduce num of mallocs */
-#define BLK_LEN  512  
-
-typedef struct McQueueS
-{
-  void     **blk;
-  unsigned int blk_len;
-  unsigned int first;
-  unsigned int len;
-} McQueue;
-
-static McQueue *McQueueCreate(void);
-static void McQueueAddToBack(McQueue *queue, void *element);
-static void *McQueueRemoveFromFront(McQueue *queue);
-static void *McQueueRemoveFromBack(McQueue *queue);
-
-/*************************************************************
- * static variable declarations
- */
-/*
- *  Local queues used for mem management.
- *
- * These queues hold outgoing messages which will be picked up by
- * receiver PEs.  Garbage collection works by scanning the 
- * in_transit_queue for messages, freeing delivered ones, and moving
- * others to in_transit_tmp_queue.  Then the pointers are swapped,
- * so in_transit_queue contains all the undelivered messages, and
- * in_transit_tmp_queue is empty.
- */
-static McQueue *in_transit_queue;
-static McQueue *in_transit_tmp_queue;
-
-/* tmp_queue is used to invert the order of incoming messages */
-static McQueue *tmp_queue;  
-
-/* received_queue holds all the messages which have been moved
- * into local memory.  Messages are dequede from here.
- */
-static McQueue *received_queue;
-
-/* received_token_queue saves incoming broadcast-message tokens,
- * until McRetrieveRemote is done with them.
- */
-static McQueue *received_token_queue;
-
-/* outgoing broadcast message queue, holds messages until all receivers have
- * picked it up
- */
-static McQueue *broadcast_queue;
-static McQueue *broadcast_tmp_queue;
-
-/*
- * head is the pointer to my next incoming message.
- */
-static McDistList head;
-
-/* Static variables are necessary for locks. */
-static long *my_lock;
-static long head_lock[MAX_PES];
-static long bcast_lock[MAX_PES];
-
-#define ALIGN8(x)  (8*(((x)+7)/8))
-
-int McChecksum(char *msg, int size)
-{
-  int chksm;
-  int i;
-
-  chksm=0xff;
-  for(i=0; i < size; i++)
-    chksm ^= *(msg+i);
-  return chksm;
-}
-
-/**********************************************************************
- *  CMI Functions START HERE
- */
-
-
-/**********************************************************************
- * Cmi Message calls.  This implementation uses sync-type sends for
- * everything.  An async interface would be efficient, and not difficult
- * to add
- */
-void CmiSyncSendFn(int dest_pe, int size, char *msg)
-{
-  McMsgHdr *dup_msg;
-
-  dup_msg = (McMsgHdr *)CmiAlloc(ALIGN8(size));
-  memcpy(dup_msg,msg,size);
-  dup_msg->msg_type = Message;
-
-  McRetrieveRemote();
-
-  if (dest_pe == _Cmi_mype)
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),dup_msg);
-  else
-  {
-    McEnqueueRemote(dup_msg,ALIGN8(size),dest_pe); 
-  }
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-CmiCommHandle CmiAsyncSendFn(int dest_pe, int size, char *msg)
-{
-  CmiSyncSendFn(dest_pe, size, msg);
-  return 0;
-}
-
-void CmiFreeSendFn(int dest_pe, int size, char *msg)
-{
-  /* No need to copy message, since we will immediately free it */
-  McRetrieveRemote();
-  ((McMsgHdr *)msg)->msg_type = Message;
-
-  if (dest_pe == _Cmi_mype)
-    CdsFifo_Enqueue(CpvAccess(CmiLocalQueue),msg);
-  else
-  {
-    McEnqueueRemote(msg,size,dest_pe); 
-  }
-  CQdCreate(CpvAccess(cQdState), 1);
-}
-
-void CmiSyncBroadcastFn(int size, char *msg)
-{
-  int i;
-  McMsgHdr *dup_msg;
-  McMsgHdr bcast_msg_tok;
-  McMsgHdr *dup_tok;
-  int hdr_size;
-
-  /*
-   * Copy user's message, and set count to the correct number of recients
-   */
-  dup_msg = (McMsgHdr *)CmiAlloc(ALIGN8(size));
-  memcpy(dup_msg,msg,size);
-  dup_msg->bcast.count = _Cmi_numpes - 1;
-  /*
-  CmiPrintf("PE %d broadcast handler=%d\n",_Cmi_mype,dup_msg->handler);
-  */
-  /*
-   * Make the broadcast token point to the copied message
-   */
-  bcast_msg_tok.msg_type = BcastMessage;
-  bcast_msg_tok.bcast.ptr = dup_msg;
-  bcast_msg_tok.bcast_msg_size = size;
-
-  hdr_size = ALIGN8(sizeof(McMsgHdr));
-
-  /*
-   * Enqueue copies of the token message on other nodes.  This code should
-   * be similar to CmiSyncSend
-   */
-  for(i=0; i<_Cmi_numpes; i++)
-    if (i != _Cmi_mype)
-    {
-      dup_tok = (McMsgHdr *)CmiAlloc(ALIGN8(hdr_size));
-      memcpy(dup_tok,&bcast_msg_tok,hdr_size);
-      McEnqueueRemote(dup_tok,hdr_size,i); 
-    }
-  /*
-   * The token message will be deleted as a normal message,
-   * but the message being broadcast needs to be saved for future
-   * garbage collection.
-   */
-  McQueueAddToBack(broadcast_queue,dup_msg);
-  CQdCreate(CpvAccess(cQdState), _Cmi_numpes-1);
-}
-
-CmiCommHandle CmiAsyncBroadcastFn(int size, char *msg)
-{
-  CmiSyncBroadcastFn(size,msg);
-  return 0;
-}
-
-void CmiFreeBroadcastFn(int size, char *msg)
-{
-  CmiSyncBroadcastFn(size,msg);
-  CmiFree(msg);
-}
-
-void CmiSyncBroadcastAllFn(int size, char *msg)
-{
-  int i;
-  CmiSyncBroadcastFn(size,msg);
-  CmiSyncSendFn(_Cmi_mype, size, msg);
-}
-
-CmiCommHandle CmiAsyncBroadcastAllFn(int size, char *msg)
-{
-  CmiSyncBroadcastAllFn(size,msg);
-  return 0;
-}
-
-void CmiFreeBroadcastAllFn(int size, char *msg)
-{
-  CmiSyncBroadcastAllFn(size,msg);
-  CmiFree(msg);
-}
-
-
-void CmiSyncListSendFn(int npes, int *pes, int size, char *msg)
-{
-  int i;
-  McMsgHdr *dup_msg;
-  McMsgHdr bcast_msg_tok;
-  McMsgHdr *dup_tok;
-  int hdr_size;
-  int n_remote_pes;
-
-  /*
-   * Count how many remote PEs, and send to the local PE if it is in the list
-   */
-  /*
-  CmiPrintf("CmiSyncListSendFn: size %d handler %d\n",
-           size,((McMsgHdr *)msg)->handler);
-  CmiPrintf("CmiSyncListSendFn: size %d npes %d\n",size,npes);
-  */
-  n_remote_pes = 0;
-  for (i=0; i < npes; i++)
-  {
-    if (pes[i] == _Cmi_mype)
-      CmiSyncSendFn(_Cmi_mype, size, msg);
-    else
-      n_remote_pes++;
-  }
-  if (n_remote_pes == 0)  // Nothing to do
-    return;
-  
-  /*
-   * Copy user's message, and set count to the correct number of recients
-   */
-  dup_msg = (McMsgHdr *)CmiAlloc(ALIGN8(size));
-  memcpy(dup_msg,msg,size);
-  dup_msg->bcast.count = n_remote_pes;
-  /*
-   * Make the broadcast token point to the copied message
-   */
-  bcast_msg_tok.msg_type = BcastMessage;
-  bcast_msg_tok.bcast.ptr = dup_msg;
-  bcast_msg_tok.bcast_msg_size = size;
-
-  hdr_size = ALIGN8(sizeof(McMsgHdr));
-
-  /*
-   * Enqueue copies of the token message on other nodes.  This code should
-   * be similar to CmiSyncSend
-   */
-  for(i=0; i<npes; i++)
-    if (pes[i] != _Cmi_mype)
-    {
-      dup_tok = (McMsgHdr *)CmiAlloc(ALIGN8(hdr_size));
-      memcpy(dup_tok,&bcast_msg_tok,hdr_size);
-      McEnqueueRemote(dup_tok,hdr_size,pes[i]); 
-      CQdCreate(CpvAccess(cQdState), 1);
-    }
-  /*
-   * The token message will be deleted as a normal message,
-   * but the message being broadcast needs to be saved for future
-   * garbage collection.
-   */
-  McQueueAddToBack(broadcast_queue,dup_msg);
-}
-
-CmiCommHandle CmiAsyncListSendFn(int npes, int *pes, int size, char *msg)
-{
-  CmiSyncListSendFn(npes, pes, size, msg);
-  return 0;
-}
-
-void CmiFreeListSendFn(int npes, int *pes, int size, char *msg)
-{
-  CmiSyncListSendFn(npes,pes,size,msg);
-  CmiFree(msg);
-}
-
-typedef struct {
-  char header[CmiMsgHeaderSizeBytes];
-  CmiGroup grp;
-  int size;
-  char *user_msg;
-} McMultiMsg;
-
-CpvDeclare(int,McMulticastWaitHandler);
-
-void CmiSyncMulticastFn(CmiGroup grp, int size, char *msg)
-{
-  int npes;
-  int *pes;
-  McMultiMsg multi_msg;
-  
-  /*
-  CmiPrintf("CmiSyncMulticastFn: size %d handler %d\n",
-           size,((McMsgHdr *)msg)->handler);
-   */
-  /*
-   *  Check for group, and busy-wait, if necessary, for group info
-   */
-  CmiLookupGroup(grp, &npes, &pes);
-  if (pes != 0)
-    CmiSyncListSendFn( npes, pes, size, msg);
-  else
-  {
-    multi_msg.grp = grp;
-    multi_msg.size = size;
-    multi_msg.user_msg = (char *) CmiAlloc(ALIGN8(size));
-    memcpy(multi_msg.user_msg,msg,size);
-
-    CmiSetHandler(&multi_msg,CpvAccess(McMulticastWaitHandler));
-    CmiSyncSendFn(CmiMyPe(),sizeof(McMultiMsg),(char *)&multi_msg);
-  }
-}
-
-void McMulticastWaitFn(McMultiMsg *msg)
-{
-  CmiFreeMulticastFn(msg->grp,msg->size,msg->user_msg);
-}
-
-void CmiMulticastInit(void)
-{
-  CpvInitialize(int,McMulticastWaitHandler);
-  CpvAccess(McMulticastWaitHandler) = CmiRegisterHandler(McMulticastWaitFn);
-}
-
-CmiCommHandle CmiAsyncMulticastFn(CmiGroup grp, int size, char *msg)
-{
-  CmiSyncMulticastFn(grp, size, msg);
-  return 0;
-}
-
-void CmiFreeMulticastFn(CmiGroup grp, int size, char *msg)
-{
-  CmiSyncMulticastFn(grp, size, msg);
-  CmiFree(msg);
-}
-
-
-/***********************************************************************
- *
- * Abort function:
- *
- ************************************************************************/
-
-void CmiAbort(const char *message)
-{
-  CmiError(message);
-  globalexit(1);
-}
-
-/**********************************************************************
- * CMI utility functions for startup, shutdown, and other miscellaneous
- * activities.
- */
-
-/*
- * This port uses the common CmiDeliver code, so we only provide
- * CmiGetNonLocal()
- */
-void *CmiGetNonLocal()
-{
-  McRetrieveRemote();
-
-  return (void *)McQueueRemoveFromFront(received_queue);
-}
-
-void 
-ConverseInit(int argc, char **argv, CmiStartFn fn, int usched, int initret)
-{
-  McInit();
-  CthInit(argv);
-  ConverseCommonInit(argv);
-  for(argc=0;argv[argc];argc++);
-  if (initret==0)
-  {
-    fn(argc,argv);
-    if (usched==0) CsdScheduler(-1);
-    ConverseExit();
-  }
-}
-
-void ConverseExit()
-{
-#if (CMK_DEBUG_MODE || CMK_WEB_MODE || NODE_0_IS_CONVHOST)
-  if (CmiMyPe() == 0){
-    CmiPrintf("End of program\n");
-  }
-#endif
-  ConverseCommonExit();
-  localexit(0);
-}
-
-void CmiNotifyIdle(void)
-{
-  /* Use this opportunity to clean up the in_transit_queue */
-  McCleanUpInTransit();
-}
-
-/**********************************************************************
- * Mc Functions:
- * Mc functions are used internally in machine.c only
- */
-static void McInit(void)
-{
-  CpvInitialize(void *, CmiLocalQueue);
-  CpvAccess(CmiLocalQueue) = CdsFifo_Create();
-  _Cmi_mype = _my_pe();
-  _Cmi_numpes = _num_pes();
-  _Cmi_myrank = 0;
-
-  McInitList();
-}
-
-static void McInitList(void)
-{
-  int i;
-
-  received_queue = McQueueCreate();
-  tmp_queue = McQueueCreate();
-  received_token_queue = McQueueCreate();
-  broadcast_queue = McQueueCreate();
-  broadcast_tmp_queue = McQueueCreate();
-  in_transit_tmp_queue = McQueueCreate();
-  in_transit_queue = McQueueCreate();
-
-  head.nxt_node = list_empty;
-  head.nxt_addr = NULL;
-  head.msg_sz = 0;
-  if (_Cmi_numpes > MAX_PES)
-  {
-    CmiPrintf("Not enough processors allocated in machine.c.\n");
-    CmiPrintf("Change MAX_PES in t3e/machine.c to at least %d and recompile Converse\n",
-    _Cmi_numpes);
-  }
-  for(i=0; i < _Cmi_numpes; i++)
-  {
-    head_lock[i] = 0;
-    bcast_lock[i] = 0;
-  }
-  my_lock = &(head_lock[_Cmi_mype]);
-  barrier();
-  shmem_clear_lock(my_lock);
-  shmem_clear_lock(&bcast_lock[_Cmi_mype]);
-}
-
-static void McEnqueueRemote(void *msg, int msg_sz, int dst_pe)
-{
- /*
-  * To enqueue on a remote node, we should:
-  * 0. Free any delivered messages from the message_in_transit list.
-  * 1. Add message in the "message_in_transit" list
-  * 2. Fill in the fields in the message header
-  * 3. Lock the head pointer on the remote node.
-  * 4. Swap the list pointer with that on the other node.
-  * 5. Release lock
-  */
-
-  McDistList tmp_link;
-  McDistList *msg_link;
-
-  /*  CmiPrintf("PE %d outgoing msg = %d msg_type = %d size = %d\n",
-           _Cmi_mype,msg,((McMsgHdr *)msg)->msg_type,msg_sz);*/
-  /* 0. Free any delivered messages from the in_transit_queue list. */
-  McCleanUpInTransit();
-
-  /* 1. Add message in the "in_transit_queue" list */
-  McQueueAddToBack(in_transit_queue,msg);
-
-  /* 2. Fill in the fields in the message header */
-  msg_link = &(((McMsgHdr *)msg)->list_node);
-  ((McMsgHdr *)msg)->received_f = false;
-
-  /* Set list fields to point back to this processor, this message.  */
-  tmp_link.nxt_node = _Cmi_mype;
-  tmp_link.nxt_addr = msg;
-  tmp_link.msg_sz = msg_sz;
-
-  /* 3. Lock the head pointer on the remote node.
-     Acquire lock on the destination queue.  If locks turn oout to
-     be inefficient, use fetch and increment to imp. lock
-   */
-
-  shmem_set_lock(&(head_lock[dst_pe]));
-
-
-  /* 4. Swap the list pointer with that on the other node.
-   */
-  /* First, get current head pointer, and stick it in this 
-   * message data area.
-   */
-  shmem_get(msg_link, &head, sizeof(McDistList)/sizeof(int), dst_pe);
-  /* Next, write the new message into the top of the list */
-  shmem_put(&head, &tmp_link, sizeof(McDistList)/sizeof(int),dst_pe);
-
-#ifdef DEBUG
-  printf("[%d] Adding Message to pe %d\n",_Cmi_mype,dst_pe);
-  printf("[%d]   nxt_node = %d\n",_Cmi_mype,tmp_link.nxt_node);
-  printf("[%d]   nxt_addr = %x\n",_Cmi_mype,tmp_link.nxt_addr);
-  printf("[%d]   msg_sz = %x\n",_Cmi_mype,tmp_link.msg_sz);
-  printf("[%d] Old Message is now at %x\n",_Cmi_mype,msg_link);
-  printf("[%d]   nxt_node = %d\n",_Cmi_mype,msg_link->nxt_node);
-  printf("[%d]   nxt_addr = %x\n",_Cmi_mype,msg_link->nxt_addr);
-  printf("[%d]   msg_sz = %x\n",_Cmi_mype,msg_link->msg_sz);
-#endif
-
-  /* 5. Release lock */
-  shmem_clear_lock(&(head_lock[dst_pe]));
-}
-
-static void McRetrieveRemote(void)
-{
-  /*
-   * The local host should retrieve messages from the distributed list
-   * and put them in local memory, in a messages queue.
-   * Steps:
-   * 0) Lock list pointer.
-   * 1) Replace list pointer with NULL and unlock list
-   * 2) Get each message into local memory
-   * 3) Enqueue list into local message queue, in reverse order
-   */
-
-  McDistList list_head;
-  McDistList *cur_node;
-  McMsgHdr *cur_msg; 
-  int received_f;
-  enum boolean bcast_msg;
-  McMsgHdr *bcast_ptr;
-
-  /* Get the head of the list */
-
-  if (head.nxt_node == list_empty)  /* apparently there are no messages */
-    return;
-
-  /* 0) Lock list pointer. */
-  shmem_set_lock(my_lock);
-
-  /* 1) Replace list pointer with NULL and unlock list */
-  list_head = head;
-  head.nxt_node = list_empty;
-  head.nxt_addr = NULL;
-  head.msg_sz = 0;
-  shmem_clear_lock(my_lock);
-
-  /* 2) Get each message into local memory
-   * Start copying the messages into local memory, putting messages into
-   * a local list for future reversing.
-   */
-  cur_node = &list_head;
-  received_f = true;
-
-  while (cur_node->nxt_node != list_empty)
-  {
-    cur_msg = (McMsgHdr *)CmiAlloc(ALIGN8(cur_node->msg_sz));
-    if (cur_msg ==NULL)
-    {
-      CmiError("%s:%d Cannot Allocate Memory\n",__FILE__,__LINE__);
-      globalexit(1);
-    }
-
-    shmem_get(cur_msg, cur_node->nxt_addr,
-              ALIGN8(cur_node->msg_sz)/8, cur_node->nxt_node);
-
-    /*    CmiPrintf("PE %d incoming msg = %d msg_type = %d, size = %d\n",
-             _Cmi_mype,cur_msg,cur_msg->msg_type,cur_node->msg_sz);*/
-
-    /* If it is a broadcast message, retrieve the actual message */
-    if (cur_msg->msg_type == BcastMessage)
-    {
-
-      bcast_msg = true;
-      bcast_ptr = (McMsgHdr *)CmiAlloc(ALIGN8(cur_msg->bcast_msg_size));
-      shmem_set_lock(&(bcast_lock[cur_node->nxt_node]));
-
-      /*
-      CmiPrintf(
-       "PE %d getting message from node %d at addr %d to %d, size=%d\n",
-       _Cmi_mype,cur_node->nxt_node,cur_msg->bcast.ptr,bcast_ptr,
-       cur_msg->bcast_msg_size
-       );
-       */
-      /* Get the message */
-      shmem_get(bcast_ptr,cur_msg->bcast.ptr,
-               ALIGN8(cur_msg->bcast_msg_size)/8,cur_node->nxt_node);
-      /* Decrement the count, and write it back to the original node. */
-      /*
-      CmiPrintf(
-      "PE %d received broadcast message count=%d size=%d handler=%d\n",
-      _Cmi_mype,bcast_ptr->bcast.count,
-      cur_msg->bcast_msg_size,bcast_ptr->handler
-      );
-      */
-
-      bcast_ptr->bcast.count--;
-
-      shmem_put(&(cur_msg->bcast.ptr->bcast.count),
-               &bcast_ptr->bcast.count,1,cur_node->nxt_node);
-      shmem_clear_lock(&(bcast_lock[cur_node->nxt_node]));
-    }
-    else bcast_msg = false;
-
-    /* Mark the remote message for future deletion */
-    shmem_put(&(cur_node->nxt_addr->received_f),&received_f,
-              1, cur_node->nxt_node);
-
-    /* Add to list for reversing */
-    if (bcast_msg)
-    {
-      McQueueAddToBack(received_token_queue,cur_msg);
-      McQueueAddToBack(tmp_queue,bcast_ptr);
-    }
-    else 
-      McQueueAddToBack(tmp_queue,cur_msg);
-
-    /* Move pointer to next message */
-    cur_node = &(cur_msg->list_node);
-  }
-
-  /* 3) Enqueue list into local message queue, in reverse order */
-  while ((cur_msg = McQueueRemoveFromBack(tmp_queue)) != NULL)  {
-    McQueueAddToBack(received_queue,cur_msg);
-  }
-
-  /* 4) Delete broadcast-message tokens */
-  while ((cur_msg = McQueueRemoveFromBack(received_token_queue)) != NULL)  {
-    CmiFree(cur_msg);
-  }
-  return;
-}
-
-static void McCleanUpInTransit(void)
-{
-  McMsgHdr *msg;
-  McQueue *swap_ptr;
-
-  /* Check broadcast message queue, to see if messages have been retrieved
-   */
-  while ((msg = (McMsgHdr *)McQueueRemoveFromFront(broadcast_queue)) 
-        != NULL)
-  {
-    if (msg->bcast.count == 0)
-    {
-      /* 
-        CmiPrintf("PE %d freeing broadcast message at %d\n",_Cmi_mype,msg);
-       */
-      CmiFree(msg);
-    }
-    else
-    {
-      McQueueAddToBack(broadcast_tmp_queue,msg);
-    }
-  }
-  /*
-   * swap queues, so tmp_queue is now empty, and in_transit_queue has
-   * only non-received messages.
-   */
-  swap_ptr = broadcast_tmp_queue;
-  broadcast_tmp_queue = broadcast_queue;
-  broadcast_queue = swap_ptr;
-
-  /* 
-   * Free received messages, and move others to tmp_queue.  Similar to
-   * above
-   */
-  while ((msg = (McMsgHdr *)McQueueRemoveFromFront(in_transit_queue)) 
-        != NULL)
-  {
-    if (msg->received_f)
-    {
-      CmiFree(msg);
-    }
-    else
-    {
-      McQueueAddToBack(in_transit_tmp_queue,msg);
-    }
-  }
-  /*
-   * swap queues, so tmp_queue is now empty, and in_transit_queue has
-   * only non-received messages.
-   */
-  swap_ptr = in_transit_tmp_queue;
-  in_transit_tmp_queue = in_transit_queue;
-  in_transit_queue = swap_ptr;
-#ifdef DEBUG
-  CmiPrintf("[%d] done in_transit_queue = %d, tmp_queue = %d\n",
-       _Cmi_mype,in_transit_queue->len,in_transit_tmp_queue->len);
-#endif
-}
-
-/*******************************************************************
- * The following internal functions implements FIFO queues for
- * messages in the local address space.  This is used for the
- * received_queue, the in_transit_queue, and tmp_queue.  Code
- * originally comes from the Origin2000 port, with modifications.
- */
-static void **McQueueAllocBlock(unsigned int len)
-{
-  void ** blk;
-
-  blk=(void **)malloc(len*sizeof(void *));
-  if(blk==(void **)0) {
-    CmiError("Cannot Allocate Memory!\n");
-    abort();
-  }
-  return blk;
-}
-
-static void 
-McQueueSpillBlock(void **srcblk, void **destblk, 
-            unsigned int first, unsigned int len)
-{
-  memcpy(destblk, &srcblk[first], (len-first)*sizeof(void *));
-  memcpy(&destblk[len-first],srcblk,first*sizeof(void *));
-}
-
-static McQueue * McQueueCreate(void)
-{
-  McQueue *queue;
-
-  queue = (McQueue *) malloc(sizeof(McQueue));
-  if(queue==(McQueue *)0) {
-    CmiError("Cannot Allocate Memory!\n");
-    abort();
-  }
-  queue->blk = McQueueAllocBlock(BLK_LEN);
-  queue->blk_len = BLK_LEN;
-  queue->first = 0;
-  queue->len = 0;
-  return queue;
-}
-
-int inside_comm = 0;
-
-static void McQueueAddToBack(McQueue *queue, void *element)
-{
-  inside_comm = 1;
-  if(queue->len==queue->blk_len) {
-    void **blk;
-
-    queue->blk_len *= 3;
-    blk = McQueueAllocBlock(queue->blk_len);
-    McQueueSpillBlock(queue->blk, blk, queue->first, queue->len);
-    free(queue->blk);
-    queue->blk = blk;
-    queue->first = 0;
-  }
-#ifdef DEBUG
-  CmiPrintf("[%d] Adding %x\n",_Cmi_mype,element);
-#endif
-  queue->blk[(queue->first+queue->len++)%queue->blk_len] = element;
-  inside_comm = 0;
-}
-
-static void * McQueueRemoveFromBack(McQueue *queue)
-{
-  void *element;
-  element = (void *) 0;
-  if(queue->len) {
-    element = queue->blk[(queue->first+queue->len-1)%queue->blk_len];
-    queue->len--;
-  }
-  return element;
-}
-
-static void * McQueueRemoveFromFront(McQueue *queue)
-{
-  void *element;
-  element = (void *) 0;
-  if(queue->len) {
-    element = queue->blk[queue->first++];
-    queue->first = (queue->first+queue->blk_len)%queue->blk_len;
-    queue->len--;
-  }
-  return element;
-}
-
-
-/* Timer Functions */
-
-static double clocktick;
-static long inittime_wallclock;
-static long inittime_virtual;
-
-void CmiTimerInit(char **argv)
-{
-  inittime_wallclock = _rtc();
-  inittime_virtual = cpused();
-  clocktick = 1.0 / (sysconf(_SC_CLK_TCK));
-}
-
-double CmiWallTimer()
-{
-  long now;
-
-  now = _rtc();
-  return (clocktick * (now - inittime_wallclock));
-}
-
-double CmiCpuTimer()
-{
-  long now;
-
-  now = cpused();
-  return (clocktick * (now - inittime_virtual));
-}
-
-double CmiTimer()
-{
-  long now;
-
-  now = _rtc();
-  return (clocktick * (now - inittime_wallclock));
-}
-
-/*   Memory lock and unlock functions */
-/*      --- on T3E, no shared memory and quickthreads are used, so memory */
-/*          calls reentrant problem. these are only dummy functions */
-
-static volatile int memflag;
-void CmiMemLock() { memflag=1; }
-void CmiMemUnlock() { memflag=0; }
-
-/*@}*/