-/* Copyright (c) 2004-2014. The SimGrid Team.
+/* Copyright (c) 2004-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
-#include "msg/msg.h"
+#include "simgrid/msg.h"
#include "simgrid/simix.h"
-#include "surf/surf.h"
+#include "src/include/surf/surf.h"
+#include "xbt/base.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/config.h"
-#include "instr/instr_private.h"
+#include "src/instr/instr_private.h"
SG_BEGIN_DECL()
/**************** datatypes **********************************/
ptr = _xbt_ex_t; } while(0)
typedef struct simdata_task {
- smx_action_t compute; /* SIMIX modeling of computation */
- smx_action_t comm; /* SIMIX modeling of communication */
- double message_size; /* Data size */
- double computation_amount; /* Computation size */
+ smx_synchro_t compute; /* SIMIX modeling of computation */
+ smx_synchro_t comm; /* SIMIX modeling of communication */
+ double bytes_amount; /* Data size */
+ double flops_amount; /* Computation size */
msg_process_t sender;
msg_process_t receiver;
msg_host_t source;
void *isused; /* Indicates whether the task is used in SIMIX currently */
int host_nb; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
- smx_host_t *host_list;
- double *comp_amount;
- double *comm_amount;
+ sg_host_t *host_list;
+ double *flops_parallel_amount;
+ double *bytes_parallel_amount;
} s_simdata_task_t;
/********************************* File **************************************/
smx_file_t smx_file;
} s_simdata_file_t;
+XBT_PRIVATE int __MSG_host_get_file_descriptor_id(msg_host_t host);
+XBT_PRIVATE void __MSG_host_release_file_descriptor_id(msg_host_t host, int id);
+
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task {
- double computation_amount; /* Computation size */
+ double flops_amount; /* Computation size */
double dispatch_latency;
double collect_latency;
int isused; /* Indicates whether the task is used in SIMIX currently */
#ifdef MSG_USE_DEPRECATED
m_channel_t put_channel; /* used for debugging purposes */
#endif
- smx_action_t waiting_action;
+ smx_synchro_t waiting_action;
msg_task_t waiting_task;
char **argv; /* arguments table if any */
int argc; /* arguments number if any */
} s_process_arg_t, *process_arg_t;
typedef struct msg_comm {
- smx_action_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ smx_synchro_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
msg_task_t task_sent; /* task sent (NULL for the receiver) */
msg_task_t *task_received; /* where the task will be received (NULL for the sender) */
msg_error_t status; /* status of the communication once finished */
# define MSG_RETURN(val) return(val)
#endif
-msg_host_t __MSG_host_create(smx_host_t workstation);
-msg_storage_t __MSG_storage_create(smx_storage_t storage);
+XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host);
+XBT_PRIVATE msg_storage_t __MSG_storage_create(smx_storage_t storage);
void __MSG_host_destroy(msg_host_t host);
-void __MSG_storage_destroy(msg_storage_priv_t host);
-void __MSG_file_destroy(msg_file_priv_t host);
+XBT_PRIVATE void __MSG_host_priv_free(msg_host_priv_t priv);
+XBT_PRIVATE void __MSG_storage_destroy(msg_storage_priv_t host);
+XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host);
-void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
-void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
+XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
+XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name,
xbt_main_func_t code, void *data,
const char *hostname, double kill_time,
int argc, char **argv,
xbt_dict_t properties, int auto_restart,
smx_process_t parent_process);
-void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size);
-
-void MSG_post_create_environment(void);
+XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size);
-static inline void *msg_host_resource_priv(const void *host) {
- return xbt_lib_get_level((void *)host, MSG_HOST_LEVEL);
-}
+XBT_PRIVATE void MSG_post_create_environment(void);
-void MSG_host_add_task(msg_host_t host, msg_task_t task);
-void MSG_host_del_task(msg_host_t host, msg_task_t task);
+XBT_PRIVATE void MSG_host_add_task(msg_host_t host, msg_task_t task);
+XBT_PRIVATE void MSG_host_del_task(msg_host_t host, msg_task_t task);
/********** Tracing **********/
/* declaration of instrumentation functions from msg_task_instr.c */
-void TRACE_msg_set_task_category(msg_task_t task, const char *category);
-void TRACE_msg_task_create(msg_task_t task);
-void TRACE_msg_task_execute_start(msg_task_t task);
-void TRACE_msg_task_execute_end(msg_task_t task);
-void TRACE_msg_task_destroy(msg_task_t task);
-void TRACE_msg_task_get_start(void);
-void TRACE_msg_task_get_end(double start_time, msg_task_t task);
-int TRACE_msg_task_put_start(msg_task_t task); //returns TRUE if the task_put_end must be called
-void TRACE_msg_task_put_end(void);
+XBT_PRIVATE void TRACE_msg_set_task_category(msg_task_t task, const char *category);
+XBT_PRIVATE void TRACE_msg_task_create(msg_task_t task);
+XBT_PRIVATE void TRACE_msg_task_execute_start(msg_task_t task);
+XBT_PRIVATE void TRACE_msg_task_execute_end(msg_task_t task);
+XBT_PRIVATE void TRACE_msg_task_destroy(msg_task_t task);
+XBT_PRIVATE void TRACE_msg_task_get_end(double start_time, msg_task_t task);
+XBT_PRIVATE void TRACE_msg_task_get_start(void);
+XBT_PRIVATE int TRACE_msg_task_put_start(msg_task_t task); //returns TRUE if the task_put_end must be called
+XBT_PRIVATE void TRACE_msg_task_put_end(void);
/* declaration of instrumentation functions from msg_process_instr.c */
-char *instr_process_id (msg_process_t proc, char *str, int len);
-char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len);
-void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host,
+XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len);
+XBT_PRIVATE char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len);
+XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host,
msg_host_t new_host);
-void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host);
-void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host);
-void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process);
-void TRACE_msg_process_suspend(msg_process_t process);
-void TRACE_msg_process_resume(msg_process_t process);
-void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c
-void TRACE_msg_process_sleep_out(msg_process_t process);
-void TRACE_msg_process_end(msg_process_t process);
+XBT_PRIVATE void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host);
+XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host);
+XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process);
+XBT_PRIVATE void TRACE_msg_process_suspend(msg_process_t process);
+XBT_PRIVATE void TRACE_msg_process_resume(msg_process_t process);
+XBT_PRIVATE void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c
+XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process);
+XBT_PRIVATE void TRACE_msg_process_end(msg_process_t process);
/* declaration of instrumentation functions from instr_msg_vm.c */
-char *instr_vm_id(msg_vm_t vm, char *str, int len);
-char *instr_vm_id_2(const char *vm_name, char *str, int len);
-void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
+XBT_PRIVATE char *instr_vm_id(msg_vm_t vm, char *str, int len);
+XBT_PRIVATE char *instr_vm_id_2(const char *vm_name, char *str, int len);
+XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
msg_host_t new_host);
-void TRACE_msg_vm_start(msg_vm_t vm);
-void TRACE_msg_vm_create(const char *vm_name, msg_host_t host);
-void TRACE_msg_vm_kill(msg_vm_t process);
-void TRACE_msg_vm_suspend(msg_vm_t vm);
-void TRACE_msg_vm_resume(msg_vm_t vm);
-void TRACE_msg_vm_save(msg_vm_t vm);
-void TRACE_msg_vm_restore(msg_vm_t vm);
-void TRACE_msg_vm_end(msg_vm_t vm);
+XBT_PRIVATE void TRACE_msg_vm_start(msg_vm_t vm);
+XBT_PRIVATE void TRACE_msg_vm_create(const char *vm_name, msg_host_t host);
+XBT_PRIVATE void TRACE_msg_vm_kill(msg_vm_t process);
+XBT_PRIVATE void TRACE_msg_vm_suspend(msg_vm_t vm);
+XBT_PRIVATE void TRACE_msg_vm_resume(msg_vm_t vm);
+XBT_PRIVATE void TRACE_msg_vm_save(msg_vm_t vm);
+XBT_PRIVATE void TRACE_msg_vm_restore(msg_vm_t vm);
+XBT_PRIVATE void TRACE_msg_vm_end(msg_vm_t vm);
SG_END_DECL()
#endif
