-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2017. 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. */
-#ifndef _SIMIX_SYNCHRO_COMM_HPP
-#define _SIMIX_SYNCHRO_COMM_HPP
+#ifndef SIMIX_SYNCHRO_COMM_HPP
+#define SIMIX_SYNCHRO_COMM_HPP
#include "surf/surf.h"
#include "src/kernel/activity/ActivityImpl.hpp"
e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
smx_mailbox_t mbox = nullptr; /* Rendez-vous where the comm is queued */
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
smx_mailbox_t mbox_cpy = nullptr; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
(comm.mbox set to nullptr when the communication is removed from the mailbox
(used as garbage collector)) */
bool detached = false; /* If detached or not */
void (*clean_fun)(void*) = nullptr; /* Function to clean the detached src_buf if something goes wrong */
- int (*match_fun)(void*,void*,smx_synchro_t) = nullptr; /* Filter function used by the other side. It is used when
+ int (*match_fun)(void*,void*,smx_activity_t) = nullptr; /* Filter function used by the other side. It is used when
looking if a given communication matches my needs. For that, myself must match the
expectations of the other side, too. See */
- void (*copy_data_fun) (smx_synchro_t, void*, size_t) =nullptr;
+ void (*copy_data_fun) (smx_activity_t, void*, size_t) =nullptr;
/* Surf action data */
surf_action_t surf_comm = nullptr; /* The Surf communication action encapsulated */
surf_action_t src_timeout = nullptr; /* Surf's actions to instrument the timeouts */
surf_action_t dst_timeout = nullptr; /* Surf's actions to instrument the timeouts */
- smx_process_t src_proc = nullptr;
- smx_process_t dst_proc = nullptr;
+ smx_actor_t src_proc = nullptr;
+ smx_actor_t dst_proc = nullptr;
double rate = 0.0;
double task_size = 0.0;