#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
-#include "simix/simix.h"
+#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/swag.h"
#include "smx_network_private.h"
#include "smx_smurf_private.h"
#include "smx_synchro_private.h"
-#include "simix/context.h"
/* Define only for SimGrid benchmarking purposes */
#undef TIME_BENCH
typedef struct s_smx_stat {
s_file_stat_t surf_stat;
-} s_smx_stat_t, *smx_stat_t;
+} s_smx_stat_t;
/*********************************** Time ************************************/
int detached; /* If detached or not */
void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */
+ int (*match_fun)(void*,void*,smx_action_t); /* 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 */
/* Surf action data */
surf_action_t surf_comm; /* The Surf communication action encapsulated */
void *dst_buff;
size_t src_buff_size;
size_t *dst_buff_size;
- char copied;
+ unsigned copied:1; /* whether the data were already copied */
- void* src_data; /* User data associated to communication */
+ void* src_data; /* User data associated to communication */
void* dst_data;
} comm;
*/
static XBT_INLINE smx_context_t SIMIX_context_self(void)
{
- if (simix_global && simix_global->context_factory != NULL) {
+ if (simix_global && simix_global->context_factory) {
return simix_global->context_factory->self();
}