A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kill the types xbt_context_function_t, smx_process_code_t and m_process_code_t; use...
[simgrid.git]
/
src
/
msg
/
private.h
diff --git
a/src/msg/private.h
b/src/msg/private.h
index
ccb9e34
..
459a10b
100644
(file)
--- a/
src/msg/private.h
+++ b/
src/msg/private.h
@@
-1,84
+1,113
@@
-/**** MSG_LICENCE DO NOT REMOVE ****/
-
+/* $Id$ */
+
+/* Copyright (c) 2002-2007 Arnaud Legrand. */
+/* Copyright (c) 2007 Bruno Donassolo. */
+/* 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 METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
+#include <stdio.h>
#include "msg/msg.h"
#include "msg/msg.h"
+#include "simix/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/context.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/context.h"
+#include "xbt/config.h"
/**************** datatypes **********************************/
/**************** datatypes **********************************/
-typedef enum {
- HOST_DOWN = 0,
- HOST_ALIVE = 1
-} m_host_state_t;
-
-typedef struct sim_data_host {
- void *host; /* SURF modeling */
+typedef struct simdata_host {
+ smx_host_t s_host; /* SURF modeling */
xbt_fifo_t *mbox; /* array of FIFOs used as a mailboxes */
xbt_fifo_t *mbox; /* array of FIFOs used as a mailboxes */
- xbt_context_t *sleeping; /* array of context used to know whether a process is
- waiting for a communication on a channel */
- m_host_state_t state;
- s_xbt_swag_t process_list;
-} s_sim_data_host_t;
+ smx_cond_t *sleeping; /* array of conditions on which the processes sleep if they are waiting for a communication on a channel */
+ smx_mutex_t mutex; /* mutex to access the host */
+} s_simdata_host_t;
/********************************* Task **************************************/
/********************************* Task **************************************/
-typedef struct sim
_
data_task {
- s
urf_action_t compute;
/* SURF modeling of computation */
- s
urf_action_t comm;
/* SURF modeling of communication */
+typedef struct simdata_task {
+ s
mx_action_t compute;
/* SURF modeling of computation */
+ s
mx_action_t comm;
/* SURF modeling of communication */
double message_size; /* Data size */
double computation_amount; /* Computation size */
double message_size; /* Data size */
double computation_amount; /* Computation size */
- xbt_dynar_t sleeping; /* process to wake-up */
-} s_sim_data_task_t;
+ smx_cond_t cond;
+ smx_mutex_t mutex; /* Task mutex */
+ m_process_t sender;
+ m_process_t receiver;
+ m_host_t source;
+ double priority;
+ double rate;
+ int using;
+ /******* Parallel Tasks Only !!!! *******/
+ int host_nb;
+ void * *host_list; /* SURF modeling */
+ double *comp_amount;
+ double *comm_amount;
+} s_simdata_task_t;
/******************************* Process *************************************/
/******************************* Process *************************************/
-typedef struct sim_data_process {
- s_xbt_swag_hookup_t host_hookup; /* link to other process running on the same location */
- m_host_t host; /* the host on which the process is running */
- xbt_context_t context; /* the context that executes the scheduler fonction */
+typedef struct simdata_process {
+ m_host_t m_host; /* the host on which the process is running */
+ smx_process_t s_process;
int PID; /* used for debugging purposes */
int PPID; /* The parent PID */
int PID; /* used for debugging purposes */
int PPID; /* The parent PID */
- m_
task_t waiting_task;
/* used for debugging purposes */
- m_
host_t put_host;
/* used for debugging purposes */
- int put_channel; /* used for debugging purposes */
+ m_
host_t put_host;
/* used for debugging purposes */
+ m_
channel_t put_channel;
/* used for debugging purposes */
+ m_task_t waiting_task;
int argc; /* arguments number if any */
char **argv; /* arguments table if any */
MSG_error_t last_errno; /* the last value returned by a MSG_function */
int argc; /* arguments number if any */
char **argv; /* arguments table if any */
MSG_error_t last_errno; /* the last value returned by a MSG_function */
-} s_sim_data_process_t;
+} s_simdata_process_t;
+
+typedef struct process_arg {
+ const char *name;
+ xbt_main_func_t code;
+ void *data;
+ m_host_t m_host;
+ int argc;
+ char **argv;
+ double kill_time;
+} s_process_arg_t, *process_arg_t;
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
- xbt_fifo_t link;
- xbt_fifo_t process_to_run;
- xbt_fifo_t process;
+ xbt_fifo_t process_list;
int max_channel;
int max_channel;
-
m_process_t current_process
;
-
xbt_dict_t registered_functions
;
-} s_MSG_
g
lobal_t, *MSG_Global_t;
+
int PID
;
+
int session
;
+} s_MSG_
G
lobal_t, *MSG_Global_t;
extern MSG_Global_t msg_global;
extern MSG_Global_t msg_global;
-
+
/*************************************************************/
/*************************************************************/
-#define PROCESS_SET_ERRNO(val) (
((sim_data_process_t)(MSG_process_self()->simdata))
->last_errno=val)
-#define PROCESS_GET_ERRNO() (
((sim_data_process_t)(MSG_process_self()->simdata))
->last_errno)
+#define PROCESS_SET_ERRNO(val) (
MSG_process_self()->simdata
->last_errno=val)
+#define PROCESS_GET_ERRNO() (
MSG_process_self()->simdata
->last_errno)
#define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
#define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
-#define CHECK_HOST() ASSERT((((sim_data_host_t) MSG_host_self()->simdata)->state==HOST_ALIVE),"Host failed, you cannot call this function.")
+#define CHECK_HOST() xbt_assert0(SIMIX_host_get_state(SIMIX_host_self())==1,\
+ "Host failed, you cannot call this function.")
+
+m_host_t __MSG_host_create(smx_host_t workstation, void *data);
+
+void __MSG_host_destroy(m_host_t host);
-m_task_t __MSG_task_copy(m_task_t task);
-MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task);
+void __MSG_display_process_status(void);
-MSG_error_t __MSG_task_check(m_task_t task);
+void __MSG_process_cleanup(void *arg);
+m_process_t __MSG_process_create_with_arguments(const char *name,
+ xbt_main_func_t code, void *data,
+ char * hostname, int argc, char **argv);
#endif
#endif