Commit 705d60ae authored by Pavan Balaji's avatar Pavan Balaji
Browse files

[svn-r7132] Delete unused code: ch3

Reviewed by buntinas.
parent fbce0fca
......@@ -86,10 +86,6 @@ MPID_Request * MPID_Request_create(void)
req->dev.dtype_info = NULL;
req->dev.dataloop = NULL;
req->dev.iov_offset = 0;
#if 0
req->dev.rdma_iov_count = 0;
req->dev.rdma_iov_offset = 0;
#endif
#ifdef MPIDI_CH3_REQUEST_INIT
MPIDI_CH3_REQUEST_INIT(req);
#endif
......
......@@ -807,14 +807,11 @@ int MPIDI_Win_post(MPID_Group *post_grp_ptr, int assert, MPID_Win *win_ptr)
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_POST);
#if 0
/* Reset the fence counter so that in case the user has switched from
fence to
post-wait synchronization, he cannot use the previous fence to mark
the beginning of a fence epoch. */
/* FIXME: We can't do this because fence_cnt must be updated collectively */
win_ptr->fence_cnt = 0;
#endif
/* Even though we would want to reset the fence counter to keep
* the user from using the previous fence to mark the beginning of
* a fence epoch if he switched from fence to lock-unlock
* synchronization, we cannot do this because fence_cnt must be
* updated collectively */
/* In case this process was previously the target of passive target rma
* operations, we need to take care of the following...
......@@ -940,13 +937,11 @@ int MPIDI_Win_start(MPID_Group *group_ptr, int assert, MPID_Win *win_ptr)
MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_START);
#if 0
/* Reset the fence counter so that in case the user has switched from
fence to start-complete synchronization, he cannot use the previous
fence to mark the beginning of a fence epoch. */
/* FIXME: We can't do this because fence_cnt must be updated collectively */
win_ptr->fence_cnt = 0;
#endif
/* Even though we would want to reset the fence counter to keep
* the user from using the previous fence to mark the beginning of
* a fence epoch if he switched from fence to lock-unlock
* synchronization, we cannot do this because fence_cnt must be
* updated collectively */
/* In case this process was previously the target of passive target rma
* operations, we need to take care of the following...
......@@ -1359,13 +1354,11 @@ int MPIDI_Win_lock(int lock_type, int dest, int assert, MPID_Win *win_ptr)
MPIU_UNREFERENCED_ARG(assert);
#if 0
/* Reset the fence counter so that in case the user has switched from
fence to lock-unlock synchronization, he cannot use the previous fence
to mark the beginning of a fence epoch. */
/* FIXME: We can't do this because fence_cnt must be updated collectively */
win_ptr->fence_cnt = 0;
#endif
/* Even though we would want to reset the fence counter to keep
* the user from using the previous fence to mark the beginning of
* a fence epoch if he switched from fence to lock-unlock
* synchronization, we cannot do this because fence_cnt must be
* updated collectively */
if (dest == MPI_PROC_NULL) goto fn_exit;
......
......@@ -204,28 +204,6 @@ int MPID_Init(int *argc, char ***argv, int requested, int *provided,
comm->rank = pg_rank;
comm->remote_size = pg_size;
comm->local_size = pg_size;
#if 0
mpi_errno = MPID_VCRT_Create(comm->remote_size, &comm->vcrt);
if (mpi_errno != MPI_SUCCESS)
{
MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**dev|vcrt_create",
"**dev|vcrt_create %s", "MPI_COMM_WORLD");
}
mpi_errno = MPID_VCRT_Get_ptr(comm->vcrt, &comm->vcr);
if (mpi_errno != MPI_SUCCESS)
{
MPIU_ERR_SETANDJUMP1(mpi_errno,MPI_ERR_OTHER,"**dev|vcrt_get_ptr",
"dev|vcrt_get_ptr %s", "MPI_COMM_WORLD");
}
/* Initialize the connection table on COMM_WORLD from the process group's
connection table */
for (p = 0; p < pg_size; p++)
{
MPID_VCR_Dup(&pg->vct[p], &comm->vcr[p]);
}
#endif
MPID_VCRT_Add_ref( MPIR_Process.comm_world->vcrt );
comm->vcrt = MPIR_Process.comm_world->vcrt;
comm->vcr = MPIR_Process.comm_world->vcr;
......
......@@ -620,17 +620,6 @@ static int MPIDI_CH3U_VC_FinishPending( MPIDI_VCRT_t *vcrt )
i, vc[i]->state ); fflush(stdout);
nPending++;
}
#if 0
/* FIXME: We shouldn't have any references to the channel-specific
fields in this part of the code. This case should actually
not be needed; if there is a pending send element, the
top-level state should not be inactive */
if (vc[i]->ch.sendq_head) {
/* FIXME: Printf for debugging */
printf( "Nonempty sendQ for vc[%d]\n", i ); fflush(stdout);
nPending++;
}
#endif
}
if (nPending > 0) {
printf( "Panic! %d pending operations!\n", nPending );
......@@ -1129,29 +1118,6 @@ int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank)
}
#ifdef USE_PMI2_API
#if 0 /* use nodeid list */
{
int *node_ids;
int outlen;
int found = FALSE;
MPIU_CHKLMEM_MALLOC(node_ids, int *, pg->size * sizeof(int), mpi_errno, "node_ids");
mpi_errno = PMI2_Info_GetJobAttrIntArray("nodeIDs", node_ids, pg->size, &outlen, &found);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
MPIU_ERR_CHKINTERNAL(!found, mpi_errno, "nodeIDs attribute not found");
MPIU_ERR_CHKINTERNAL(outlen != pg->size, mpi_errno, "did not receive enough nodeids");
g_num_nodes = 0;
for (i = 0; i < pg->size; ++i) {
pg->vct[i].node_id = node_ids[i];
if (g_num_nodes < node_ids[i])
g_num_nodes = node_ids[i];
}
++g_num_nodes;
/* FIXME: need to handle oddeven cliques DARIUS */
}
#else
{
char process_mapping[PMI2_MAX_VALLEN];
int outlen;
......@@ -1173,7 +1139,6 @@ int MPIDI_Populate_vc_node_ids(MPIDI_PG_t *pg, int our_pg_rank)
MPIU_ERR_CHKINTERNAL(!did_map, mpi_errno, "unable to populate node ids from PMI_process_mapping");
g_num_nodes = num_nodes;
}
#endif
#else /* USE_PMI2_API */
if (our_pg_rank == -1) {
/* FIXME this routine can't handle the dynamic process case at this
......
......@@ -140,21 +140,6 @@ int MPIDU_CH3U_GetSockInterfaceAddr( int myRank, char *ifname, int maxIfname,
}
else {
MPIU_Memcpy( ifaddr->ifaddr, info->h_addr_list[0], ifaddr->len );
#if 0
printf( "ifaddr len = %d\n", ifaddr->len );
{int i;
unsigned char *p = info->h_addr_list[0];
for (i=0; i<ifaddr->len; i++) {
printf( "%.2x", *p++ );
}
printf( "\n" ); fflush(stdout);
p = info->h_addr_list[0];
for (i=0; i<ifaddr->len; i++) {
printf( "%.3d", *p++ );
}
printf( "\n" ); fflush(stdout);
}
#endif
}
}
}
......
......@@ -197,45 +197,3 @@ static int GetLocalIPs(int32_t *pIP, int max)
}
#endif /* HAVE_WINDOWS_H */
/*
* FIXME: This is old code that can be used to discover the available
* interfaces, and is left here for reference purposes only
*/
#if 0
int32_t local_ip[MAX_NUM_NICS];
unsigned int a, b, c, d;
int num_nics, i;
char *value_orig;
struct hostent *h;
int port;
/*snprintf(value, length, "%s:%d", host, port);*/
value_orig = value;
num_nics = GetLocalIPs(local_ip, MAX_NUM_NICS);
for (i=0; i<num_nics; i++)
{
a = (unsigned char)(((unsigned char *)(&local_ip[i]))[0]);
b = (unsigned char)(((unsigned char *)(&local_ip[i]))[1]);
c = (unsigned char)(((unsigned char *)(&local_ip[i]))[2]);
d = (unsigned char)(((unsigned char *)(&local_ip[i]))[3]);
if (a != 127)
{
h = gethostbyaddr((const char *)&local_ip[i], sizeof(int), AF_INET);
if (h && h->h_name != NULL)
value += MPIU_Snprintf(value, MPI_MAX_PORT_NAME,
"%s:%u.%u.%u.%u:%d:",
h->h_name,
a, b, c, d,
port);
else
value += MPIU_Snprintf(value, MPI_MAX_PORT_NAME,
"%u.%u.%u.%u:%u.%u.%u.%u:%d:",
a, b, c, d,
a, b, c, d,
port);
}
}
#endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment