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

Use the new group interface and add const to the PML send functions.

Просмотр исходного кода
Этот коммит содержится в:
George Bosilca 2015-09-15 22:41:21 -04:00
родитель 5224a7ce4d
Коммит 646a662721
5 изменённых файлов: 13 добавлений и 13 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
ompi/mca/pml/monitoring/pml_monitoring.c
Просмотреть файл

@ -212,7 +212,7 @@ static void output_monitoring( FILE *pf )
/* aggregate data in general array*/ /* aggregate data in general array*/
all_sent_data[i] += sent_data[i]; all_sent_data[i] += sent_data[i];
all_messages_count[i] += messages_count[i]; all_messages_count[i] += messages_count[i];
fprintf(pf, "I\t%d\t%d\t" PRIu64 " bytes\t" PRIu64 " msgs sent\n", fprintf(pf, "I\t%d\t%d\t%" PRIu64 " bytes\t%" PRIu64 " msgs sent\n",
my_rank, i, all_sent_data[i], all_messages_count[i]); my_rank, i, all_sent_data[i], all_messages_count[i]);
fflush(pf); fflush(pf);
} }
@ -228,7 +228,7 @@ static void output_monitoring( FILE *pf )
/* aggregate data in general array*/ /* aggregate data in general array*/
all_filtered_sent_data[i] += filtered_sent_data[i]; all_filtered_sent_data[i] += filtered_sent_data[i];
all_filtered_messages_count[i] += filtered_messages_count[i]; all_filtered_messages_count[i] += filtered_messages_count[i];
fprintf(pf, "E\t%d\t%d\t" PRIu64 " bytes\t" PRIu64 " msgs sent\n", fprintf(pf, "E\t%d\t%d\t%" PRIu64 " bytes\t%" PRIu64 " msgs sent\n",
my_rank, i, all_filtered_sent_data[i], all_filtered_messages_count[i]); my_rank, i, all_filtered_sent_data[i], all_filtered_messages_count[i]);
fflush(pf); fflush(pf);
} }

6
ompi/mca/pml/monitoring/pml_monitoring.h
Просмотреть файл

@ -70,7 +70,7 @@ extern int mca_pml_monitoring_mprobe(int dst,
struct ompi_message_t **message, struct ompi_message_t **message,
ompi_status_public_t* status ); ompi_status_public_t* status );
extern int mca_pml_monitoring_isend_init(void *buf, extern int mca_pml_monitoring_isend_init(const void *buf,
size_t count, size_t count,
ompi_datatype_t *datatype, ompi_datatype_t *datatype,
int dst, int dst,
@ -79,7 +79,7 @@ extern int mca_pml_monitoring_isend_init(void *buf,
struct ompi_communicator_t* comm, struct ompi_communicator_t* comm,
struct ompi_request_t **request); struct ompi_request_t **request);
extern int mca_pml_monitoring_isend(void *buf, extern int mca_pml_monitoring_isend(const void *buf,
size_t count, size_t count,
ompi_datatype_t *datatype, ompi_datatype_t *datatype,
int dst, int dst,
@ -88,7 +88,7 @@ extern int mca_pml_monitoring_isend(void *buf,
struct ompi_communicator_t* comm, struct ompi_communicator_t* comm,
struct ompi_request_t **request); struct ompi_request_t **request);
extern int mca_pml_monitoring_send(void *buf, extern int mca_pml_monitoring_send(const void *buf,
size_t count, size_t count,
ompi_datatype_t *datatype, ompi_datatype_t *datatype,
int dst, int dst,

4
ompi/mca/pml/monitoring/pml_monitoring_component.c
Просмотреть файл

@ -53,7 +53,7 @@ static int
mca_pml_monitoring_notify_flush(struct mca_base_pvar_t *pvar, mca_base_pvar_event_t event, mca_pml_monitoring_notify_flush(struct mca_base_pvar_t *pvar, mca_base_pvar_event_t event,
void *obj, int *count) void *obj, int *count)
{ {
switch event { switch (event) {
case MCA_BASE_PVAR_HANDLE_BIND: case MCA_BASE_PVAR_HANDLE_BIND:
case MCA_BASE_PVAR_HANDLE_UNBIND: case MCA_BASE_PVAR_HANDLE_UNBIND:
case MCA_BASE_PVAR_HANDLE_START: case MCA_BASE_PVAR_HANDLE_START:
@ -110,7 +110,7 @@ static int mca_pml_monitoring_component_close(void)
if( mca_pml_monitoring_active ) { /* Already active, turn off */ if( mca_pml_monitoring_active ) { /* Already active, turn off */
pml_selected_component.pmlm_version.mca_close_component(); pml_selected_component.pmlm_version.mca_close_component();
memset(&pml_selected_component, 0, sizeof(mca_base_component_t)); memset(&pml_selected_component, 0, sizeof(mca_base_component_t));
memset(&pml_selected_module, 0, sizeof(mca_base_component_t)); memset(&pml_selected_module, 0, sizeof(mca_base_module_t));
mca_base_component_repository_release((mca_base_component_t*)&mca_pml_monitoring_component); mca_base_component_repository_release((mca_base_component_t*)&mca_pml_monitoring_component);
mca_pml_monitoring_active = 0; mca_pml_monitoring_active = 0;
return OMPI_SUCCESS; return OMPI_SUCCESS;

10
ompi/mca/pml/monitoring/pml_monitoring_isend.c
Просмотреть файл

@ -17,7 +17,7 @@ extern void monitor_send_data(int dest_rank, size_t data_size, int tag);
extern opal_hash_table_t *get_hashtable(void); extern opal_hash_table_t *get_hashtable(void);
extern opal_hash_table_t *translation_ht; extern opal_hash_table_t *translation_ht;
int mca_pml_monitoring_isend_init(void *buf, int mca_pml_monitoring_isend_init(const void *buf,
size_t count, size_t count,
ompi_datatype_t *datatype, ompi_datatype_t *datatype,
int dst, int dst,
@ -30,7 +30,7 @@ int mca_pml_monitoring_isend_init(void *buf,
dst, tag, mode, comm, request); dst, tag, mode, comm, request);
} }
int mca_pml_monitoring_isend(void *buf, int mca_pml_monitoring_isend(const void *buf,
size_t count, size_t count,
ompi_datatype_t *datatype, ompi_datatype_t *datatype,
int dst, int dst,
@ -41,7 +41,7 @@ int mca_pml_monitoring_isend(void *buf,
{ {
/* find the processor of teh destination */ /* find the processor of teh destination */
ompi_proc_t *proc = ompi_group_get_proc_ptr(comm->c_remote_group, dst); ompi_proc_t *proc = ompi_group_get_proc_ptr(comm->c_remote_group, dst, true);
int world_rank; int world_rank;
/* find its name*/ /* find its name*/
@ -61,7 +61,7 @@ int mca_pml_monitoring_isend(void *buf,
dst, tag, mode, comm, request); dst, tag, mode, comm, request);
} }
int mca_pml_monitoring_send(void *buf, int mca_pml_monitoring_send(const void *buf,
size_t count, size_t count,
ompi_datatype_t *datatype, ompi_datatype_t *datatype,
int dst, int dst,
@ -70,7 +70,7 @@ int mca_pml_monitoring_send(void *buf,
struct ompi_communicator_t* comm) struct ompi_communicator_t* comm)
{ {
ompi_proc_t *proc = ompi_group_get_proc_ptr(comm->c_remote_group, dst); ompi_proc_t *proc = ompi_group_get_proc_ptr(comm->c_remote_group, dst, true);
int world_rank; int world_rank;
uint64_t key = *((uint64_t*) &(proc->super.proc_name)); uint64_t key = *((uint64_t*) &(proc->super.proc_name));

2
ompi/mca/pml/monitoring/pml_monitoring_start.c
Просмотреть файл

@ -40,7 +40,7 @@ int mca_pml_monitoring_start(size_t count,
continue; continue;
} }
proc = ompi_group_get_proc_ptr(pml_request->req_comm->c_remote_group, pml_request->req_peer); proc = ompi_group_get_proc_ptr(pml_request->req_comm->c_remote_group, pml_request->req_peer, true);
uint64_t key = *((uint64_t*) &(proc->super.proc_name)); uint64_t key = *((uint64_t*) &(proc->super.proc_name));