From 9137c7e78bc07b6b74f15f2a179c3b377f9d5799 Mon Sep 17 00:00:00 2001 From: alegrand Date: Fri, 23 Mar 2007 11:35:11 +0000 Subject: [PATCH] Renaming! git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3343 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/Makefile.am | 25 +++- .../{msg_config.c => msg_simix_config.c} | 2 +- .../{deployment.c => msg_simix_deployment.c} | 2 +- ...{environment.c => msg_simix_environment.c} | 2 +- .../{global.c => msg_simix_global.c} | 2 +- src/msg_simix/{gos.c => msg_simix_gos.c} | 2 +- src/msg_simix/{host.c => msg_simix_host.c} | 2 +- .../{m_process.c => msg_simix_process.c} | 2 +- src/msg_simix/{task.c => msg_simix_task.c} | 2 +- src/msg_simix/private.h | 114 ------------------ 10 files changed, 27 insertions(+), 128 deletions(-) rename src/msg_simix/{msg_config.c => msg_simix_config.c} (96%) rename src/msg_simix/{deployment.c => msg_simix_deployment.c} (97%) rename src/msg_simix/{environment.c => msg_simix_environment.c} (98%) rename src/msg_simix/{global.c => msg_simix_global.c} (99%) rename src/msg_simix/{gos.c => msg_simix_gos.c} (99%) rename src/msg_simix/{host.c => msg_simix_host.c} (99%) rename src/msg_simix/{m_process.c => msg_simix_process.c} (99%) rename src/msg_simix/{task.c => msg_simix_task.c} (99%) delete mode 100644 src/msg_simix/private.h diff --git a/src/Makefile.am b/src/Makefile.am index 27cc0a74b0..278ad852cd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -65,7 +65,7 @@ EXTRA_DIST= \ amok/amok_modinter.h if USE_SIMIX - EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/private.h + EXTRA_DIST+=include/simix/simix.h include/simix/datatypes.h simix/msg_simix_private.h endif # gras_private.h @@ -177,10 +177,6 @@ SG_SRC= \ surf/network_dassf.c \ surf/workstation_KCCFLN05.c \ \ - msg/msg_config.c \ - msg/task.c msg/host.c msg/m_process.c msg/gos.c \ - msg/global.c msg/environment.c msg/deployment.c \ - \ simdag/sd_global.c simdag/sd_link.c simdag/sd_task.c \ simdag/sd_workstation.c \ \ @@ -205,13 +201,30 @@ SIMIX_SRC= \ simix/smx_process.c \ simix/smx_action.c \ simix/smx_synchro.c + +MSG_SRC= msg/msg_config.c \ + msg/task.c msg/host.c msg/m_process.c msg/gos.c \ + msg/global.c msg/environment.c msg/deployment.c + +MSG_SIMIX_SRC= msg_simix/msg_simix_config.c \ + msg_simix/msg_simix_task.c \ + msg_simix/msg_simix_host.c \ + msg_simix/msg_simix_process.c \ + msg_simix/msg_simix_gos.c \ + msg_simix/msg_simix_global.c \ + msg_simix/msg_simix_environment.c \ + msg_simix/msg_simix_deployment.c + if USE_SIMIX SG_SRC+=$(SIMIX_SRC) + SG_SRC+=$(MSG_SIMIX_SRC) + EXTRA_DIST+=$(MSG_SRC) else EXTRA_DIST+=$(SIMIX_SRC) + EXTRA_DIST+=$(MSG_SIMIX_SRC) + SG_SRC+=$(MSG_SRC) endif - AMOK_SRC= \ amok/amok_base.c \ amok/Bandwidth/bandwidth.c amok/Bandwidth/saturate.c \ diff --git a/src/msg_simix/msg_config.c b/src/msg_simix/msg_simix_config.c similarity index 96% rename from src/msg_simix/msg_config.c rename to src/msg_simix/msg_simix_config.c index 450da2f618..84e2b475bb 100644 --- a/src/msg_simix/msg_config.c +++ b/src/msg_simix/msg_simix_config.c @@ -1,5 +1,5 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/deployment.c b/src/msg_simix/msg_simix_deployment.c similarity index 97% rename from src/msg_simix/deployment.c rename to src/msg_simix/msg_simix_deployment.c index 372f0bf7ee..b7e14f48b7 100644 --- a/src/msg_simix/deployment.c +++ b/src/msg_simix/msg_simix_deployment.c @@ -1,5 +1,5 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/environment.c b/src/msg_simix/msg_simix_environment.c similarity index 98% rename from src/msg_simix/environment.c rename to src/msg_simix/msg_simix_environment.c index c547d80758..e2abf68fe9 100644 --- a/src/msg_simix/environment.c +++ b/src/msg_simix/msg_simix_environment.c @@ -1,5 +1,5 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/global.c b/src/msg_simix/msg_simix_global.c similarity index 99% rename from src/msg_simix/global.c rename to src/msg_simix/msg_simix_global.c index 5d843c4988..1a46780ace 100644 --- a/src/msg_simix/global.c +++ b/src/msg_simix/msg_simix_global.c @@ -1,4 +1,4 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" #include "xbt/ex.h" /* ex_backtrace_display */ diff --git a/src/msg_simix/gos.c b/src/msg_simix/msg_simix_gos.c similarity index 99% rename from src/msg_simix/gos.c rename to src/msg_simix/msg_simix_gos.c index e0ec3d7bf8..3f6cc382c9 100644 --- a/src/msg_simix/gos.c +++ b/src/msg_simix/msg_simix_gos.c @@ -1,4 +1,4 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/host.c b/src/msg_simix/msg_simix_host.c similarity index 99% rename from src/msg_simix/host.c rename to src/msg_simix/msg_simix_host.c index bed422bc72..4b7947e6d0 100644 --- a/src/msg_simix/host.c +++ b/src/msg_simix/msg_simix_host.c @@ -1,4 +1,4 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/m_process.c b/src/msg_simix/msg_simix_process.c similarity index 99% rename from src/msg_simix/m_process.c rename to src/msg_simix/msg_simix_process.c index e3c8deebb1..b57bc36afb 100644 --- a/src/msg_simix/m_process.c +++ b/src/msg_simix/msg_simix_process.c @@ -1,5 +1,5 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/task.c b/src/msg_simix/msg_simix_task.c similarity index 99% rename from src/msg_simix/task.c rename to src/msg_simix/msg_simix_task.c index e813adbb4f..1aae241f89 100644 --- a/src/msg_simix/task.c +++ b/src/msg_simix/msg_simix_task.c @@ -1,4 +1,4 @@ -#include "private.h" +#include "msg_simix_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" diff --git a/src/msg_simix/private.h b/src/msg_simix/private.h deleted file mode 100644 index 069086b129..0000000000 --- a/src/msg_simix/private.h +++ /dev/null @@ -1,114 +0,0 @@ -/* $Id$ */ - -/* Copyright (c) 2002,2004,2004 Arnaud Legrand. 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 - -#include "msg/msg.h" -#include "simix/simix.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 **********************************/ - -typedef struct simdata_host { - smx_host_t host; /* SURF modeling */ - xbt_fifo_t *mbox; /* array of FIFOs used as a mailboxes */ - smx_cond_t *sleeping; /* array of process used to know whether a local process is - waiting for a communication on a channel */ - smx_mutex_t mutex; -} s_simdata_host_t; - -/********************************* Task **************************************/ - -typedef struct simdata_task { - smx_action_t compute; /* SURF modeling of computation */ - smx_action_t comm; /* SURF modeling of communication */ - double message_size; /* Data size */ - double computation_amount; /* Computation size */ - smx_cond_t cond; - smx_mutex_t mutex; - m_process_t sender; - 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 *************************************/ - -typedef struct simdata_process { - m_host_t host; /* the host on which the process is running */ - smx_process_t smx_process; - int PID; /* used for debugging purposes */ - int PPID; /* The parent PID */ - //m_task_t waiting_task; - int blocked; - int suspended; - m_host_t put_host; /* used for debugging purposes */ - m_channel_t put_channel; /* used for debugging purposes */ - 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_simdata_process_t; - -typedef struct process_arg { - const char *name; - m_process_code_t code; - void *data; - m_host_t 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; - xbt_fifo_t process_list; - int max_channel; - int PID; - int session; -} s_MSG_Global_t, *MSG_Global_t; - -extern MSG_Global_t msg_global; - -/*************************************************************/ - -#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 CHECK_HOST() xbt_assert0(surf_workstation_resource->extension_public-> \ - get_state(MSG_host_self()->simdata->host)==SURF_CPU_ON,\ - "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); -void __MSG_task_execute(m_process_t process, m_task_t task); -MSG_error_t __MSG_wait_for_computation(m_process_t process, m_task_t task); -MSG_error_t __MSG_task_wait_event(m_process_t process, m_task_t task); - -int __MSG_process_block(double max_duration, const char *info); -MSG_error_t __MSG_process_unblock(m_process_t process); -int __MSG_process_isBlocked(m_process_t process); - -void __MSG_display_process_status(void); - - - -#endif -- 2.20.1