X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0676fa9a7d79726e2c829ed4dc31b886c7d46f4e..8e6685471ba9c55bf3bdee4eefd6ba8c5bb6d86f:/src/smpi/bindings/smpi_pmpi_win.cpp diff --git a/src/smpi/bindings/smpi_pmpi_win.cpp b/src/smpi/bindings/smpi_pmpi_win.cpp index 4fa328dfc2..0447347469 100644 --- a/src/smpi/bindings/smpi_pmpi_win.cpp +++ b/src/smpi/bindings/smpi_pmpi_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -14,7 +14,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_pmpi); /* PMPI User level calls */ -extern "C" { // Obviously, the C MPI interface should use the C linkage int PMPI_Win_create( void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, MPI_Win *win){ int retval = 0; @@ -166,10 +165,10 @@ int PMPI_Win_fence( int assert, MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); - retval = win->fence(assert); - TRACE_smpi_collective_out(rank); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_fence")); + retval = win->fence(assert); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -195,15 +194,19 @@ int PMPI_Get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, ((not origin_datatype->is_valid()) || (not target_datatype->is_valid()))) { retval = MPI_ERR_TYPE; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("Get", target_rank, origin_datatype->is_replayable() + ? origin_count + : origin_count * origin_datatype->size(), + simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -232,15 +235,19 @@ int PMPI_Rget( void *origin_addr, int origin_count, MPI_Datatype origin_datatype } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData( + "Rget", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->get( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -266,17 +273,21 @@ int PMPI_Put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, ((not origin_datatype->is_valid()) || (not target_datatype->is_valid()))) { retval = MPI_ERR_TYPE; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - int dst_traced = group->index(target_rank); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); - TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size()); + int dst_traced = group->actor(target_rank)->getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("Put", target_rank, origin_datatype->is_replayable() + ? origin_count + : origin_count * origin_datatype->size(), + simgrid::smpi::Datatype::encode(origin_datatype))); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count * origin_datatype->size()); retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -305,17 +316,21 @@ int PMPI_Rput( void *origin_addr, int origin_count, MPI_Datatype origin_datatype } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - int dst_traced = group->index(target_rank); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); - TRACE_smpi_send(rank, rank, dst_traced, SMPI_RMA_TAG, origin_count*origin_datatype->size()); + int dst_traced = group->actor(target_rank)->getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData( + "Rput", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + simgrid::smpi::Datatype::encode(origin_datatype))); + TRACE_smpi_send(my_proc_id, my_proc_id, dst_traced, SMPI_RMA_TAG, origin_count * origin_datatype->size()); retval = win->put( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -343,14 +358,18 @@ int PMPI_Accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData( + "Accumulate", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -381,15 +400,19 @@ int PMPI_Raccumulate( void *origin_addr, int origin_count, MPI_Datatype origin_d } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData( + "Raccumulate", target_rank, + origin_datatype->is_replayable() ? origin_count : origin_count * origin_datatype->size(), + simgrid::smpi::Datatype::encode(origin_datatype))); retval = win->accumulate( origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -419,16 +442,20 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win){ } else if (op == MPI_OP_NULL) { retval = MPI_ERR_OP; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData( + "Get_accumulate", target_rank, + target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), + simgrid::smpi::Datatype::encode(target_datatype))); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, result_count, result_datatype, target_rank, target_disp, target_count, target_datatype, op); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -462,16 +489,20 @@ MPI_Datatype target_datatype, MPI_Op op, MPI_Win win, MPI_Request* request){ } else if(request == nullptr){ retval = MPI_ERR_REQUEST; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData( + "Rget_accumulate", target_rank, + target_datatype->is_replayable() ? target_count : target_count * target_datatype->size(), + simgrid::smpi::Datatype::encode(target_datatype))); retval = win->get_accumulate( origin_addr, origin_count, origin_datatype, result_addr, result_count, result_datatype, target_rank, target_disp, target_count, target_datatype, op, request); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -500,14 +531,17 @@ int PMPI_Compare_and_swap(void* origin_addr, void* compare_addr, void* result_ad } else if ((datatype == MPI_DATATYPE_NULL) || (not datatype->is_valid())) { retval = MPI_ERR_TYPE; } else { - int rank = smpi_process()->index(); + int my_proc_id = simgrid::s4u::this_actor::getPid(); MPI_Group group; win->get_group(&group); - TRACE_smpi_ptp_in(rank, __FUNCTION__, nullptr); + TRACE_smpi_comm_in(my_proc_id, __func__, + new simgrid::instr::Pt2PtTIData("Compare_and_swap", target_rank, + datatype->is_replayable() ? 1 : datatype->size(), + simgrid::smpi::Datatype::encode(datatype))); retval = win->compare_and_swap(origin_addr, compare_addr, result_addr, datatype, target_rank, target_disp); - TRACE_smpi_ptp_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -521,10 +555,10 @@ int PMPI_Win_post(MPI_Group group, int assert, MPI_Win win){ } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; } else { - int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_post")); retval = win->post(group,assert); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -538,10 +572,10 @@ int PMPI_Win_start(MPI_Group group, int assert, MPI_Win win){ } else if (group==MPI_GROUP_NULL){ retval = MPI_ERR_GROUP; } else { - int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_start")); retval = win->start(group,assert); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -553,12 +587,12 @@ int PMPI_Win_complete(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_complete")); retval = win->complete(); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -570,12 +604,12 @@ int PMPI_Win_wait(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int rank = smpi_process()->index(); - TRACE_smpi_collective_in(rank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_wait")); retval = win->wait(); - TRACE_smpi_collective_out(rank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -592,10 +626,10 @@ int PMPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_lock")); retval = win->lock(lock_type,rank,assert); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -609,10 +643,10 @@ int PMPI_Win_unlock(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_unlock")); retval = win->unlock(rank); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -624,10 +658,10 @@ int PMPI_Win_lock_all(int assert, MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_lock_all")); retval = win->lock_all(assert); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -639,10 +673,10 @@ int PMPI_Win_unlock_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_unlock_all")); retval = win->unlock_all(); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -656,10 +690,10 @@ int PMPI_Win_flush(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush")); retval = win->flush(rank); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -673,10 +707,10 @@ int PMPI_Win_flush_local(int rank, MPI_Win win){ } else if (rank == MPI_PROC_NULL){ retval = MPI_SUCCESS; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_local")); retval = win->flush_local(rank); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -688,10 +722,10 @@ int PMPI_Win_flush_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_all")); retval = win->flush_all(); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -703,10 +737,10 @@ int PMPI_Win_flush_local_all(MPI_Win win){ if (win == MPI_WIN_NULL) { retval = MPI_ERR_WIN; } else { - int myrank = smpi_process()->index(); - TRACE_smpi_collective_in(myrank, __FUNCTION__, nullptr); + int my_proc_id = simgrid::s4u::this_actor::getPid(); + TRACE_smpi_comm_in(my_proc_id, __func__, new simgrid::instr::NoOpTIData("Win_flush_local_all")); retval = win->flush_local_all(); - TRACE_smpi_collective_out(myrank); + TRACE_smpi_comm_out(my_proc_id); } smpi_bench_begin(); return retval; @@ -777,5 +811,3 @@ MPI_Win PMPI_Win_f2c(MPI_Fint win){ MPI_Fint PMPI_Win_c2f(MPI_Win win){ return win->c2f(); } - -}