-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "private.h"
#include "xbt/virtu.h"
#include "mc/mc.h"
-#include "mc/mc_replay.h"
+#include "src/mc/mc_replay.h"
#include "xbt/replay.h"
#include <errno.h>
-#include "simix/smx_private.h"
+#include "src/simix/smx_private.h"
#include "surf/surf.h"
#include "simgrid/sg_config.h"
#include "colls/colls.h"
unsigned int iter = 0;
s_smpi_factor_t fact;
double current=0.0;
+ // Iterate over all the sections that were specified and find the right
+ // value. (fact.factor represents the interval sizes; we want to find the
+ // section that has fact.factor <= size and no other such fact.factor <= size)
+ // Note: parse_factor() (used before) already sorts the dynar we iterate over!
xbt_dynar_foreach(smpi_os_values, iter, fact) {
- if (size <= fact.factor) {
+ if (size <= fact.factor) { // Values already too large, use the previously
+ // computed value of current!
XBT_DEBUG("os : %f <= %ld return %f", size, fact.factor, current);
return current;
}else{
- current=fact.values[0]+fact.values[1]*size;
+ // If the next section is too large, the current section must be used.
+ // Hence, save the cost, as we might have to use it.
+ current = fact.values[0]+fact.values[1]*size;
}
}
XBT_DEBUG("os : %f > %ld return %f", size, fact.factor, current);
unsigned int iter = 0;
s_smpi_factor_t fact;
double current=0.0;
+ // Iterate over all the sections that were specified and find the right
+ // value. (fact.factor represents the interval sizes; we want to find the
+ // section that has fact.factor <= size and no other such fact.factor <= size)
+ // Note: parse_factor() (used before) already sorts the dynar we iterate over!
xbt_dynar_foreach(smpi_ois_values, iter, fact) {
- if (size <= fact.factor) {
+ if (size <= fact.factor) { // Values already too large, use the previously
+ // computed value of current!
XBT_DEBUG("ois : %f <= %ld return %f", size, fact.factor, current);
return current;
}else{
- current=fact.values[0]+fact.values[1]*size;
+ // If the next section is too large, the current section must be used.
+ // Hence, save the cost, as we might have to use it.
+ current = fact.values[0]+fact.values[1]*size;
}
}
XBT_DEBUG("ois : %f > %ld return %f", size, fact.factor, current);
unsigned int iter = 0;
s_smpi_factor_t fact;
double current=0.0;
+ // Iterate over all the sections that were specified and find the right
+ // value. (fact.factor represents the interval sizes; we want to find the
+ // section that has fact.factor <= size and no other such fact.factor <= size)
+ // Note: parse_factor() (used before) already sorts the dynar we iterate over!
xbt_dynar_foreach(smpi_or_values, iter, fact) {
- if (size <= fact.factor) {
+ if (size <= fact.factor) { // Values already too large, use the previously
+ // computed value of current!
XBT_DEBUG("or : %f <= %ld return %f", size, fact.factor, current);
return current;
- }else
+ } else {
+ // If the next section is too large, the current section must be used.
+ // Hence, save the cost, as we might have to use it.
current=fact.values[0]+fact.values[1]*size;
+ }
}
XBT_DEBUG("or : %f > %ld return %f", size, fact.factor, current);
}
}
-void smpi_action_trace_run(char *path)
-{
- char *name;
- xbt_dynar_t todo;
- xbt_dict_cursor_t cursor;
-
- action_fp=NULL;
- if (path) {
- action_fp = fopen(path, "r");
- if (action_fp == NULL)
- xbt_die("Cannot open %s: %s", path, strerror(errno));
- }
-
- if (!xbt_dict_is_empty(action_queues)) {
- XBT_WARN
- ("Not all actions got consumed. If the simulation ended successfully (without deadlock), you may want to add new processes to your deployment file.");
-
-
- xbt_dict_foreach(action_queues, cursor, name, todo) {
- XBT_WARN("Still %lu actions for %s", xbt_dynar_length(todo), name);
- }
- }
-
- if (path)
- fclose(action_fp);
- xbt_dict_free(&action_queues);
- action_queues = xbt_dict_new_homogeneous(NULL);
-}
-
static void smpi_mpi_request_free_voidp(void* request)
{
MPI_Request req = request;
if (request->flags & RECV) {
print_request("New recv", request);
-
- xbt_mutex_t mut=smpi_process_mailboxes_mutex();
- xbt_mutex_acquire(mut);
-
- if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")){
+
+ int async_small_thresh = sg_cfg_get_int("smpi/async_small_thresh");
+
+ xbt_mutex_t mut = smpi_process_mailboxes_mutex();
+ if (async_small_thresh != 0 ||request->flags & RMA)
+ xbt_mutex_acquire(mut);
+
+ if (async_small_thresh == 0 && !(request->flags & RMA)) {
+ mailbox = smpi_process_mailbox();
+ }
+ else if (request->flags & RMA || request->size < async_small_thresh){
//We have to check both mailboxes (because SSEND messages are sent to the large mbox). begin with the more appropriate one : the small one.
mailbox = smpi_process_mailbox_small();
XBT_DEBUG("Is there a corresponding send already posted in the small mailbox %p (in case of SSEND)?", mailbox);
request->real_size=request->size;
smpi_datatype_use(request->old_type);
smpi_comm_use(request->comm);
- request->action = simcall_comm_irecv(mailbox, request->buf,
+ request->action = simcall_comm_irecv(SIMIX_process_self(), mailbox, request->buf,
&request->real_size, &match_recv,
!smpi_process_get_replaying()? &smpi_comm_copy_buffer_callback
: &smpi_comm_null_copy_buffer_callback,
request, -1.0);
XBT_DEBUG("recv simcall posted");
- xbt_mutex_release(mut);
+ if (async_small_thresh != 0 || request->flags & RMA)
+ xbt_mutex_release(mut);
} else {
simcall_process_sleep(sleeptime);
XBT_DEBUG("sending size of %zu : sleep %f ", request->size, smpi_os(request->size));
}
-
+
+ int async_small_thresh = sg_cfg_get_int("smpi/async_small_thresh");
+
xbt_mutex_t mut=smpi_process_remote_mailboxes_mutex(receiver);
- xbt_mutex_acquire(mut);
-
- if (request->flags & RMA || request->size < sg_cfg_get_int("smpi/async_small_thres")) { // eager mode
+
+ if (async_small_thresh != 0 || request->flags & RMA)
+ xbt_mutex_acquire(mut);
+
+ if (!(async_small_thresh != 0 || request->flags & RMA)) {
+ mailbox = smpi_process_remote_mailbox(receiver);
+ }
+ else if (request->flags & RMA || request->size < async_small_thresh) { // eager mode
mailbox = smpi_process_remote_mailbox(receiver);
XBT_DEBUG("Is there a corresponding recv already posted in the large mailbox %p?", mailbox);
smx_synchro_t action = simcall_comm_iprobe(mailbox, 1,request->dst, request->tag, &match_send, (void*)request);
if (request->action)
simcall_set_category(request->action, TRACE_internal_smpi_get_category());
- xbt_mutex_release(mut);
+ if (async_small_thresh != 0 || request->flags & RMA)
+ xbt_mutex_release(mut);
}
}
print_request("New iprobe", request);
// We have to test both mailboxes as we don't know if we will receive one one or another
- if (sg_cfg_get_int("smpi/async_small_thres")>0){
+ if (sg_cfg_get_int("smpi/async_small_thresh")>0){
mailbox = smpi_process_mailbox_small();
XBT_DEBUG("trying to probe the perm recv mailbox");
request->action = simcall_comm_iprobe(mailbox, 0, request->src, request->tag, &match_recv, (void*)request);
void smpi_mpi_bcast(void *buf, int count, MPI_Datatype datatype, int root,
MPI_Comm comm)
{
- // arity=2: a binary tree, arity=4 seem to be a good setting (see P2P-MPI))
- nary_tree_bcast(buf, count, datatype, root, comm, 4);
+ // use openMPI selector as default one, as naive one was removed
+ smpi_coll_tuned_bcast_ompi(buf, count, datatype, root, comm);
}
void smpi_mpi_barrier(MPI_Comm comm)
{
- // arity=2: a binary tree, arity=4 seem to be a good setting (see P2P-MPI))
- nary_tree_barrier(comm, 4);
+ // use openMPI selector as default one, as naive one was removed
+ smpi_coll_tuned_barrier_ompi(comm);
}
void smpi_mpi_gather(void *sendbuf, int sendcount, MPI_Datatype sendtype,
