Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Copyright corrected.
authordonassbr <donassbr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 1 Mar 2007 16:22:17 +0000 (16:22 +0000)
committerdonassbr <donassbr@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Thu, 1 Mar 2007 16:22:17 +0000 (16:22 +0000)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3181 48e7efb5-ca39-0410-a469-dd3cf9ba447f

src/include/simix/datatypes.h
src/include/simix/simix.h
src/simix/private.h
src/simix/smx_config.c
src/simix/smx_deployment.c
src/simix/smx_global.c
src/simix/smx_host.c
src/simix/smx_process.c

index d83d22a..4557bfd 100644 (file)
@@ -1,6 +1,7 @@
 /*     $Id$     */
 
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+   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. */
@@ -51,7 +52,7 @@ typedef struct s_simdata_action *simdata_action_t;
 /** @brief Action datatype 
     @ingroup m_datatypes_management_details */
 typedef struct s_smx_action {
-  int number;                  /**< @brief action name if any */
+  char *name;                  /**< @brief action name if any */
   simdata_action_t simdata;    /**< @brief simulator data */
   void *data;                  /**< @brief user data */
 } s_smx_action_t;
@@ -67,6 +68,8 @@ typedef struct s_smx_process {
   char *name;                  /**< @brief process name if any */
   simdata_process_t simdata;   /**< @brief simulator data */
   s_xbt_swag_hookup_t process_hookup;
+  s_xbt_swag_hookup_t synchro_hookup;
+  s_xbt_swag_hookup_t host_proc_hookup;
   void *data;                  /**< @brief user data */
 } s_smx_process_t;
 /** @} */
index a5932f2..1a892e5 100644 (file)
@@ -1,6 +1,7 @@
 /*     $Id$     */
 
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+   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. */
index 63cadc5..4139869 100644 (file)
@@ -1,6 +1,7 @@
 /*     $Id$     */
 
-/* Copyright (c) 2002,2004,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+   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. */
index 106e9ec..569cea1 100644 (file)
@@ -1,9 +1,7 @@
 /* $Id$ */
 
-/* simix_config.c - support for SIMIX user configuration                      */
-
-/* Copyright (c) 2005 Martin Quinson.                                       */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2007 Arnaud Legrand, 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. */
index bdc7a87..dd06807 100644 (file)
@@ -1,6 +1,6 @@
 /*     $Id$     */
 
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
    All rights reserved.                                          */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -55,7 +55,7 @@ static void parse_process_finalize(void)
     arg->host = parse_host;
     arg->argc = parse_argc;
     arg->argv = parse_argv;
-    arg-> kill_time = kill_time;
+    arg->kill_time = kill_time;
 
     DEBUG3("Process %s(%s) will be started at time %f", arg->name, 
           arg->host->name,start_time);
index e876a9a..9d33dde 100644 (file)
@@ -1,6 +1,6 @@
 /*     $Id$     */
 
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
    All rights reserved.                                          */
 
 /* This program is free software; you can redistribute it and/or modify it
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
                                "Logging specific to SIMIX (kernel)");
 
-//int __stop_at_time = -1.0 ;
+int __stop_time = -1.0 ;
 
 SIMIX_Global_t simix_global = NULL;
 
-/* static void MarkAsFailed(m_task_t t, TBX_HashTable_t failedProcessList); */
-/* static xbt_fifo_t SIMIX_buildFailedHostList(double a, double b); */
 
-/** \defgroup msg_simulation   SIMIX simulation Functions
+/** \defgroup simix_simulation   SIMIX simulation Functions
  *  \brief This section describes the functions you need to know to
  *  set up a simulation. You should have a look at \ref SIMIX_examples 
  *  to have an overview of their usage.
@@ -29,7 +27,7 @@ SIMIX_Global_t simix_global = NULL;
 
 /********************************* SIMIX **************************************/
 
-/** \ingroup msg_simulation
+/** \ingroup simix_simulation
  * \brief Initialize some SIMIX internal data.
  */
 void SIMIX_global_init_args(int *argc, char **argv)
@@ -37,27 +35,28 @@ void SIMIX_global_init_args(int *argc, char **argv)
   SIMIX_global_init(argc,argv);
 }
 
-/** \ingroup msg_simulation
+/** \ingroup simix_simulation
  * \brief Initialize some SIMIX internal data.
  */
 void SIMIX_global_init(int *argc, char **argv)
 {
        s_smx_process_t proc;
 
-  if (!simix_global) {
-    surf_init(argc, argv);     /* Initialize some common structures. Warning, it sets msg_global=NULL */
-     
-    simix_global = xbt_new0(s_SIMIX_Global_t,1);
-
-    xbt_context_init();
-    simix_global->host = xbt_fifo_new();
-    simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
-    simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
-    simix_global->current_process = NULL;
-    simix_global->registered_functions = xbt_dict_new();
-  }
+       if (!simix_global) {
+               surf_init(argc, argv);  /* Initialize some common structures. Warning, it sets msg_global=NULL */
+
+               simix_global = xbt_new0(s_SIMIX_Global_t,1);
+
+               xbt_context_init();
+               simix_global->host = xbt_fifo_new();
+               simix_global->process_to_run = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
+               simix_global->process_list = xbt_swag_new(xbt_swag_offset(proc,process_hookup));
+               simix_global->current_process = NULL;
+               simix_global->registered_functions = xbt_dict_new();
+       }
 }
 
+/* Debug purpose, incomplete */
 void __SIMIX_display_process_status(void)
 {
    smx_process_t process = NULL;
@@ -68,7 +67,7 @@ void __SIMIX_display_process_status(void)
    INFO1("SIMIX: %d processes are still running, waiting for something.",
         nbprocess);
    /*  List the process and their state */
-   INFO0("SIMIX: <process>(<pid>) on <host>: <status>.");
+   INFO0("SIMIX: <process> on <host>: <status>.");
    xbt_swag_foreach(process, simix_global->process_list) {
       simdata_process_t p_simdata = (simdata_process_t) process->simdata;
      // simdata_host_t h_simdata=(simdata_host_t)p_simdata->host->simdata;
@@ -99,143 +98,148 @@ static void _XBT_CALL inthandler(int ignored)
  */
 SIMIX_error_t SIMIX_main(void)
 {
-  smx_process_t process = NULL;
-  int i;
-  double elapsed_time = 0.0;
-  int state_modifications = 1;
-   
-  /* Prepare to display some more info when dying on Ctrl-C pressing */
-  signal(SIGINT,inthandler);
-   
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  surf_solve(); /* Takes traces into account. Returns 0.0 */
-/* xbt_fifo_size(msg_global->process_to_run) */
-  while (1) {
-    xbt_context_empty_trash();
-    if(xbt_swag_size(simix_global->process_to_run) && (elapsed_time>0)) {
-      DEBUG0("**************************************************");
-    }
-    /*
-    if((__stop_at_time>0) && (SIMIX_get_clock() >= __stop_at_time)) {
-      DEBUG0("Let's stop here!");
-    }*/
-
-    while ((process = xbt_swag_extract(simix_global->process_to_run))) {
-      DEBUG2("Scheduling %s on %s",         
-            process->name,
-            process->simdata->host->name);
-      simix_global->current_process = process;
-/*       fflush(NULL); */
-      xbt_context_schedule(process->simdata->context);
-      simix_global->current_process = NULL;
-    }
-    
-    {
-      surf_action_t action = NULL;
-      surf_resource_t resource = NULL;
-      //m_task_t task = NULL;
-
-      void *fun = NULL;
-      void *arg = NULL;
-
-      xbt_dynar_foreach(resource_list, i, resource) {
-       if(xbt_swag_size(resource->common_public->states.failed_action_set) ||
-          xbt_swag_size(resource->common_public->states.done_action_set))
-         state_modifications = 1;
-      }
-      
-      if(!state_modifications) {
-       DEBUG1("%f : Calling surf_solve",SIMIX_get_clock());
-       elapsed_time = surf_solve();
-       DEBUG1("Elapsed_time %f",elapsed_time);
-       
-       if (elapsed_time<0.0) {
-         /*       fprintf(stderr, "We're done %g\n",elapsed_time); */
-         break;
-       }
-      }
-
-      while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
-       DEBUG2("got %p %p", fun, arg);
-       if(fun==SIMIX_process_create_with_arguments) {
-         process_arg_t args = arg;
-         DEBUG2("Launching %s on %s", args->name, args->host->name);
-         process = SIMIX_process_create_with_arguments(args->name, args->code, 
-                                                     args->data, args->host,
-                                                     args->argc,args->argv);
-         if(args->kill_time > SIMIX_get_clock()) {
-           surf_timer_resource->extension_public->set(args->kill_time, 
-                                                      (void*) &SIMIX_process_kill,
-                                                      (void*) process);
-         }
-         xbt_free(args);
-       }
-       if(fun==SIMIX_process_kill) {
-         process = arg;
-         DEBUG2("Killing %s on %s", process->name, 
-                process->simdata->host->name);
-         SIMIX_process_kill(process);
-       }
-      }
-      
-      xbt_dynar_foreach(resource_list, i, resource) {
-       while ((action =
-               xbt_swag_extract(resource->common_public->states.
-                                failed_action_set))) {
-                                /*
-         task = action->data;
-         if(task) {
-           int _cursor;
-           DEBUG1("** %s failed **",task->name);
-           xbt_dynar_foreach(task->simdata->sleeping,_cursor,process) {
-             DEBUG3("\t preparing to wake up %s(%d) on %s",         
-                    process->name,process->simdata->PID,
-                    process->simdata->host->name);
-             xbt_fifo_unshift(msg_global->process_to_run, process);
-           }
-           process=NULL;
-         }*/
+       smx_process_t process = NULL;
+       smx_cond_t cond = NULL;
+       int i;
+       double elapsed_time = 0.0;
+       int state_modifications = 1;
+
+       /* Prepare to display some more info when dying on Ctrl-C pressing */
+       signal(SIGINT,inthandler);
+
+       /* Clean IO before the run */
+       fflush(stdout);
+       fflush(stderr);
+
+       surf_solve(); /* Takes traces into account. Returns 0.0 */
+       /* xbt_fifo_size(msg_global->process_to_run) */
+       while (1) {
+               xbt_context_empty_trash();
+               if(xbt_swag_size(simix_global->process_to_run) && (elapsed_time>0)) {
+                       DEBUG0("**************************************************");
+               }
+
+               if((__stop_time>0) && (SIMIX_get_clock() >= __stop_time)) {
+                       DEBUG0("Let's stop here!");
+               }
+
+               while ((process = xbt_swag_extract(simix_global->process_to_run))) {
+                       DEBUG2("Scheduling %s on %s",        
+                                       process->name,
+                                       process->simdata->host->name);
+                       simix_global->current_process = process;
+                       /*       fflush(NULL); */
+                       xbt_context_schedule(process->simdata->context);
+                       simix_global->current_process = NULL;
+               }
+
+               {
+                       surf_action_t action = NULL;
+                       surf_resource_t resource = NULL;
+                       smx_action_t smx_action = NULL;
+
+                       void *fun = NULL;
+                       void *arg = NULL;
+
+                       xbt_dynar_foreach(resource_list, i, resource) {
+                               if(xbt_swag_size(resource->common_public->states.failed_action_set) ||
+                                               xbt_swag_size(resource->common_public->states.done_action_set))
+                                       state_modifications = 1;
+                       }
+
+                       if(!state_modifications) {
+                               DEBUG1("%f : Calling surf_solve",SIMIX_get_clock());
+                               elapsed_time = surf_solve();
+                               DEBUG1("Elapsed_time %f",elapsed_time);
+
+                               if (elapsed_time<0.0) {
+                                       /*       fprintf(stderr, "We're done %g\n",elapsed_time); */
+                                       break;
+                               }
+                       }
+
+                       while (surf_timer_resource->extension_public->get(&fun,(void*)&arg)) {
+                               DEBUG2("got %p %p", fun, arg);
+                               if(fun==SIMIX_process_create_with_arguments) {
+                                       process_arg_t args = arg;
+                                       DEBUG2("Launching %s on %s", args->name, args->host->name);
+                                       process = SIMIX_process_create_with_arguments(args->name, args->code, 
+                                                       args->data, args->host,
+                                                       args->argc,args->argv);
+                                       if(args->kill_time > SIMIX_get_clock()) {
+                                               surf_timer_resource->extension_public->set(args->kill_time, 
+                                                               (void*) &SIMIX_process_kill,
+                                                               (void*) process);
+                                       }
+                                       xbt_free(args);
+                               }
+                               if(fun==SIMIX_process_kill) {
+                                       process = arg;
+                                       DEBUG2("Killing %s on %s", process->name, 
+                                                       process->simdata->host->name);
+                                       SIMIX_process_kill(process);
+                               }
+                       }
+
+                       /* Wake up all process waiting for the action finish */
+                       xbt_dynar_foreach(resource_list, i, resource) {
+                               while ((action =
+                                                       xbt_swag_extract(resource->common_public->states.
+                                                               failed_action_set))) {
+                                       smx_action = action->data;
+                                       if (smx_action) {
+                                               xbt_fifo_item_t _cursor;
+
+                                               DEBUG1("** %s failed **",smx_action->name);
+                                               xbt_fifo_foreach(smx_action->simdata->cond_list,_cursor,cond,smx_cond_t) {
+                                                       SIMIX_cond_broadcast(cond);
+                                                       xbt_swag_foreach(process,cond->sleeping) {
+                                                               DEBUG2("\t preparing to wake up %s on %s",           
+                                                                               process->name,  process->simdata->host->name);
+                                                       }
+                                               }
+                                               process=NULL;                                           
+                                       }
+                               }
+                               while ((action =
+                                                       xbt_swag_extract(resource->common_public->states.
+                                                               done_action_set))) {
+                                       smx_action = action->data;
+                                       if (smx_action) {
+                                               xbt_fifo_item_t _cursor;
+
+                                               DEBUG1("** %s done **",smx_action->name);
+                                               xbt_fifo_foreach(smx_action->simdata->cond_list,_cursor,cond,smx_cond_t) {
+                                                       SIMIX_cond_broadcast(cond);
+                                                       xbt_swag_foreach(process,cond->sleeping) {
+                                                               DEBUG2("\t preparing to wake up %s on %s",           
+                                                                               process->name,  process->simdata->host->name);
+                                                       }
+                                               }
+                                               process=NULL;                                           
+                                       }
+
+                               }
+                       }
+               }
+               state_modifications = 0;
        }
-       while ((action =
-               xbt_swag_extract(resource->common_public->states.
-                                done_action_set))) {
-         /*
-               task = action->data;
-         if(task) {
-           int _cursor;
-           DEBUG1("** %s done **",task->name);
-           xbt_dynar_foreach(task->simdata->sleeping,_cursor,process) {
-             DEBUG3("\t preparing to wake up %s(%d) on %s",         
-                    process->name,process->simdata->PID,
-                    process->simdata->host->name);
-             xbt_fifo_unshift(msg_global->process_to_run, process);
-           }
-           process=NULL;
-         }*/
-       }
-      }
-    }
-    state_modifications = 0;
-  }
 
-  if (xbt_swag_size(simix_global->process_list) == 0) {
-    INFO0("Congratulations ! Simulation terminated : all processes are over");
-    return SIMIX_OK;
-  } else {
-    INFO0("Oops ! Deadlock or code not perfectly clean.");
-    __SIMIX_display_process_status();
-    if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
-       XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
-      DEBUG0("Aborting!");
-      xbt_abort();
-    }
-
-    INFO0("Return a Warning.");
-    return SIMIX_WARNING;
-  }
+       if (xbt_swag_size(simix_global->process_list) == 0) {
+               INFO0("Congratulations ! Simulation terminated : all processes are over");
+               return SIMIX_OK;
+       } else {
+               INFO0("Oops ! Deadlock or code not perfectly clean.");
+               __SIMIX_display_process_status();
+               if(XBT_LOG_ISENABLED(simix, xbt_log_priority_debug) ||
+                               XBT_LOG_ISENABLED(simix_kernel, xbt_log_priority_debug)) {
+                       DEBUG0("Aborting!");
+                       xbt_abort();
+               }
+
+               INFO0("Return a Warning.");
+               return SIMIX_WARNING;
+       }
 }
 
 /** \ingroup msg_simulation
index 2326036..14ccdc5 100644 (file)
@@ -1,6 +1,7 @@
 /*     $Id$     */
 
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007 Arnaud Legrand, 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. */
@@ -151,20 +152,6 @@ smx_host_t *SIMIX_get_host_table(void)
   return ((smx_host_t *)xbt_fifo_to_array(simix_global->host));
 }
 
-/** \ingroup m_host_management
- * \brief Return the number of MSG tasks currently running on a
- * #m_host_t. The external load is not taken in account.
- */
-/*
-int MSG_get_host_msgload(m_host_t h)
-{
-  xbt_assert0((h!= NULL), "Invalid parameters");
-  xbt_assert0(0, "Not implemented yet");
-
-  return(0);
-//   return(surf_workstation_resource->extension_public->get_load(h->simdata->host));
-}
-*/
 
 /** \ingroup m_host_management
  * \brief Return the speed of the processor (in Mflop/s), regardless of 
index 936f385..cc8b6b1 100644 (file)
@@ -91,11 +91,6 @@ smx_process_t SIMIX_process_create_with_arguments(const char *name,
                                     SIMIX_process_cleanup, process, 
                                     simdata->argc, simdata->argv);
 
-  if((self=simix_global->current_process)) {
-    //simdata->PPID = MSG_process_get_PID(self);
-  } else {
-   // simdata->PPID = -1;
-  }
   simdata->last_errno=SIMIX_OK;
 
 
@@ -235,56 +230,6 @@ smx_host_t SIMIX_process_get_host(smx_process_t process)
   return (((simdata_process_t) process->simdata)->host);
 }
 
-/** \ingroup m_process_management
- *
- * \brief Return a #m_process_t given its PID.
- *
- * This functions search in the list of all the created m_process_t for a m_process_t 
-   whose PID is equal to \a PID. If no host is found, \c NULL is returned. 
-   Note that the PID are uniq in the whole simulation, not only on a given host.
- */
-/*
-m_process_t MSG_process_from_PID(int PID)
-{
-  xbt_fifo_item_t i = NULL;
-  m_process_t process = NULL;
-
-  xbt_fifo_foreach(msg_global->process_list,i,process,m_process_t) {
-    if(MSG_process_get_PID(process) == PID) return process;
-  }
-  return NULL;
-}
-*/
-
-/** \ingroup m_process_management
- * \brief Returns the process ID of \a process.
- *
- * This functions checks whether \a process is a valid pointer or not 
-   and return its PID.
- */
-/*
-int MSG_process_get_PID(m_process_t process)
-{
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-
-  return (((simdata_process_t) process->simdata)->PID);
-}
-*/
-/** \ingroup m_process_management
- * \brief Returns the process ID of the parent of \a process.
- *
- * This functions checks whether \a process is a valid pointer or not 
-   and return its PID. Returns -1 if the agent has not been created by 
-   another agent.
- */
-/*
-int MSG_process_get_PPID(m_process_t process)
-{
-  xbt_assert0(((process != NULL) && (process->simdata)), "Invalid parameters");
-
-  return (((simdata_process_t) process->simdata)->PPID);
-}
-*/
 /** \ingroup m_process_management
  * \brief Return the name of an agent.
  *
@@ -298,29 +243,6 @@ const char *SIMIX_process_get_name(smx_process_t process)
   return (process->name);
 }
 
-/** \ingroup m_process_management
- * \brief Return the PID of the current agent.
- *
- * This functions returns the PID of the currently running #m_process_t.
- */
-/*
-int MSG_process_self_PID(void)
-{
-  return (MSG_process_get_PID(MSG_process_self()));
-}
-*/
-/** \ingroup m_process_management
- * \brief Return the PPID of the current agent.
- *
- * This functions returns the PID of the parent of the currently
- * running #m_process_t.
- */
-/*
-int MSG_process_self_PPID(void)
-{
-  return (MSG_process_get_PPID(MSG_process_self()));
-}
-*/
 /** \ingroup m_process_management
  * \brief Return the current agent.
  *