ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Sync ib ptl component with naming convention in the rest of the tree

Просмотр исходного кода 
This commit was SVN r1950.
Этот коммит содержится в:
Jeff Squyres 2004-08-07 12:39:00 +00:00
родитель f870500088
Коммит 23dc88ad1d
7 изменённых файлов: 146 добавлений и 140 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
src/mca/ptl/ib/src/Makefile.am
Просмотреть файл

@ -1,4 +1,3 @@
# -*- makefile -*-
#
# $HEADER$
#
@ -9,6 +8,6 @@ noinst_LTLIBRARIES = libmca_ptl_ib.la
libmca_ptl_ib_la_SOURCES = \
ptl_ib.c \
ptl_ib.h \
ptl_ib_module.c \
ptl_ib_component.c \
ptl_ib_priv.c \
ptl_ib_proc.c

40
src/mca/ptl/ib/src/ptl_ib.c
Просмотреть файл

@ -15,24 +15,32 @@
#include "mca/base/mca_base_module_exchange.h"
#include "ptl_ib.h"
mca_ptl_ib_t mca_ptl_ib = {
mca_ptl_ib_module_t mca_ptl_ib_module = {
{
&mca_ptl_ib_module.super,
0, /* ptl_exclusivity */
0, /* ptl_latency */
0, /* ptl_andwidth */
0, /* ptl_frag_first_size */
0, /* ptl_frag_min_size */
0, /* ptl_frag_max_size */
&mca_ptl_ib_component.super,
1, /* max size of request cache */
sizeof(mca_ptl_ib_send_frag_t), /* bytes required by ptl for a request */
0, /* max size of first fragment */
0, /* min fragment size */
0, /* max fragment size */
0, /* exclusivity */
0, /* latency */
0, /* bandwidth */
MCA_PTL_PUT, /* ptl flags */
mca_ptl_ib_add_procs,
mca_ptl_ib_del_procs,
mca_ptl_ib_finalize,
mca_ptl_ib_send,
NULL,
#if 0
mca_ptl_ib_matched,
mca_ptl_ib_request_alloc,
mca_ptl_ib_request_return
#else
NULL, /* Sayantan: need to update matched */
NULL, /* Sayantan: need request_init */
NULL, /* Sayantan: need request_fini */
#endif
}
};
@ -53,7 +61,7 @@ OBJ_CLASS_INSTANCE(mca_ptl_ib_proc_t,
NULL, NULL);
int mca_ptl_ib_add_procs(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
size_t nprocs,
struct ompi_proc_t **ompi_procs,
struct mca_ptl_base_peer_t** peers,
@ -98,7 +106,7 @@ int mca_ptl_ib_add_procs(
return OMPI_ERR_OUT_OF_RESOURCE;
}
ptl_peer->peer_ptl = (mca_ptl_ib_t*)ptl;
ptl_peer->peer_ptl = (mca_ptl_ib_module_t*)ptl;
/*
rc = mca_ptl_ib_proc_insert(ptl_proc, ptl_peer);
@ -115,7 +123,7 @@ int mca_ptl_ib_add_procs(
return OMPI_SUCCESS;
}
int mca_ptl_ib_del_procs(struct mca_ptl_t* ptl,
int mca_ptl_ib_del_procs(struct mca_ptl_base_module_t* ptl,
size_t nprocs,
struct ompi_proc_t **procs,
struct mca_ptl_base_peer_t ** peers)
@ -125,14 +133,14 @@ int mca_ptl_ib_del_procs(struct mca_ptl_t* ptl,
return OMPI_SUCCESS;
}
int mca_ptl_ib_finalize(struct mca_ptl_t* ptl)
int mca_ptl_ib_finalize(struct mca_ptl_base_module_t* ptl)
{
/* Stub */
fprintf(stderr,"[%s][%d]\n", __FILE__, __LINE__);
return OMPI_SUCCESS;
}
int mca_ptl_ib_request_alloc(struct mca_ptl_t* ptl,
int mca_ptl_ib_request_alloc(struct mca_ptl_base_module_t* ptl,
struct mca_pml_base_send_request_t** request)
{
/* Stub */
@ -141,7 +149,7 @@ int mca_ptl_ib_request_alloc(struct mca_ptl_t* ptl,
}
void mca_ptl_ib_request_return(struct mca_ptl_t* ptl,
void mca_ptl_ib_request_return(struct mca_ptl_base_module_t* ptl,
struct mca_pml_base_send_request_t* request)
{
/* Stub */
@ -156,7 +164,7 @@ void mca_ptl_ib_request_return(struct mca_ptl_t* ptl,
*/
int mca_ptl_ib_send(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_ptl_base_peer_t* ptl_peer,
struct mca_pml_base_send_request_t* sendreq,
size_t offset,
@ -175,7 +183,7 @@ int mca_ptl_ib_send(
*/
void mca_ptl_ib_matched(
mca_ptl_t* ptl,
mca_ptl_base_module_t* ptl,
mca_ptl_base_recv_frag_t* frag)
{
fprintf(stderr,"[%s][%d]\n", __FILE__, __LINE__);

71
src/mca/ptl/ib/src/ptl_ib.h
Просмотреть файл

@ -31,14 +31,14 @@
#include "ptl_ib_recvfrag.h"
/**
* IB PTL module.
* IB PTL component.
*/
struct mca_ptl_ib_module_1_0_0_t {
mca_ptl_base_module_1_0_0_t super; /**< base PTL module */
struct mca_ptl_ib_t** ib_ptls; /**< array of available PTLs */
uint32_t ib_num_ptls; /**< number of ptls actually used */
uint32_t ib_max_ptls; /**< maximum number of ptls */
struct mca_ptl_ib_component_t {
mca_ptl_base_component_1_0_0_t super; /**< base PTL component */
struct mca_ptl_ib_module_t** ib_ptl_modules; /**< array of available PTLs */
uint32_t ib_num_ptl_modules; /**< number of ptl modules actually used */
uint32_t ib_max_ptl_modules; /**< maximum number of ptls */
int ib_free_list_num; /**< initial size of free lists */
int ib_free_list_max; /**< maximum size of free lists */
int ib_free_list_inc; /**< number of elements to alloc when growing free lists */
@ -47,19 +47,18 @@ struct mca_ptl_ib_module_1_0_0_t {
ompi_event_t ib_send_event; /**< event structure for sends */
ompi_event_t ib_recv_event; /**< event structure for recvs */
ompi_mutex_t ib_lock; /**< lock for accessing module state */
uint32_t ib_num_hcas; /* number of hcas available to the IB module */
uint32_t ib_num_hcas; /* number of hcas available to the IB component */
};
typedef struct mca_ptl_ib_module_1_0_0_t mca_ptl_ib_module_1_0_0_t;
typedef struct mca_ptl_ib_module_1_0_0_t mca_ptl_ib_module_t;
typedef struct mca_ptl_ib_component_t mca_ptl_ib_component_t;
struct mca_ptl_ib_recv_frag_t;
extern mca_ptl_ib_module_1_0_0_t mca_ptl_ib_module;
extern mca_ptl_ib_component_t mca_ptl_ib_component;
/**
* IB PTL Interface
*/
struct mca_ptl_ib_t {
mca_ptl_t super; /**< base PTL interface */
struct mca_ptl_ib_module_t {
mca_ptl_base_module_t super; /**< base PTL interface */
VAPI_hca_id_t hca_id; /* ID of HCA this PTL is tied to */
VAPI_hca_port_t port; /* InfiniBand port of this PTL */
VAPI_hca_hndl_t nic; /* NIC handle */
@ -83,52 +82,52 @@ struct mca_ptl_ib_t {
EVAPI_compl_handler_hndl_t ud_comp_ev_hndl; /* UD completion handler handle */
};
typedef struct mca_ptl_ib_t mca_ptl_ib_t;
typedef struct mca_ptl_ib_module_t mca_ptl_ib_module_t;
extern mca_ptl_ib_t mca_ptl_ib;
extern mca_ptl_ib_module_t mca_ptl_ib_module;
/**
* Register IB module parameters with the MCA framework
* Register IB component parameters with the MCA framework
*/
extern int mca_ptl_ib_module_open(void);
extern int mca_ptl_ib_component_open(void);
/**
* Any final cleanup before being unloaded.
*/
extern int mca_ptl_ib_module_close(void);
extern int mca_ptl_ib_component_close(void);
/**
* IB module initialization.
* IB component initialization.
*
* @param num_ptls (OUT) Number of PTLs returned in PTL array.
* @param num_ptl_modules (OUT) Number of PTLs returned in PTL array.
* @param allow_multi_user_threads (OUT) Flag indicating wether PTL supports user threads (TRUE)
* @param have_hidden_threads (OUT) Flag indicating wether PTL uses threads (TRUE)
*
* (1) read interface list from kernel and compare against module parameters
* (1) read interface list from kernel and compare against component parameters
* then create a PTL instance for selected interfaces
* (2) setup IB listen socket for incoming connection attempts
* (3) publish PTL addressing info
*
*/
extern mca_ptl_t** mca_ptl_ib_module_init(
int *num_ptls,
extern mca_ptl_base_module_t** mca_ptl_ib_component_init(
int *num_ptl_modules,
bool *allow_multi_user_threads,
bool *have_hidden_threads
);
/**
* IB module control.
* IB component control.
*/
extern int mca_ptl_ib_module_control(
extern int mca_ptl_ib_component_control(
int param,
void* value,
size_t size
);
/**
* IB module progress.
* IB component progress.
*/
extern int mca_ptl_ib_module_progress(
extern int mca_ptl_ib_component_progress(
mca_ptl_tstamp_t tstamp
);
@ -142,7 +141,7 @@ extern int mca_ptl_ib_module_progress(
*/
extern int mca_ptl_ib_finalize(
struct mca_ptl_t* ptl
struct mca_ptl_base_module_t* ptl
);
@ -159,7 +158,7 @@ extern int mca_ptl_ib_finalize(
*/
extern int mca_ptl_ib_add_procs(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
size_t nprocs,
struct ompi_proc_t **procs,
struct mca_ptl_base_peer_t** peers,
@ -177,7 +176,7 @@ extern int mca_ptl_ib_add_procs(
*
*/
extern int mca_ptl_ib_del_procs(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
size_t nprocs,
struct ompi_proc_t **procs,
struct mca_ptl_base_peer_t** peers
@ -192,7 +191,7 @@ extern int mca_ptl_ib_del_procs(
*
*/
extern int mca_ptl_ib_request_alloc(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_pml_base_send_request_t**
);
@ -204,7 +203,7 @@ extern int mca_ptl_ib_request_alloc(
*
*/
extern void mca_ptl_ib_request_return(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_pml_base_send_request_t*
);
@ -216,10 +215,10 @@ extern void mca_ptl_ib_request_return(
*
*/
extern void mca_ptl_ib_matched(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_ptl_base_recv_frag_t* frag
);
/**
* PML->PTL Initiate a send of the specified size.
*
@ -231,7 +230,7 @@ extern void mca_ptl_ib_matched(
* @param request (OUT) OMPI_SUCCESS if the PTL was able to queue one or more fragments
*/
extern int mca_ptl_ib_send(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_ptl_base_peer_t* ptl_peer,
struct mca_pml_base_send_request_t*,
size_t offset,
@ -247,7 +246,7 @@ extern int mca_ptl_ib_send(
*
*/
extern void mca_ptl_ib_recv_frag_return(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_ptl_ib_recv_frag_t* frag
);
@ -260,7 +259,7 @@ extern void mca_ptl_ib_recv_frag_return(
*
*/
extern void mca_ptl_ib_send_frag_return(
struct mca_ptl_t* ptl,
struct mca_ptl_base_module_t* ptl,
struct mca_ptl_ib_send_frag_t*
);

162
src/mca/ptl/ib/src/ptl_ib_module.c → src/mca/ptl/ib/src/ptl_ib_component.c
Просмотреть файл

@ -19,36 +19,36 @@
#include "ptl_ib_priv.h"
mca_ptl_ib_module_1_0_0_t mca_ptl_ib_module = {
mca_ptl_ib_component_t mca_ptl_ib_component = {
{
/* First, the mca_base_module_t struct containing meta information
about the module itself */
/* First, the mca_base_component_t struct containing meta information
about the component itself */
{
/* Indicate that we are a pml v1.0.0 module (which also implies a
/* Indicate that we are a pml v1.0.0 component (which also implies a
specific MCA version) */
MCA_PTL_BASE_VERSION_1_0_0,
"ib", /* MCA module name */
1, /* MCA module major version */
0, /* MCA module minor version */
0, /* MCA module release version */
mca_ptl_ib_module_open, /* module open */
mca_ptl_ib_module_close /* module close */
"ib", /* MCA component name */
1, /* MCA component major version */
0, /* MCA component minor version */
0, /* MCA component release version */
mca_ptl_ib_component_open, /* component open */
mca_ptl_ib_component_close /* component close */
},
/* Next the MCA v1.0.0 module meta data */
/* Next the MCA v1.0.0 component meta data */
{
/* Whether the module is checkpointable or not */
/* Whether the component is checkpointable or not */
false
},
mca_ptl_ib_module_init,
mca_ptl_ib_module_control,
mca_ptl_ib_module_progress,
mca_ptl_ib_component_init,
mca_ptl_ib_component_control,
mca_ptl_ib_component_progress,
}
};
@ -56,7 +56,7 @@ mca_ptl_ib_module_1_0_0_t mca_ptl_ib_module = {
* functions for receiving event callbacks
*/
static void mca_ptl_ib_module_recv_handler(int, short, void*);
static void mca_ptl_ib_component_recv_handler(int, short, void*);
/*
@ -84,41 +84,41 @@ static inline int mca_ptl_ib_param_register_int(
}
/*
* Called by MCA framework to open the module, registers
* module parameters.
* Called by MCA framework to open the component, registers
* component parameters.
*/
int mca_ptl_ib_module_open(void)
int mca_ptl_ib_component_open(void)
{
D_PRINT("Opening InfiniBand module ...\n");
/* register super module parameters */
mca_ptl_ib.super.ptl_exclusivity =
D_PRINT("Opening InfiniBand component ...\n");
/* register super component parameters */
mca_ptl_ib_module.super.ptl_exclusivity =
mca_ptl_ib_param_register_int ("exclusivity", 0);
mca_ptl_ib.super.ptl_first_frag_size =
mca_ptl_ib_module.super.ptl_first_frag_size =
mca_ptl_ib_param_register_int ("first_frag_size",
(2048 - sizeof(mca_ptl_base_header_t))/*magic*/);
mca_ptl_ib.super.ptl_min_frag_size =
mca_ptl_ib_module.super.ptl_min_frag_size =
mca_ptl_ib_param_register_int ("min_frag_size",
(2048 - sizeof(mca_ptl_base_header_t))/*magic*/);
mca_ptl_ib.super.ptl_max_frag_size =
mca_ptl_ib_module.super.ptl_max_frag_size =
mca_ptl_ib_param_register_int ("max_frag_size", 2<<30);
/* register IB module parameters */
mca_ptl_ib_module.ib_free_list_num =
/* register IB component parameters */
mca_ptl_ib_component.ib_free_list_num =
mca_ptl_ib_param_register_int ("free_list_num", 32);
mca_ptl_ib_module.ib_free_list_max =
mca_ptl_ib_component.ib_free_list_max =
mca_ptl_ib_param_register_int ("free_list_max", 1024);
mca_ptl_ib_module.ib_free_list_inc =
mca_ptl_ib_component.ib_free_list_inc =
mca_ptl_ib_param_register_int ("free_list_inc", 32);
return OMPI_SUCCESS;
}
/*
* module cleanup - sanity checking of queue lengths
* component cleanup - sanity checking of queue lengths
*/
int mca_ptl_ib_module_close(void)
int mca_ptl_ib_component_close(void)
{
fprintf(stderr,"[%s][%d]\n", __FILE__, __LINE__);
/* Stub */
@ -126,16 +126,16 @@ int mca_ptl_ib_module_close(void)
}
/*
* Register IB module addressing information. The MCA framework
* Register IB component addressing information. The MCA framework
* will make this available to all peers.
*/
static int mca_ptl_ib_module_send(void)
static int mca_ptl_ib_component_send(void)
{
int i, rc, size;
mca_ptl_ib_ud_addr_t* ud_qp_addr = NULL;
size = sizeof(mca_ptl_ib_ud_addr_t) * mca_ptl_ib_module.ib_num_ptls;
size = sizeof(mca_ptl_ib_ud_addr_t) * mca_ptl_ib_component.ib_num_ptl_modules;
ud_qp_addr = (mca_ptl_ib_ud_addr_t*) malloc(size);
@ -143,8 +143,8 @@ static int mca_ptl_ib_module_send(void)
return OMPI_ERROR;
}
for(i = 0; i < mca_ptl_ib_module.ib_num_ptls; i++) {
mca_ptl_ib_t* ptl = mca_ptl_ib_module.ib_ptls[i];
for(i = 0; i < mca_ptl_ib_component.ib_num_ptl_modules; i++) {
mca_ptl_ib_module_t* ptl = mca_ptl_ib_component.ib_ptl_modules[i];
ud_qp_addr[i].ud_qp = ptl->ud_qp_hndl;
ud_qp_addr[i].lid = ptl->port.lid;
}
@ -152,7 +152,7 @@ static int mca_ptl_ib_module_send(void)
D_PRINT("ud_qp_addr[0].ud_qp = %d\n",(int)ud_qp_addr[0].ud_qp);
D_PRINT("ud_qp_addr[0].lid = %d\n", (int)ud_qp_addr[0].lid);
rc = mca_base_modex_send(&mca_ptl_ib_module.super.ptlm_version,
rc = mca_base_modex_send(&mca_ptl_ib_component.super.ptlm_version,
ud_qp_addr, size);
free(ud_qp_addr);
@ -161,27 +161,27 @@ static int mca_ptl_ib_module_send(void)
}
/*
* IB module initialization:
* (1) read interface list from kernel and compare against module parameters
* IB component initialization:
* (1) read interface list from kernel and compare against component parameters
* then create a PTL instance for selected interfaces
* (2) setup IB listen socket for incoming connection attempts
* (3) register PTL parameters with the MCA
*/
mca_ptl_t** mca_ptl_ib_module_init(int *num_ptls,
mca_ptl_base_module_t** mca_ptl_ib_component_init(int *num_ptl_modules,
bool *allow_multi_user_threads,
bool *have_hidden_threads)
{
mca_ptl_t **ptls;
mca_ptl_base_module_t **ptls;
int i, ret;
uint32_t num_hcas;
mca_ptl_ib_t* ptl_ib = NULL;
*num_ptls = 0;
mca_ptl_ib_module_t* ptl_ib = NULL;
*num_ptl_modules = 0;
*allow_multi_user_threads = true;
*have_hidden_threads = OMPI_HAVE_THREADS;
D_PRINT("IB Module Init\n");
D_PRINT("IB Component Init\n");
/* need to set ompi_using_threads() as ompi_event_init()
* will spawn a thread if supported */
@ -190,7 +190,7 @@ mca_ptl_t** mca_ptl_ib_module_init(int *num_ptls,
}
if((ret = ompi_event_init()) != OMPI_SUCCESS) {
ompi_output(0, "mca_ptl_ib_module_init: "
ompi_output(0, "mca_ptl_ib_component_init: "
"unable to initialize event dispatch thread: %d\n", ret);
return NULL;
}
@ -206,46 +206,46 @@ mca_ptl_t** mca_ptl_ib_module_init(int *num_ptls,
/* HACK: To avoid confusion, right now open only
* one IB PTL */
/*mca_ptl_ib_module.ib_num_hcas = num_hcas;*/
mca_ptl_ib_module.ib_num_hcas = 1;
/*mca_ptl_ib_component.ib_num_hcas = num_hcas;*/
mca_ptl_ib_component.ib_num_hcas = 1;
/* Number of InfiniBand PTLs is equal to
* number of physical HCAs. Is this always the
* case, or under some conditions, there can be
* multiple PTLs for one HCA? */
mca_ptl_ib_module.ib_num_ptls =
mca_ptl_ib_module.ib_num_hcas;
mca_ptl_ib_component.ib_num_ptl_modules =
mca_ptl_ib_component.ib_num_hcas;
/* Not sure what max_ptls does */
mca_ptl_ib_module.ib_max_ptls =
mca_ptl_ib_module.ib_num_hcas;
/* Not sure what max_ptl_modules does */
mca_ptl_ib_component.ib_max_ptl_modules =
mca_ptl_ib_component.ib_num_hcas;
D_PRINT("num_hcas: %d, num_ptls: %d, max_ptls: %d\n",
mca_ptl_ib_module.ib_num_hcas,
mca_ptl_ib_module.ib_num_ptls,
mca_ptl_ib_module.ib_max_ptls);
D_PRINT("num_hcas: %d, num_ptl_modules: %d, max_ptl_modules: %d\n",
mca_ptl_ib_component.ib_num_hcas,
mca_ptl_ib_component.ib_num_ptl_modules,
mca_ptl_ib_component.ib_max_ptl_modules);
ptl_ib = (mca_ptl_ib_t*) malloc(sizeof(mca_ptl_ib_t) *
mca_ptl_ib_module.ib_num_ptls);
ptl_ib = (mca_ptl_ib_module_t*) malloc(sizeof(mca_ptl_ib_module_t) *
mca_ptl_ib_component.ib_num_ptl_modules);
if(NULL == ptl_ib) {
return NULL;
}
/* Zero out the PTL struct memory region */
memset((void*)ptl_ib, 0, sizeof(mca_ptl_ib_t) *
mca_ptl_ib_module.ib_num_ptls);
memset((void*)ptl_ib, 0, sizeof(mca_ptl_ib_module_t) *
mca_ptl_ib_component.ib_num_ptl_modules);
/* Copy the function pointers to the IB ptls */
for(i = 0; i< mca_ptl_ib_module.ib_num_ptls; i++) {
for(i = 0; i< mca_ptl_ib_component.ib_num_ptl_modules; i++) {
memcpy((void*)&ptl_ib[i],
&mca_ptl_ib,
sizeof(mca_ptl_ib));
&mca_ptl_ib_module,
sizeof(mca_ptl_ib_module));
}
D_PRINT("About to initialize IB ptls ...\n");
/* For each ptl, do this */
for(i = 0; i < mca_ptl_ib_module.ib_num_ptls; i++) {
for(i = 0; i < mca_ptl_ib_component.ib_num_ptl_modules; i++) {
if(mca_ptl_ib_get_hca_id(i, &ptl_ib[i].hca_id)
!= OMPI_SUCCESS) {
@ -345,43 +345,43 @@ mca_ptl_t** mca_ptl_ib_module_init(int *num_ptls,
}
/* Allocate list of IB ptl pointers */
mca_ptl_ib_module.ib_ptls = (struct mca_ptl_ib_t**)
malloc(mca_ptl_ib_module.ib_num_ptls *
sizeof(struct mca_ptl_ib_t*));
if(NULL == mca_ptl_ib_module.ib_ptls) {
mca_ptl_ib_component.ib_ptl_modules = (struct mca_ptl_ib_module_t**)
malloc(mca_ptl_ib_component.ib_num_ptl_modules *
sizeof(struct mca_ptl_ib_module_t*));
if(NULL == mca_ptl_ib_component.ib_ptl_modules) {
return NULL;
}
/* Set the pointers for all IB ptls */
for(i = 0; i < mca_ptl_ib_module.ib_num_ptls; i++) {
mca_ptl_ib_module.ib_ptls[i] = &ptl_ib[i];
for(i = 0; i < mca_ptl_ib_component.ib_num_ptl_modules; i++) {
mca_ptl_ib_component.ib_ptl_modules[i] = &ptl_ib[i];
}
if(mca_ptl_ib_module_send() != OMPI_SUCCESS) {
if(mca_ptl_ib_component_send() != OMPI_SUCCESS) {
return NULL;
}
/* Allocate list of MCA ptl pointers */
ptls = (mca_ptl_t**) malloc(mca_ptl_ib_module.ib_num_ptls *
sizeof(mca_ptl_t*));
ptls = (mca_ptl_base_module_t**) malloc(mca_ptl_ib_component.ib_num_ptl_modules *
sizeof(mca_ptl_base_module_t*));
if(NULL == ptls) {
return NULL;
}
memcpy(ptls, mca_ptl_ib_module.ib_ptls,
mca_ptl_ib_module.ib_num_ptls *
sizeof(mca_ptl_ib_t*));
memcpy(ptls, mca_ptl_ib_component.ib_ptl_modules,
mca_ptl_ib_component.ib_num_ptl_modules *
sizeof(mca_ptl_ib_module_t*));
*num_ptls = mca_ptl_ib_module.ib_num_ptls;
*num_ptl_modules = mca_ptl_ib_component.ib_num_ptl_modules;
return ptls;
}
/*
* IB module control
* IB component control
*/
int mca_ptl_ib_module_control(int param, void* value, size_t size)
int mca_ptl_ib_component_control(int param, void* value, size_t size)
{
/* Stub */
fprintf(stderr,"[%s][%d]\n", __FILE__, __LINE__);
@ -390,10 +390,10 @@ int mca_ptl_ib_module_control(int param, void* value, size_t size)
/*
* IB module progress.
* IB component progress.
*/
int mca_ptl_ib_module_progress(mca_ptl_tstamp_t tstamp)
int mca_ptl_ib_component_progress(mca_ptl_tstamp_t tstamp)
{
/* Stub */
fprintf(stderr,"[%s][%d]\n", __FILE__, __LINE__);

2
src/mca/ptl/ib/src/ptl_ib_peer.h
Просмотреть файл

@ -29,7 +29,7 @@ typedef enum {
struct mca_ptl_base_peer_t {
ompi_list_item_t super;
struct mca_ptl_ib_t* peer_ptl; /**< PTL instance that created this connection */
struct mca_ptl_ib_module_t* peer_ptl; /**< PTL instance that created this connection */
struct mca_ptl_ib_proc_t* peer_proc; /**< proc structure corresponding to peer */
struct mca_ptl_ib_addr_t* peer_addr; /**< address of peer */
int peer_sd; /**< socket connection to peer */

4
src/mca/ptl/ib/src/ptl_ib_priv.c
Просмотреть файл

@ -222,11 +222,11 @@ int mca_ptl_ib_get_hca_id(int num, VAPI_hca_id_t* hca_id)
VAPI_ret_t ret;
VAPI_hca_id_t* hca_ids = NULL;
hca_ids = (VAPI_hca_id_t*) malloc(mca_ptl_ib_module.ib_num_hcas *
hca_ids = (VAPI_hca_id_t*) malloc(mca_ptl_ib_component.ib_num_hcas *
sizeof(VAPI_hca_id_t));
/* Now get the hca_id from underlying VAPI layer */
ret = EVAPI_list_hcas(mca_ptl_ib_module.ib_num_hcas,
ret = EVAPI_list_hcas(mca_ptl_ib_component.ib_num_hcas,
&num_hcas, hca_ids);
/* HACK: right now, I have put VAPI_EAGAIN as

4
src/mca/ptl/ib/src/ptl_ib_proc.c
Просмотреть файл

@ -70,7 +70,7 @@ mca_ptl_ib_proc_t* mca_ptl_ib_proc_create(ompi_proc_t* ompi_proc)
/* lookup ib parameters exported by
* this proc */
rc = mca_base_modex_recv(
&mca_ptl_ib_module.super.ptlm_version,
&mca_ptl_ib_component.super.ptlm_version,
ompi_proc,
(void**)&ptl_proc->proc_addrs,
&size);
@ -115,7 +115,7 @@ int mca_ptl_ib_proc_insert(mca_ptl_ib_proc_t* ptl_proc,
mca_ptl_base_peer_t* ptl_peer)
{
int i;
struct mca_ptl_ib_t *ptl_ib = ptl_peer->peer_ptl;
struct mca_ptl_ib_module_t *ptl_ib = ptl_peer->peer_ptl;
/* insert into peer array */
ptl_peer->peer_proc = ptl_proc;